launchpad-reviewers team mailing list archive

[Colin Watson <mp+436089@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:fix-stormify-package-files into launchpad:master.

Commit message:
Fix some test regressions due to Storm conversions

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/436089
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:fix-stormify-package-files into launchpad:master.

diff --git a/lib/lp/archivepublisher/tests/test_pool.py b/lib/lp/archivepublisher/tests/test_pool.py
index 6e515ad..311f203 100644
--- a/lib/lp/archivepublisher/tests/test_pool.py
+++ b/lib/lp/archivepublisher/tests/test_pool.py
@@ -86,7 +86,7 @@ class FakePackageReleaseFile:
         self.libraryfile = FakeLibraryFileAlias(contents, filename)
         if release_type == FakeReleaseType.SOURCE:
             self.filetype = filetype or SourcePackageFileType.DSC
-            self.sourcepackagereleaseID = release_id
+            self.sourcepackagerelease_id = release_id
             self.sourcepackagerelease = FakePackageRelease(
                 release_id,
                 user_defined_fields=user_defined_fields,
@@ -95,7 +95,7 @@ class FakePackageReleaseFile:
             alsoProvides(self, ISourcePackageReleaseFile)
         elif release_type == FakeReleaseType.BINARY:
             self.filetype = filetype or BinaryPackageFileType.DEB
-            self.binarypackagereleaseID = release_id
+            self.binarypackagerelease_id = release_id
             self.binarypackagerelease = FakePackageRelease(
                 release_id, user_defined_fields=user_defined_fields
             )
diff --git a/lib/lp/archiveuploader/tests/test_nascentuploadfile.py b/lib/lp/archiveuploader/tests/test_nascentuploadfile.py
index efc7c23..6ddfadc 100644
--- a/lib/lp/archiveuploader/tests/test_nascentuploadfile.py
+++ b/lib/lp/archiveuploader/tests/test_nascentuploadfile.py
@@ -306,7 +306,7 @@ class DSCFileTests(PackageUploadFileTestCase):
         # The filetype attribute is set based on the file extension.
         dsc = self.getBaseDsc()
         uploadfile = self.createDSCFile(
-            "foo.dsc", dsc, "main/net", "extra", "dulwich", "0.42", None
+            "foo_0.42.dsc", dsc, "main/net", "extra", "dulwich", "0.42", None
         )
         self.assertEqual(
             "text/x-debian-source-package", uploadfile.content_type
@@ -318,13 +318,13 @@ class DSCFileTests(PackageUploadFileTestCase):
         dsc["Build-Depends"] = "dpkg, bzr"
         changes = self.getBaseChanges()
         uploadfile = self.createDSCFile(
-            "foo.dsc",
+            "foo_0.42.dsc",
             dsc,
             "main/net",
             "extra",
             "dulwich",
             "0.42",
-            self.createChangesFile("foo.changes", changes),
+            self.createChangesFile("foo_0.42.changes", changes),
         )
         uploadfile.changelog = b"DUMMY"
         uploadfile.files = []
@@ -339,13 +339,13 @@ class DSCFileTests(PackageUploadFileTestCase):
         dsc["buIld-depends"] = "dpkg, bzr"
         changes = self.getBaseChanges()
         uploadfile = self.createDSCFile(
-            "foo.dsc",
+            "foo_0.42.dsc",
             dsc,
             "main/net",
             "extra",
             "dulwich",
             "0.42",
-            self.createChangesFile("foo.changes", changes),
+            self.createChangesFile("foo_0.42.changes", changes),
         )
         uploadfile.files = []
         uploadfile.changelog = b"DUMMY"
@@ -358,13 +358,13 @@ class DSCFileTests(PackageUploadFileTestCase):
         dsc["Python-Version"] = "2.5"
         changes = self.getBaseChanges()
         uploadfile = self.createDSCFile(
-            "foo.dsc",
+            "foo_0.42.dsc",
             dsc,
             "main/net",
             "extra",
             "dulwich",
             "0.42",
-            self.createChangesFile("foo.changes", changes),
+            self.createChangesFile("foo_0.42.changes", changes),
         )
         uploadfile.changelog = b"DUMMY"
         uploadfile.files = []
@@ -380,13 +380,13 @@ class DSCFileTests(PackageUploadFileTestCase):
         dsc["Homepage"] = "http://samba.org/~jelmer/bzr";
         changes = self.getBaseChanges()
         uploadfile = self.createDSCFile(
-            "foo.dsc",
+            "foo_0.42.dsc",
             dsc,
             "main/net",
             "extra",
             "dulwich",
             "0.42",
-            self.createChangesFile("foo.changes", changes),
+            self.createChangesFile("foo_0.42.changes", changes),
         )
         uploadfile.changelog = b"DUMMY"
         uploadfile.files = []
@@ -407,13 +407,13 @@ class DSCFileTests(PackageUploadFileTestCase):
         )
         dsc = self.getBaseDsc()
         uploadfile = self.createDSCFile(
-            "foo.dsc",
+            "foo_0.42.dsc",
             dsc,
             "main/net",
             "extra",
             "dulwich",
             "0.42",
-            self.createChangesFile("foo.changes", self.getBaseChanges()),
+            self.createChangesFile("foo_0.42.changes", self.getBaseChanges()),
         )
         uploadfile.checkBuild(build)
         # checkBuild() sets the build status to FULLYBUILT and
@@ -435,13 +435,13 @@ class DSCFileTests(PackageUploadFileTestCase):
         )
         dsc = self.getBaseDsc()
         uploadfile = self.createDSCFile(
-            "foo.dsc",
+            "foo_0.42.dsc",
             dsc,
             "main/net",
             "extra",
             "dulwich",
             "0.42",
-            self.createChangesFile("foo.changes", self.getBaseChanges()),
+            self.createChangesFile("foo_0.42.changes", self.getBaseChanges()),
         )
         self.assertRaises(UploadError, uploadfile.checkBuild, build)