Fixing tests

Author: gershnik

tests/expected/tests/test_apt.py.test_one/dists/blah/Release

@@ -8,14 +8,14 @@ Components: main
 Description: hohohoho
 Date: Fri, 31 May 2024 01:45:07 +0000
 MD5Sum:
- a84b08848c2cde223cb5f2063412ac77             1598 main/binary-sparc/Packages
- c3a60ad3b3493d722c7b8f8611ebdb54              990 main/binary-sparc/Packages.gz
+ dde72657d7e51fe7068981d05e97cf2d             1603 main/binary-sparc/Packages
+ 48816c2d3536cf08509f1738374a4a57              994 main/binary-sparc/Packages.gz
 SHA1:
- 41a3b7b34aba796992bc13095659210c587d01ea             1598 main/binary-sparc/Packages
- afcc1c5358e4870f912ce7f695d18e2c7008766d              990 main/binary-sparc/Packages.gz
+ a11e319422a8a150d5619de855d141cc3c7b3cf9             1603 main/binary-sparc/Packages
+ ba81ff81b5a5ee95e365953253a32de042b57f8d              994 main/binary-sparc/Packages.gz
 SHA256:
- aae2dec448488edcdfbf4e5bfcc1a1fa24b8fc6721ad96af6d82e8bb9aec3029             1598 main/binary-sparc/Packages
- 5a3882d7d080c01ce895bd5d5f76fc6d5f151daf508eaf8ab7cdae570c7e1a7b              990 main/binary-sparc/Packages.gz
+ ed43213080754e5f5d14a53b392148479c4f4afb0b4b06ef4c5dd269fb36f5ac             1603 main/binary-sparc/Packages
+ 97afc2bdaf9951e2a704f3a7fd6aea481ae0e369c73cc4fe6661da02c0499bb4              994 main/binary-sparc/Packages.gz
 SHA512:
- 88bd565e24276b4a072b2c24632fb631f6e2feaf650b214d7cf958de1c69003217fea21fce28ef576d489bcbbeff323f011a070c00720a43b9de4ab45eb72fe5             1598 main/binary-sparc/Packages
- 2fd6f2ff89fc5d78640b4bb5fcbad3b7ea77b4d3be508e6c24d3056730f183c7221b5963f723e86e3a77acab9ec209de40ab2c0a3be6730deace6ae1be78597c              990 main/binary-sparc/Packages.gz
+ 7be3341c0bbecc94695c04d3eb10465483842028868dfee8c87c0970b6cf16d4b8fc439b87f57d73fc7473410ad72a4a5ca3cfcd5e44658b479e28255e6343aa             1603 main/binary-sparc/Packages
+ 87a618e8b1d820090459c276af87c3b1bfc91ca39fd900ee56b63c24e8fd6d191a3a8c99bc91fae423635016dc9f28a8ba15508f270c7084b840924ca0264c47              994 main/binary-sparc/Packages.gz

tests/expected/tests/test_apt.py.test_one/dists/blah/main/binary-sparc/Packages

@@ -28,7 +28,7 @@ Description: retrieves files from the web
  speed up retrieval, and provide access behind firewalls.
  .
  http://www.gnu.org/software/wget/
-Filename: wget_1.10-2ubuntu0.1_sparc.deb
+Filename: pool/wget_1.10-2ubuntu0.1_sparc.deb
 Size: 235322
 MD5sum: a372ccc35c9f22a8043167ec5d7aa0e9
 SHA1: 6f6c45e4ca02d74f45684c154f9045ea65432de7

tests/expected/tests/test_apt.py.test_one/dists/blah/main/binary-sparc/Packages.gz

@@ -8,22 +8,22 @@ Components: main
 Description: hohohoho
 Date: Fri, 31 May 2024 01:45:07 +0000
 MD5Sum:
- 1119477a10943a32f4086f132168bad7             1154 main/binary-amd64/Packages
- d7ef5d1d8ac18e993a8c8e4643289edd              743 main/binary-amd64/Packages.gz
- a84b08848c2cde223cb5f2063412ac77             1598 main/binary-sparc/Packages
- c3a60ad3b3493d722c7b8f8611ebdb54              990 main/binary-sparc/Packages.gz
+ 834b67f9846e1068f56abf917b0968e8             1159 main/binary-amd64/Packages
+ b0b599bf30919a44d1adb9e462ba5ec7              749 main/binary-amd64/Packages.gz
+ dde72657d7e51fe7068981d05e97cf2d             1603 main/binary-sparc/Packages
+ 48816c2d3536cf08509f1738374a4a57              994 main/binary-sparc/Packages.gz
 SHA1:
- e72c650f7ccc838c86a98e5bfed6efe7835dcd53             1154 main/binary-amd64/Packages
- ec4ad420e66c3ea022778eedc78028c48ac185a4              743 main/binary-amd64/Packages.gz
- 41a3b7b34aba796992bc13095659210c587d01ea             1598 main/binary-sparc/Packages
- afcc1c5358e4870f912ce7f695d18e2c7008766d              990 main/binary-sparc/Packages.gz
+ e862323027f5a943c4f1586327d141443c428dcf             1159 main/binary-amd64/Packages
+ 1fd3af3a7d8bd4c2c5e8b7e99773560f62e0dddd              749 main/binary-amd64/Packages.gz
+ a11e319422a8a150d5619de855d141cc3c7b3cf9             1603 main/binary-sparc/Packages
+ ba81ff81b5a5ee95e365953253a32de042b57f8d              994 main/binary-sparc/Packages.gz
 SHA256:
- 101cd9016fd95f73e6b90571f8da25d64907ef3c9206b1955b0870b2881ab297             1154 main/binary-amd64/Packages
- a673711495c69686a140b557033cdd7e2648289f472706fabdc4f2183fa35fa5              743 main/binary-amd64/Packages.gz
- aae2dec448488edcdfbf4e5bfcc1a1fa24b8fc6721ad96af6d82e8bb9aec3029             1598 main/binary-sparc/Packages
- 5a3882d7d080c01ce895bd5d5f76fc6d5f151daf508eaf8ab7cdae570c7e1a7b              990 main/binary-sparc/Packages.gz
+ e2290fdfa6958e65efa4bc1fb5b1da672a593ac9cc7b0b7e21a6dc22953db692             1159 main/binary-amd64/Packages
+ b6cfb3b44c6f1898db72d19dd59ae25e6ab0dc870354cf07930d6fbb4bfef847              749 main/binary-amd64/Packages.gz
+ ed43213080754e5f5d14a53b392148479c4f4afb0b4b06ef4c5dd269fb36f5ac             1603 main/binary-sparc/Packages
+ 97afc2bdaf9951e2a704f3a7fd6aea481ae0e369c73cc4fe6661da02c0499bb4              994 main/binary-sparc/Packages.gz
 SHA512:
- ba616032571dc83655b49cc3ff9ed0d14a1e07ddb0e1b2b4247bca863914600ef6df3e0c7795ba2e28832e5d09951a18f79724410bcfeac2721eb57d25e26125             1154 main/binary-amd64/Packages
- b182a73c6117fde53b6644ea00255af829948f25432ab403bb0e528190533335fe9044eb78cc2a123b1840f273a322a7fcbe8b8410020b7b0cb4f121bd93ddd9              743 main/binary-amd64/Packages.gz
- 88bd565e24276b4a072b2c24632fb631f6e2feaf650b214d7cf958de1c69003217fea21fce28ef576d489bcbbeff323f011a070c00720a43b9de4ab45eb72fe5             1598 main/binary-sparc/Packages
- 2fd6f2ff89fc5d78640b4bb5fcbad3b7ea77b4d3be508e6c24d3056730f183c7221b5963f723e86e3a77acab9ec209de40ab2c0a3be6730deace6ae1be78597c              990 main/binary-sparc/Packages.gz
+ 78f70a1c3652cef23229ac7202a38574443775c69e8c7b21a0153fbc0a61282a5858f0aea5b7380cd75da686e752711e9788aef91e6da4d1ef509e649eaa4458             1159 main/binary-amd64/Packages
+ 38aa083745080a5286dbe7499ebe30e9e73e72893a83db4afd9a322f2313eeecc99c801b7cded31ab81d957f1860860a7d37ec60125b29538345be7cdbdbae17              749 main/binary-amd64/Packages.gz
+ 7be3341c0bbecc94695c04d3eb10465483842028868dfee8c87c0970b6cf16d4b8fc439b87f57d73fc7473410ad72a4a5ca3cfcd5e44658b479e28255e6343aa             1603 main/binary-sparc/Packages
+ 87a618e8b1d820090459c276af87c3b1bfc91ca39fd900ee56b63c24e8fd6d191a3a8c99bc91fae423635016dc9f28a8ba15508f270c7084b840924ca0264c47              994 main/binary-sparc/Packages.gz

tests/expected/tests/test_apt.py.test_two/dists/blah/xyz/Release

@@ -17,7 +17,7 @@ Description: free Pico clone with some new features - tiny build
  .
  This package contains a minimal build of GNU nano, aimed for use in
  debian-installer. Thus, many features are disabled in this version.
-Filename: nano-udeb_1.3.10-1_amd64.udeb
+Filename: pool/nano-udeb_1.3.10-1_amd64.udeb
 Size: 33560
 MD5sum: 191e33984bfa643ae8b9ae68f327a768
 SHA1: 450db28b335812219a2e8a8d25df40b8284ea7b1

tests/expected/tests/test_apt.py.test_two/dists/blah/xyz/main/binary-amd64/Packages

@@ -28,7 +28,7 @@ Description: retrieves files from the web
  speed up retrieval, and provide access behind firewalls.
  .
  http://www.gnu.org/software/wget/
-Filename: wget_1.10-2ubuntu0.1_sparc.deb
+Filename: pool/wget_1.10-2ubuntu0.1_sparc.deb
 Size: 235322
 MD5sum: a372ccc35c9f22a8043167ec5d7aa0e9
 SHA1: 6f6c45e4ca02d74f45684c154f9045ea65432de7

tests/expected/tests/test_apt.py.test_two/dists/blah/xyz/main/binary-amd64/Packages.gz

@@ -8,14 +8,14 @@ Components: main
 Description: hohohoho
 Date: Fri, 31 May 2024 01:45:07 +0000
 MD5Sum:
- e4cadc02e37f48bdecbf89cec91875ca             3216 main/binary-sparc/Packages
- 5a902dd9e9fa1e336e57893d8a032c36             1241 main/binary-sparc/Packages.gz
+ 43209c6b32057ce527c330a2fe0c0621             3226 main/binary-sparc/Packages
+ 3d5c898f0c0cf1687b58778aac600ff3             1245 main/binary-sparc/Packages.gz
 SHA1:
- ad5835a47593cfbcb4fc45e331ce6615719e9695             3216 main/binary-sparc/Packages
- 5d3f5aa3076634e4d4b3c4936eadcc177154d92b             1241 main/binary-sparc/Packages.gz
+ 6d1eba03144bb28b8533d8a386951075876f35dd             3226 main/binary-sparc/Packages
+ 1d7b8640617bc46078353d6402a9e092df679e60             1245 main/binary-sparc/Packages.gz
 SHA256:
- 71b06c61bd77eafe10e7467b67a3b0400f368bc0f1d64ad11a2613238b114406             3216 main/binary-sparc/Packages
- 76437e6f11984e17d1545d540da0888c9812723f4e38da3918dc92ab8f36f326             1241 main/binary-sparc/Packages.gz
+ c641bf1fe4d251fa44b8fa3a9573243e53b11b3fef3337b14cc074e88fbb67ed             3226 main/binary-sparc/Packages
+ dd059afa21508a60e101405ee0dd8f58e836ff7d350859fe1df6c7b776ec68ca             1245 main/binary-sparc/Packages.gz
 SHA512:
- f8f4b273434439eddda55900eee22e170412e4e878d7515f638b7d4fb51206c7900b7cbf8dddf76e8942348eea05533bdaf3e4dc13980c3ca02a3581f69d26f6             3216 main/binary-sparc/Packages
- cb6c0a2ae43c56f24fff6ca74b5f43f8d1544bf6e5a175c14dfb0ee3afc559a89f4e1b71d085c2e298ede6ea0453de9a4872f67124e3117ae13d9f1eb78c4cd7             1241 main/binary-sparc/Packages.gz
+ cf3d16153363fb4bf3e75581aa92a6d8269b7eb43259aeabdd2266862a606db7b70f0a61a58a75421c9e7ec38d308cf8f64540516197dbe831ec8bb2e0254695             3226 main/binary-sparc/Packages
+ 84bd9fe8fd0fd5d15c6cdb4fc9c3f7f094891ab8b08ed3e7a465315164813f8539b346944fc93be2564547371b61747a6dbc4845b1f89d01ceeb53f111e38da7             1245 main/binary-sparc/Packages.gz

tests/expected/tests/test_apt.py.test_two/dists/blah/xyz/main/binary-sparc/Packages

@@ -28,7 +28,7 @@ Description: retrieves files from the web
  speed up retrieval, and provide access behind firewalls.
  .
  http://www.gnu.org/software/wget/
-Filename: wget_1.10-2ubuntu0.1_sparc.deb
+Filename: pool/wget_1.10-2ubuntu0.1_sparc.deb
 Size: 235322
 MD5sum: a372ccc35c9f22a8043167ec5d7aa0e9
 SHA1: 6f6c45e4ca02d74f45684c154f9045ea65432de7
@@ -65,7 +65,7 @@ Description: retrieves files from the web
  speed up retrieval, and provide access behind firewalls.
  .
  http://www.gnu.org/software/wget/
-Filename: wget_1.10.2-1ubuntu1.2_sparc.deb
+Filename: pool/wget_1.10.2-1ubuntu1.2_sparc.deb
 Size: 614284
 MD5sum: a8232e9723c4378c4366035c97a3b2b4
 SHA1: 0000eef0e06e55ef9f91843455359720653c5e4a

tests/expected/tests/test_apt.py.test_two/dists/blah/xyz/main/binary-sparc/Packages.gz

@@ -36,7 +36,7 @@ def test_one(binaries_path, output_path, expected_path, pgp_signer, fixed_dateti
     assert package.version_str == '1.10-2ubuntu0.1'
     assert package.version_key == VersionKey(1, 10, 2, 'ubuntu', 0, 1)
     assert package.src_path == binaries_path / 'wget_1.10-2ubuntu0.1_sparc.deb'
-    assert package.repo_filename == 'wget_1.10-2ubuntu0.1_sparc.deb'
+    assert package.repo_filename == 'pool/wget_1.10-2ubuntu0.1_sparc.deb'
 
     repo.assign_package(package, dist, component='main')
 
@@ -67,7 +67,7 @@ def test_two(binaries_path, output_path, expected_path, pgp_signer, fixed_dateti
     assert package2.version_str == '1.3.10-1'
     assert package2.version_key == VersionKey(1, 3, 10, 1)
     assert package2.src_path == binaries_path / 'nano-udeb_1.3.10-1_amd64.udeb'
-    assert package2.repo_filename == 'nano-udeb_1.3.10-1_amd64.udeb'
+    assert package2.repo_filename == 'pool/nano-udeb_1.3.10-1_amd64.udeb'
 
     repo.assign_package(package1, dist, component='main')
     repo.assign_package(package2, dist, component='main')
@@ -102,7 +102,7 @@ def test_two_close(binaries_path, output_path, expected_path, pgp_signer, fixed_
     assert package2.version_str == '1.10.2-1ubuntu1.2'
     assert package2.version_key == VersionKey(1, 10, 2, 1, 'ubuntu', 1, 2)
     assert package2.src_path == binaries_path / 'wget_1.10.2-1ubuntu1.2_sparc.deb'
-    assert package2.repo_filename == 'wget_1.10.2-1ubuntu1.2_sparc.deb'
+    assert package2.repo_filename == 'pool/wget_1.10.2-1ubuntu1.2_sparc.deb'
 
     repo.assign_package(package1, dist, component='main')
     repo.assign_package(package2, dist, component='main')