launchpad-reviewers team mailing list archive

[Guruprasad <mp+483471@xxxxxxxxxxxxxxxxxx>]

Guruprasad has proposed merging ~lgp171188/launchpad:pfoe-suppression-test-fixes into launchpad:master.

Commit message:
Fix test failures in the tests for Artifactory PFOE suppression

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~lgp171188/launchpad/+git/launchpad/+merge/483471
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~lgp171188/launchpad:pfoe-suppression-test-fixes into launchpad:master.

diff --git a/lib/lp/archivepublisher/tests/test_artifactory.py b/lib/lp/archivepublisher/tests/test_artifactory.py
index 12701ae..1c9fa0e 100644
--- a/lib/lp/archivepublisher/tests/test_artifactory.py
+++ b/lib/lp/archivepublisher/tests/test_artifactory.py
@@ -264,6 +264,7 @@ class TestArtifactoryPool(TestCase):
             filename="foo-1.0.tar.bz2",
             release_type=FakeReleaseType.BINARY,
             release_id=1,
+            user_defined_fields=[("subdir", "linux-64")],
         )
         foo.addToPool()
         self.assertTrue(foo.checkIsFile())
@@ -277,7 +278,7 @@ class TestArtifactoryPool(TestCase):
         # for Python, Conda, and source archive Artifactory files. See
         # XXX comments in the appropriate sources for more details.
 
-        pool = self.makePool(repository_format=ArchiveRepositoryFormat.SOURCE)
+        pool = self.makePool(repository_format=ArchiveRepositoryFormat.GENERIC)
         foo = ArtifactoryPoolTestingFile(
             pool=pool,
             source_name="foo",