From b4f3573d11bd785d364c613b3e448729865f29c3 Mon Sep 17 00:00:00 2001 From: Oliver Sauder Date: Thu, 2 Nov 2017 13:53:57 +0100 Subject: [PATCH] Add acquire by hash when updating publish --- system/t06_publish/snapshot.py | 5 ----- system/t06_publish/update.py | 8 +++++++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/system/t06_publish/snapshot.py b/system/t06_publish/snapshot.py index efc9a780..31a5f012 100644 --- a/system/t06_publish/snapshot.py +++ b/system/t06_publish/snapshot.py @@ -233,19 +233,14 @@ class PublishSnapshot5Test(BaseTest): self.check_exists('public/ppa/smira/dists/squeeze/main/binary-i386/Packages') self.check_exists('public/ppa/smira/dists/squeeze/main/binary-i386/by-hash/MD5Sum/e98cd30fc76fbe7fa3ea25717efa1c92') self.check_exists('public/ppa/smira/dists/squeeze/main/binary-i386/Packages.gz') - self.check_exists('public/ppa/smira/dists/squeeze/main/binary-i386/by-hash/MD5Sum/f08c2a876384aea2f74422d9f58f927e') self.check_exists('public/ppa/smira/dists/squeeze/main/binary-i386/Packages.bz2') - self.check_exists('public/ppa/smira/dists/squeeze/main/binary-i386/by-hash/MD5Sum/a2c1024fbc65b6381b730a1c4144f80d') self.check_exists('public/ppa/smira/dists/squeeze/main/binary-amd64/Packages') self.check_exists('public/ppa/smira/dists/squeeze/main/binary-amd64/by-hash/MD5Sum/ab073d1f73bed52e7356c91161e8667e') self.check_exists('public/ppa/smira/dists/squeeze/main/binary-amd64/Packages.gz') - self.check_exists('public/ppa/smira/dists/squeeze/main/binary-amd64/by-hash/MD5Sum/6fc332f313c8799fe09578da24340366') self.check_exists('public/ppa/smira/dists/squeeze/main/binary-amd64/Packages.bz2') - self.check_exists('public/ppa/smira/dists/squeeze/main/binary-amd64/by-hash/MD5Sum/ac6be6306c80c01eb7a79a65ec36760d') self.check_exists('public/ppa/smira/dists/squeeze/main/Contents-i386.gz') self.check_exists('public/ppa/smira/dists/squeeze/main/Contents-amd64.gz') - self.check_exists('public/ppa/smira/dists/squeeze/main/by-hash/MD5Sum/eea7fb266562e355ba069116c1fddfcc') self.check_exists('public/ppa/smira/pool/main/g/gnuplot/gnuplot-doc_4.6.1-1~maverick2_all.deb') diff --git a/system/t06_publish/update.py b/system/t06_publish/update.py index 480b4057..b6cd160d 100644 --- a/system/t06_publish/update.py +++ b/system/t06_publish/update.py @@ -95,7 +95,7 @@ class PublishUpdate2Test(BaseTest): fixtureCmds = [ "aptly repo create local-repo", "aptly repo add local-repo ${files}/libboost-program-options-dev_1.49.0.1_i386.deb ${files}/pyspi_0.6.1-1.3.dsc", - "aptly publish repo -keyring=${files}/aptly.pub -secret-keyring=${files}/aptly.sec -distribution=maverick local-repo", + "aptly publish repo -acquire-by-hash -keyring=${files}/aptly.pub -secret-keyring=${files}/aptly.sec -distribution=maverick local-repo", "aptly repo add local-repo ${files}/pyspi-0.6.1-1.3.stripped.dsc" ] runCmd = "aptly publish update -keyring=${files}/aptly.pub -secret-keyring=${files}/aptly.sec maverick" @@ -113,8 +113,14 @@ class PublishUpdate2Test(BaseTest): self.check_exists('public/dists/maverick/main/binary-i386/Packages.bz2') self.check_exists('public/dists/maverick/main/Contents-i386.gz') self.check_exists('public/dists/maverick/main/source/Sources') + self.check_exists('public/dists/maverick/main/source/by-hash/MD5Sum/Sources') + self.check_exists('public/dists/maverick/main/source/by-hash/MD5Sum/Sources.old') self.check_exists('public/dists/maverick/main/source/Sources.gz') + self.check_exists('public/dists/maverick/main/source/by-hash/MD5Sum/Sources.gz') + self.check_exists('public/dists/maverick/main/source/by-hash/MD5Sum/Sources.gz.old') self.check_exists('public/dists/maverick/main/source/Sources.bz2') + self.check_exists('public/dists/maverick/main/source/by-hash/MD5Sum/Sources.bz2') + self.check_exists('public/dists/maverick/main/source/by-hash/MD5Sum/Sources.bz2.old') self.check_exists('public/pool/main/p/pyspi/pyspi_0.6.1-1.3.dsc') self.check_exists('public/pool/main/p/pyspi/pyspi_0.6.1-1.3.diff.gz')