Merge lp:~jelmer/brz-builder/fixes into lp:brz-builder
- fixes
- Merge into trunk
Proposed by
Jelmer Vernooij
Status: | Merged |
---|---|
Approved by: | Jelmer Vernooij |
Approved revision: | 188 |
Merged at revision: | 187 |
Proposed branch: | lp:~jelmer/brz-builder/fixes |
Merge into: | lp:brz-builder |
Diff against target: |
335 lines (+41/-33) 9 files modified
brzbuildrecipe/dailydeb.py (+3/-3) brzbuildrecipe/deb_util.py (+6/-6) brzbuildrecipe/deb_version.py (+2/-2) brzbuildrecipe/main.py (+2/-2) brzbuildrecipe/ppa.py (+1/-1) brzbuildrecipe/recipe.py (+15/-10) brzbuildrecipe/tests/test_deb_version.py (+4/-4) brzbuildrecipe/tests/test_recipe.py (+7/-4) releaser.conf (+1/-1) |
To merge this branch: | bzr merge lp:~jelmer/brz-builder/fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jelmer Vernooij | Approve | ||
Review via email: mp+428652@code.launchpad.net |
Commit message
Fix tests, compatibility with newer breezy.
Description of the change
Fix tests, compatibility with newer breezy.
To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'brzbuildrecipe/dailydeb.py' | |||
2 | --- brzbuildrecipe/dailydeb.py 2020-02-22 01:55:36 +0000 | |||
3 | +++ brzbuildrecipe/dailydeb.py 2022-08-19 17:37:12 +0000 | |||
4 | @@ -161,7 +161,7 @@ | |||
5 | 161 | control_path = os.path.join(working_directory, "debian", "control") | 161 | control_path = os.path.join(working_directory, "debian", "control") |
6 | 162 | if not os.path.exists(control_path): | 162 | if not os.path.exists(control_path): |
7 | 163 | if args.package is None: | 163 | if args.package is None: |
9 | 164 | raise errors.BzrCommandError( | 164 | raise errors.CommandError( |
10 | 165 | "No control file to " | 165 | "No control file to " |
11 | 166 | "take the package name from, and --package not " | 166 | "take the package name from, and --package not " |
12 | 167 | "specified.") | 167 | "specified.") |
13 | @@ -178,7 +178,7 @@ | |||
14 | 178 | append_version=args.append_version) | 178 | append_version=args.append_version) |
15 | 179 | else: | 179 | else: |
16 | 180 | if args.append_version: | 180 | if args.append_version: |
18 | 181 | raise errors.BzrCommandError( | 181 | raise errors.CommandError( |
19 | 182 | "--append-version only " | 182 | "--append-version only " |
20 | 183 | "supported for autobuild recipes (with a 'deb-version' " | 183 | "supported for autobuild recipes (with a 'deb-version' " |
21 | 184 | "header)") | 184 | "header)") |
22 | @@ -203,7 +203,7 @@ | |||
23 | 203 | package_version.upstream_version, args.working_basedir) | 203 | package_version.upstream_version, args.working_basedir) |
24 | 204 | except errors.NoSuchTag as e: | 204 | except errors.NoSuchTag as e: |
25 | 205 | if not args.allow_fallback_to_native: | 205 | if not args.allow_fallback_to_native: |
27 | 206 | raise errors.BzrCommandError( | 206 | raise errors.CommandError( |
28 | 207 | "Unable to find the upstream source. Import it " | 207 | "Unable to find the upstream source. Import it " |
29 | 208 | "as tag %s or build with " | 208 | "as tag %s or build with " |
30 | 209 | "--allow-fallback-to-native." % e.tag_name) | 209 | "--allow-fallback-to-native." % e.tag_name) |
31 | 210 | 210 | ||
32 | === modified file 'brzbuildrecipe/deb_util.py' | |||
33 | --- brzbuildrecipe/deb_util.py 2020-02-22 01:55:36 +0000 | |||
34 | +++ brzbuildrecipe/deb_util.py 2022-08-19 17:37:12 +0000 | |||
35 | @@ -164,7 +164,7 @@ | |||
36 | 164 | try: | 164 | try: |
37 | 165 | substitute_changelog_vars(base_branch, None, cl) | 165 | substitute_changelog_vars(base_branch, None, cl) |
38 | 166 | except SubstitutionUnavailable as e: | 166 | except SubstitutionUnavailable as e: |
40 | 167 | raise errors.BzrCommandError( | 167 | raise errors.CommandError( |
41 | 168 | "No previous changelog to " | 168 | "No previous changelog to " |
42 | 169 | "take the upstream version from as %s was " | 169 | "take the upstream version from as %s was " |
43 | 170 | "used: %s: %s." % (e.name, e.reason, reason)) | 170 | "used: %s: %s." % (e.name, e.reason, reason)) |
44 | @@ -188,7 +188,7 @@ | |||
45 | 188 | try: | 188 | try: |
46 | 189 | changelog.Version(version) | 189 | changelog.Version(version) |
47 | 190 | except (changelog.VersionError, ValueError) as e: | 190 | except (changelog.VersionError, ValueError) as e: |
49 | 191 | raise errors.BzrCommandError( | 191 | raise errors.CommandError( |
50 | 192 | "Invalid deb-version: %s: %s" % (version, e)) | 192 | "Invalid deb-version: %s: %s" % (version, e)) |
51 | 193 | cl.new_block( | 193 | cl.new_block( |
52 | 194 | package=package, version=version, | 194 | package=package, version=version, |
53 | @@ -255,9 +255,9 @@ | |||
54 | 255 | success_exit_codes = [0] | 255 | success_exit_codes = [0] |
55 | 256 | if proc.returncode not in success_exit_codes: | 256 | if proc.returncode not in success_exit_codes: |
56 | 257 | if quiet: | 257 | if quiet: |
58 | 258 | raise errors.BzrCommandError("%s: %s" % (error_msg, output)) | 258 | raise errors.CommandError("%s: %s" % (error_msg, output)) |
59 | 259 | else: | 259 | else: |
61 | 260 | raise errors.BzrCommandError(error_msg) | 260 | raise errors.CommandError(error_msg) |
62 | 261 | 261 | ||
63 | 262 | 262 | ||
64 | 263 | def build_source_package(basedir, tgz_check=True): | 263 | def build_source_package(basedir, tgz_check=True): |
65 | @@ -323,5 +323,5 @@ | |||
66 | 323 | if current_format == "3.0 (quilt)": | 323 | if current_format == "3.0 (quilt)": |
67 | 324 | convert_3_0_quilt_to_native(working_tree_path) | 324 | convert_3_0_quilt_to_native(working_tree_path) |
68 | 325 | elif current_format not in ("1.0", "3.0 (native)"): | 325 | elif current_format not in ("1.0", "3.0 (native)"): |
71 | 326 | raise errors.BzrCommandError("Unknown source format %s" % | 326 | raise errors.CommandError("Unknown source format %s" % |
72 | 327 | current_format) | 327 | current_format) |
73 | 328 | 328 | ||
74 | === modified file 'brzbuildrecipe/deb_version.py' | |||
75 | --- brzbuildrecipe/deb_version.py 2020-02-22 01:55:36 +0000 | |||
76 | +++ brzbuildrecipe/deb_version.py 2022-08-19 17:37:12 +0000 | |||
77 | @@ -142,7 +142,7 @@ | |||
78 | 142 | for name in base_branch.list_branch_names(): | 142 | for name in base_branch.list_branch_names(): |
79 | 143 | available_tokens.append(var_kls.determine_name(name)) | 143 | available_tokens.append(var_kls.determine_name(name)) |
80 | 144 | available_tokens.append(var_kls.determine_name(None)) | 144 | available_tokens.append(var_kls.determine_name(None)) |
82 | 145 | raise errors.BzrCommandError( | 145 | raise errors.CommandError( |
83 | 146 | "deb-version not fully " | 146 | "deb-version not fully " |
84 | 147 | "expanded: %s. Valid substitutions in recipe format %s are: %s" | 147 | "expanded: %s. Valid substitutions in recipe format %s are: %s" |
85 | 148 | % (base_branch.deb_version, base_branch.format, | 148 | % (base_branch.deb_version, base_branch.format, |
86 | @@ -150,7 +150,7 @@ | |||
87 | 150 | 150 | ||
88 | 151 | 151 | ||
89 | 152 | def substitute_branch_vars(base_branch, branch_name, branch, revid): | 152 | def substitute_branch_vars(base_branch, branch_name, branch, revid): |
91 | 153 | """Substitute the branch variables for the given branch name in deb_version. | 153 | """Substitute the branch variables for the given branch name. |
92 | 154 | 154 | ||
93 | 155 | Where deb_version has a place to substitute the revno for a branch | 155 | Where deb_version has a place to substitute the revno for a branch |
94 | 156 | this will substitute it for the given branch name. | 156 | this will substitute it for the given branch name. |
95 | 157 | 157 | ||
96 | === modified file 'brzbuildrecipe/main.py' | |||
97 | --- brzbuildrecipe/main.py 2020-02-22 01:55:36 +0000 | |||
98 | +++ brzbuildrecipe/main.py 2022-08-19 17:37:12 +0000 | |||
99 | @@ -64,7 +64,7 @@ | |||
100 | 64 | (basename, f) = get_recipe_from_location( | 64 | (basename, f) = get_recipe_from_location( |
101 | 65 | recipe_location, possible_transports) | 65 | recipe_location, possible_transports) |
102 | 66 | except errors.NoSuchFile: | 66 | except errors.NoSuchFile: |
104 | 67 | raise errors.BzrCommandError( | 67 | raise errors.CommandError( |
105 | 68 | "Specified recipe does not exist: %s" % recipe_location) | 68 | "Specified recipe does not exist: %s" % recipe_location) |
106 | 69 | try: | 69 | try: |
107 | 70 | parser = RecipeParser(f, filename=recipe_location) | 70 | parser = RecipeParser(f, filename=recipe_location) |
108 | @@ -169,6 +169,6 @@ | |||
109 | 169 | location, possible_transports=possible_transports) | 169 | location, possible_transports=possible_transports) |
110 | 170 | else: | 170 | else: |
111 | 171 | if revspec is not None: | 171 | if revspec is not None: |
113 | 172 | raise errors.BzrCommandError( | 172 | raise errors.CommandError( |
114 | 173 | "--revision only supported when building from branch") | 173 | "--revision only supported when building from branch") |
115 | 174 | return base_branch | 174 | return base_branch |
116 | 175 | 175 | ||
117 | === modified file 'brzbuildrecipe/ppa.py' | |||
118 | --- brzbuildrecipe/ppa.py 2020-02-22 01:55:36 +0000 | |||
119 | +++ brzbuildrecipe/ppa.py 2022-08-19 17:37:12 +0000 | |||
120 | @@ -51,7 +51,7 @@ | |||
121 | 51 | if not sourceRecords: | 51 | if not sourceRecords: |
122 | 52 | if time.time() - 900 > start: | 52 | if time.time() - 900 > start: |
123 | 53 | # Over 15 minutes and no source yet, upload FAIL. | 53 | # Over 15 minutes and no source yet, upload FAIL. |
125 | 54 | raise errors.BzrCommandError( | 54 | raise errors.CommandError( |
126 | 55 | "No source record in %s/%s for " | 55 | "No source record in %s/%s for " |
127 | 56 | "package %s=%s after 15 minutes." % ( | 56 | "package %s=%s after 15 minutes." % ( |
128 | 57 | owner_name, archive_name, package_name, version)) | 57 | owner_name, archive_name, package_name, version)) |
129 | 58 | 58 | ||
130 | === modified file 'brzbuildrecipe/recipe.py' | |||
131 | --- brzbuildrecipe/recipe.py 2020-02-22 16:11:41 +0000 | |||
132 | +++ brzbuildrecipe/recipe.py 2022-08-19 17:37:12 +0000 | |||
133 | @@ -38,6 +38,11 @@ | |||
134 | 38 | from breezy.config import NoWhoami | 38 | from breezy.config import NoWhoami |
135 | 39 | from breezy.merge import MergeIntoMerger | 39 | from breezy.merge import MergeIntoMerger |
136 | 40 | 40 | ||
137 | 41 | try: | ||
138 | 42 | from breezy.revisionspec import InvalidRevisionSpec | ||
139 | 43 | except ImportError: # breezy < 3.3 | ||
140 | 44 | from breezy.errors import InvalidRevisionSpec | ||
141 | 45 | |||
142 | 41 | 46 | ||
143 | 42 | def subprocess_setup(): | 47 | def subprocess_setup(): |
144 | 43 | signal.signal(signal.SIGPIPE, signal.SIG_DFL) | 48 | signal.signal(signal.SIGPIPE, signal.SIG_DFL) |
145 | @@ -175,7 +180,7 @@ | |||
146 | 175 | def get(self): | 180 | def get(self): |
147 | 176 | revno = self.get_revno() | 181 | revno = self.get_revno() |
148 | 177 | if revno is None: | 182 | if revno is None: |
150 | 178 | raise errors.BzrCommandError( | 183 | raise errors.CommandError( |
151 | 179 | "Can't substitute revno of " | 184 | "Can't substitute revno of " |
152 | 180 | "branch %s in deb-version, as it's revno can't be " | 185 | "branch %s in deb-version, as it's revno can't be " |
153 | 181 | "determined" % revno) | 186 | "determined" % revno) |
154 | @@ -233,7 +238,7 @@ | |||
155 | 233 | try: | 238 | try: |
156 | 234 | revno = extract_svn_revnum(rev) | 239 | revno = extract_svn_revnum(rev) |
157 | 235 | except errors.InvalidRevisionId: | 240 | except errors.InvalidRevisionId: |
159 | 236 | raise errors.BzrCommandError( | 241 | raise errors.CommandError( |
160 | 237 | "unable to expand %s for %r in %r: " | 242 | "unable to expand %s for %r in %r: " |
161 | 238 | "not a Subversion revision" % ( | 243 | "not a Subversion revision" % ( |
162 | 239 | self.name, self.revid, self.branch)) | 244 | self.name, self.revid, self.branch)) |
163 | @@ -269,7 +274,7 @@ | |||
164 | 269 | try: | 274 | try: |
165 | 270 | commit_sha = extract_git_foreign_revid(rev) | 275 | commit_sha = extract_git_foreign_revid(rev) |
166 | 271 | except errors.InvalidRevisionId: | 276 | except errors.InvalidRevisionId: |
168 | 272 | raise errors.BzrCommandError( | 277 | raise errors.CommandError( |
169 | 273 | "unable to expand %s for %r in %r: " | 278 | "unable to expand %s for %r in %r: " |
170 | 274 | "not a Git revision" % ( | 279 | "not a Git revision" % ( |
171 | 275 | self.name, self.revid, self.branch)) | 280 | self.name, self.revid, self.branch)) |
172 | @@ -290,7 +295,7 @@ | |||
173 | 290 | if revid in reverse_tag_dict: | 295 | if revid in reverse_tag_dict: |
174 | 291 | return list(reverse_tag_dict[revid])[0] | 296 | return list(reverse_tag_dict[revid])[0] |
175 | 292 | else: | 297 | else: |
177 | 293 | raise errors.BzrCommandError( | 298 | raise errors.CommandError( |
178 | 294 | "No tags set on branch %s mainline" % self.branch_name) | 299 | "No tags set on branch %s mainline" % self.branch_name) |
179 | 295 | 300 | ||
180 | 296 | 301 | ||
181 | @@ -322,8 +327,8 @@ | |||
182 | 322 | except errors.FileExists: | 327 | except errors.FileExists: |
183 | 323 | pass | 328 | pass |
184 | 324 | except errors.NoSuchFile: | 329 | except errors.NoSuchFile: |
187 | 325 | raise errors.BzrCommandError('Parent of "%s" does not exist.' | 330 | raise errors.CommandError('Parent of "%s" does not exist.' |
188 | 326 | % to_transport.base) | 331 | % to_transport.base) |
189 | 327 | 332 | ||
190 | 328 | 333 | ||
191 | 329 | def pull_or_branch( | 334 | def pull_or_branch( |
192 | @@ -399,7 +404,7 @@ | |||
193 | 399 | conflicts = tree_to.conflicts() | 404 | conflicts = tree_to.conflicts() |
194 | 400 | if len(conflicts) > 0: | 405 | if len(conflicts) > 0: |
195 | 401 | # FIXME: better reporting | 406 | # FIXME: better reporting |
197 | 402 | raise errors.BzrCommandError("Conflicts... aborting.") | 407 | raise errors.CommandError("Conflicts... aborting.") |
198 | 403 | except BaseException: | 408 | except BaseException: |
199 | 404 | if created_br_to: | 409 | if created_br_to: |
200 | 405 | br_to.unlock() | 410 | br_to.unlock() |
201 | @@ -430,7 +435,7 @@ | |||
202 | 430 | try: | 435 | try: |
203 | 431 | merge_revid = merge_revspec.as_revision_id( | 436 | merge_revid = merge_revspec.as_revision_id( |
204 | 432 | child_branch.branch) | 437 | child_branch.branch) |
206 | 433 | except errors.InvalidRevisionSpec as e: | 438 | except InvalidRevisionSpec as e: |
207 | 434 | # Give the user a hint if they didn't mean to speciy | 439 | # Give the user a hint if they didn't mean to speciy |
208 | 435 | # a revspec. | 440 | # a revspec. |
209 | 436 | e.extra = ( | 441 | e.extra = ( |
210 | @@ -459,7 +464,7 @@ | |||
211 | 459 | merger.set_pending() | 464 | merger.set_pending() |
212 | 460 | if conflict_count: | 465 | if conflict_count: |
213 | 461 | # FIXME: better reporting | 466 | # FIXME: better reporting |
215 | 462 | raise errors.BzrCommandError("Conflicts from merge") | 467 | raise errors.CommandError("Conflicts from merge") |
216 | 463 | config = br_to.get_config() | 468 | config = br_to.get_config() |
217 | 464 | try: | 469 | try: |
218 | 465 | committer = config.username() | 470 | committer = config.username() |
219 | @@ -510,7 +515,7 @@ | |||
220 | 510 | 515 | ||
221 | 511 | if conflict_count: | 516 | if conflict_count: |
222 | 512 | # FIXME: better reporting | 517 | # FIXME: better reporting |
224 | 513 | raise errors.BzrCommandError("Conflicts from merge") | 518 | raise errors.CommandError("Conflicts from merge") |
225 | 514 | tree_to.commit( | 519 | tree_to.commit( |
226 | 515 | "Merge %s of %s" % | 520 | "Merge %s of %s" % |
227 | 516 | (subpath, urlutils.unescape_for_display(child_branch.url, 'utf-8'))) | 521 | (subpath, urlutils.unescape_for_display(child_branch.url, 'utf-8'))) |
228 | 517 | 522 | ||
229 | === modified file 'brzbuildrecipe/tests/test_deb_version.py' | |||
230 | --- brzbuildrecipe/tests/test_deb_version.py 2020-02-22 16:11:41 +0000 | |||
231 | +++ brzbuildrecipe/tests/test_deb_version.py 2022-08-19 17:37:12 +0000 | |||
232 | @@ -188,7 +188,7 @@ | |||
233 | 188 | resolve_revisions( | 188 | resolve_revisions( |
234 | 189 | branch1, substitute_branch_vars=substitute_branch_vars) | 189 | branch1, substitute_branch_vars=substitute_branch_vars) |
235 | 190 | self.assertRaises( | 190 | self.assertRaises( |
237 | 191 | errors.BzrCommandError, check_expanded_deb_version, branch1) | 191 | errors.CommandError, check_expanded_deb_version, branch1) |
238 | 192 | 192 | ||
239 | 193 | def test_substitute_svn_not_svn(self): | 193 | def test_substitute_svn_not_svn(self): |
240 | 194 | br = self.make_branch("source") | 194 | br = self.make_branch("source") |
241 | @@ -197,7 +197,7 @@ | |||
242 | 197 | source.commit("two") | 197 | source.commit("two") |
243 | 198 | branch1 = BaseRecipeBranch("source", "foo-{svn-revno}", 0.4) | 198 | branch1 = BaseRecipeBranch("source", "foo-{svn-revno}", 0.4) |
244 | 199 | e = self.assertRaises( | 199 | e = self.assertRaises( |
246 | 200 | errors.BzrCommandError, resolve_revisions, | 200 | errors.CommandError, resolve_revisions, |
247 | 201 | branch1, None, substitute_branch_vars) | 201 | branch1, None, substitute_branch_vars) |
248 | 202 | self.assertTrue(str(e).startswith( | 202 | self.assertTrue(str(e).startswith( |
249 | 203 | "unable to expand {svn-revno} "), e) | 203 | "unable to expand {svn-revno} "), e) |
250 | @@ -220,7 +220,7 @@ | |||
251 | 220 | source.commit("two") | 220 | source.commit("two") |
252 | 221 | branch1 = BaseRecipeBranch("source", "foo-{git-commit}", 0.4) | 221 | branch1 = BaseRecipeBranch("source", "foo-{git-commit}", 0.4) |
253 | 222 | e = self.assertRaises( | 222 | e = self.assertRaises( |
255 | 223 | errors.BzrCommandError, resolve_revisions, | 223 | errors.CommandError, resolve_revisions, |
256 | 224 | branch1, None, substitute_branch_vars) | 224 | branch1, None, substitute_branch_vars) |
257 | 225 | self.assertTrue(str(e).startswith("unable to expand {git-commit} "), e) | 225 | self.assertTrue(str(e).startswith("unable to expand {git-commit} "), e) |
258 | 226 | 226 | ||
259 | @@ -249,7 +249,7 @@ | |||
260 | 249 | source.commit("two") | 249 | source.commit("two") |
261 | 250 | branch1 = BaseRecipeBranch("source", "foo-{latest-tag}", 0.4) | 250 | branch1 = BaseRecipeBranch("source", "foo-{latest-tag}", 0.4) |
262 | 251 | e = self.assertRaises( | 251 | e = self.assertRaises( |
264 | 252 | errors.BzrCommandError, resolve_revisions, branch1, | 252 | errors.CommandError, resolve_revisions, branch1, |
265 | 253 | substitute_branch_vars=substitute_branch_vars) | 253 | substitute_branch_vars=substitute_branch_vars) |
266 | 254 | self.assertTrue( | 254 | self.assertTrue( |
267 | 255 | str(e).startswith("No tags set on branch None mainline"), e) | 255 | str(e).startswith("No tags set on branch None mainline"), e) |
268 | 256 | 256 | ||
269 | === modified file 'brzbuildrecipe/tests/test_recipe.py' | |||
270 | --- brzbuildrecipe/tests/test_recipe.py 2020-02-22 01:55:36 +0000 | |||
271 | +++ brzbuildrecipe/tests/test_recipe.py 2022-08-19 17:37:12 +0000 | |||
272 | @@ -24,11 +24,14 @@ | |||
273 | 24 | TestCaseInTempDir, | 24 | TestCaseInTempDir, |
274 | 25 | TestCaseWithTransport, | 25 | TestCaseWithTransport, |
275 | 26 | ) | 26 | ) |
276 | 27 | |||
277 | 28 | |||
278 | 27 | from ..recipe import ( | 29 | from ..recipe import ( |
279 | 28 | BaseRecipeBranch, | 30 | BaseRecipeBranch, |
280 | 29 | build_tree, | 31 | build_tree, |
281 | 30 | ensure_basedir, | 32 | ensure_basedir, |
282 | 31 | InstructionParseError, | 33 | InstructionParseError, |
283 | 34 | InvalidRevisionSpec, | ||
284 | 32 | ForbiddenInstructionError, | 35 | ForbiddenInstructionError, |
285 | 33 | MERGE_INSTRUCTION, | 36 | MERGE_INSTRUCTION, |
286 | 34 | NEST_INSTRUCTION, | 37 | NEST_INSTRUCTION, |
287 | @@ -596,7 +599,7 @@ | |||
288 | 596 | ensure_basedir(to_transport) | 599 | ensure_basedir(to_transport) |
289 | 597 | self.assertPathExists("a") | 600 | self.assertPathExists("a") |
290 | 598 | e = self.assertRaises( | 601 | e = self.assertRaises( |
292 | 599 | errors.BzrCommandError, ensure_basedir, | 602 | errors.CommandError, ensure_basedir, |
293 | 600 | transport.get_transport("b/c")) | 603 | transport.get_transport("b/c")) |
294 | 601 | self.assertTrue('Parent of "' in str(e)) | 604 | self.assertTrue('Parent of "' in str(e)) |
295 | 602 | self.assertTrue('" does not exist.' in str(e)) | 605 | self.assertTrue('" does not exist.' in str(e)) |
296 | @@ -825,7 +828,7 @@ | |||
297 | 825 | merged_branch = RecipeBranch("merged", "source2") | 828 | merged_branch = RecipeBranch("merged", "source2") |
298 | 826 | base_branch.merge_branch(merged_branch) | 829 | base_branch.merge_branch(merged_branch) |
299 | 827 | self.assertRaises( | 830 | self.assertRaises( |
301 | 828 | errors.BzrCommandError, build_tree, base_branch, "target") | 831 | errors.CommandError, build_tree, base_branch, "target") |
302 | 829 | self.assertPathExists("target") | 832 | self.assertPathExists("target") |
303 | 830 | tree = workingtree.WorkingTree.open("target") | 833 | tree = workingtree.WorkingTree.open("target") |
304 | 831 | self.assertEqual(source1_rev_id, tree.last_revision()) | 834 | self.assertEqual(source1_rev_id, tree.last_revision()) |
305 | @@ -968,7 +971,7 @@ | |||
306 | 968 | rev_id = source.commit("two") | 971 | rev_id = source.commit("two") |
307 | 969 | source.branch.tags.set_tag("one", rev_id) | 972 | source.branch.tags.set_tag("one", rev_id) |
308 | 970 | e = self.assertRaises( | 973 | e = self.assertRaises( |
310 | 971 | errors.BzrCommandError, pull_or_branch, tree_to, br_to, | 974 | errors.CommandError, pull_or_branch, tree_to, br_to, |
311 | 972 | source.branch, to_transport, rev_id, accelerator_tree=source) | 975 | source.branch, to_transport, rev_id, accelerator_tree=source) |
312 | 973 | self.assertEqual("Conflicts... aborting.", str(e)) | 976 | self.assertEqual("Conflicts... aborting.", str(e)) |
313 | 974 | tree_to.unlock() | 977 | tree_to.unlock() |
314 | @@ -1005,7 +1008,7 @@ | |||
315 | 1005 | merged_branch = RecipeBranch("merged", "source", revspec="debian") | 1008 | merged_branch = RecipeBranch("merged", "source", revspec="debian") |
316 | 1006 | base_branch.merge_branch(merged_branch) | 1009 | base_branch.merge_branch(merged_branch) |
317 | 1007 | e = self.assertRaises( | 1010 | e = self.assertRaises( |
319 | 1008 | errors.InvalidRevisionSpec, build_tree, base_branch, "target") | 1011 | InvalidRevisionSpec, build_tree, base_branch, "target") |
320 | 1009 | self.assertTrue( | 1012 | self.assertTrue( |
321 | 1010 | str(e).startswith( | 1013 | str(e).startswith( |
322 | 1011 | "Requested revision: 'debian' does not exist in branch: ")) | 1014 | "Requested revision: 'debian' does not exist in branch: ")) |
323 | 1012 | 1015 | ||
324 | === modified file 'releaser.conf' | |||
325 | --- releaser.conf 2022-08-19 17:26:43 +0000 | |||
326 | +++ releaser.conf 2022-08-19 17:37:12 +0000 | |||
327 | @@ -1,7 +1,7 @@ | |||
328 | 1 | # See https://github.com/jelmer/releaser | 1 | # See https://github.com/jelmer/releaser |
329 | 2 | timeout_days: 5 | 2 | timeout_days: 5 |
330 | 3 | tag_name: "$VERSION" | 3 | tag_name: "$VERSION" |
332 | 4 | verify_command: "flake8 && BRZ_PLUGINS_AT=loom@`pwd` brz selftest -s bp.builder" | 4 | verify_command: "flake8 && PYTHONPATH=`pwd` python3 -m unittest brzbuildrecipe.tests.test_suite" |
333 | 5 | update_version { | 5 | update_version { |
334 | 6 | path: "setup.py" | 6 | path: "setup.py" |
335 | 7 | new_line: "version = $TUPLED_STATUS_VERSION" | 7 | new_line: "version = $TUPLED_STATUS_VERSION" |