Launchpad itself

Merge ~cjwatson/launchpad:fix-stormify-package-files into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. fix-stormify-package-files
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 442db45ca2ae171059c1bccecf19c2c39bd57a00
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:fix-stormify-package-files
Merge into: launchpad:master
Diff against target: 130 lines (+15/-15)
2 files modified
lib/lp/archivepublisher/tests/test_pool.py (+2/-2)
lib/lp/archiveuploader/tests/test_nascentuploadfile.py (+13/-13)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+436089@code.launchpad.net

Commit message

Fix some test regressions due to Storm conversions

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

Self-approving this since it's just a few relatively superficial test fixes to unblock buildbot.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/archivepublisher/tests/test_pool.py b/lib/lp/archivepublisher/tests/test_pool.py
2index 6e515ad..311f203 100644
3--- a/lib/lp/archivepublisher/tests/test_pool.py
4+++ b/lib/lp/archivepublisher/tests/test_pool.py
5@@ -86,7 +86,7 @@ class FakePackageReleaseFile:
6 self.libraryfile = FakeLibraryFileAlias(contents, filename)
7 if release_type == FakeReleaseType.SOURCE:
8 self.filetype = filetype or SourcePackageFileType.DSC
9- self.sourcepackagereleaseID = release_id
10+ self.sourcepackagerelease_id = release_id
11 self.sourcepackagerelease = FakePackageRelease(
12 release_id,
13 user_defined_fields=user_defined_fields,
14@@ -95,7 +95,7 @@ class FakePackageReleaseFile:
15 alsoProvides(self, ISourcePackageReleaseFile)
16 elif release_type == FakeReleaseType.BINARY:
17 self.filetype = filetype or BinaryPackageFileType.DEB
18- self.binarypackagereleaseID = release_id
19+ self.binarypackagerelease_id = release_id
20 self.binarypackagerelease = FakePackageRelease(
21 release_id, user_defined_fields=user_defined_fields
22 )
23diff --git a/lib/lp/archiveuploader/tests/test_nascentuploadfile.py b/lib/lp/archiveuploader/tests/test_nascentuploadfile.py
24index efc7c23..6ddfadc 100644
25--- a/lib/lp/archiveuploader/tests/test_nascentuploadfile.py
26+++ b/lib/lp/archiveuploader/tests/test_nascentuploadfile.py
27@@ -306,7 +306,7 @@ class DSCFileTests(PackageUploadFileTestCase):
28 # The filetype attribute is set based on the file extension.
29 dsc = self.getBaseDsc()
30 uploadfile = self.createDSCFile(
31- "foo.dsc", dsc, "main/net", "extra", "dulwich", "0.42", None
32+ "foo_0.42.dsc", dsc, "main/net", "extra", "dulwich", "0.42", None
33 )
34 self.assertEqual(
35 "text/x-debian-source-package", uploadfile.content_type
36@@ -318,13 +318,13 @@ class DSCFileTests(PackageUploadFileTestCase):
37 dsc["Build-Depends"] = "dpkg, bzr"
38 changes = self.getBaseChanges()
39 uploadfile = self.createDSCFile(
40- "foo.dsc",
41+ "foo_0.42.dsc",
42 dsc,
43 "main/net",
44 "extra",
45 "dulwich",
46 "0.42",
47- self.createChangesFile("foo.changes", changes),
48+ self.createChangesFile("foo_0.42.changes", changes),
49 )
50 uploadfile.changelog = b"DUMMY"
51 uploadfile.files = []
52@@ -339,13 +339,13 @@ class DSCFileTests(PackageUploadFileTestCase):
53 dsc["buIld-depends"] = "dpkg, bzr"
54 changes = self.getBaseChanges()
55 uploadfile = self.createDSCFile(
56- "foo.dsc",
57+ "foo_0.42.dsc",
58 dsc,
59 "main/net",
60 "extra",
61 "dulwich",
62 "0.42",
63- self.createChangesFile("foo.changes", changes),
64+ self.createChangesFile("foo_0.42.changes", changes),
65 )
66 uploadfile.files = []
67 uploadfile.changelog = b"DUMMY"
68@@ -358,13 +358,13 @@ class DSCFileTests(PackageUploadFileTestCase):
69 dsc["Python-Version"] = "2.5"
70 changes = self.getBaseChanges()
71 uploadfile = self.createDSCFile(
72- "foo.dsc",
73+ "foo_0.42.dsc",
74 dsc,
75 "main/net",
76 "extra",
77 "dulwich",
78 "0.42",
79- self.createChangesFile("foo.changes", changes),
80+ self.createChangesFile("foo_0.42.changes", changes),
81 )
82 uploadfile.changelog = b"DUMMY"
83 uploadfile.files = []
84@@ -380,13 +380,13 @@ class DSCFileTests(PackageUploadFileTestCase):
85 dsc["Homepage"] = "http://samba.org/~jelmer/bzr"
86 changes = self.getBaseChanges()
87 uploadfile = self.createDSCFile(
88- "foo.dsc",
89+ "foo_0.42.dsc",
90 dsc,
91 "main/net",
92 "extra",
93 "dulwich",
94 "0.42",
95- self.createChangesFile("foo.changes", changes),
96+ self.createChangesFile("foo_0.42.changes", changes),
97 )
98 uploadfile.changelog = b"DUMMY"
99 uploadfile.files = []
100@@ -407,13 +407,13 @@ class DSCFileTests(PackageUploadFileTestCase):
101 )
102 dsc = self.getBaseDsc()
103 uploadfile = self.createDSCFile(
104- "foo.dsc",
105+ "foo_0.42.dsc",
106 dsc,
107 "main/net",
108 "extra",
109 "dulwich",
110 "0.42",
111- self.createChangesFile("foo.changes", self.getBaseChanges()),
112+ self.createChangesFile("foo_0.42.changes", self.getBaseChanges()),
113 )
114 uploadfile.checkBuild(build)
115 # checkBuild() sets the build status to FULLYBUILT and
116@@ -435,13 +435,13 @@ class DSCFileTests(PackageUploadFileTestCase):
117 )
118 dsc = self.getBaseDsc()
119 uploadfile = self.createDSCFile(
120- "foo.dsc",
121+ "foo_0.42.dsc",
122 dsc,
123 "main/net",
124 "extra",
125 "dulwich",
126 "0.42",
127- self.createChangesFile("foo.changes", self.getBaseChanges()),
128+ self.createChangesFile("foo_0.42.changes", self.getBaseChanges()),
129 )
130 self.assertRaises(UploadError, uploadfile.checkBuild, build)
131

Subscribers

People subscribed via source and target branches

to status/vote changes: