Merge lp:~jelmer/brz-builder/fixes into lp:brz-builder

[Jelmer Vernooij]

Fix tests, compatibility with newer breezy.

Fix tests, compatibility with newer breezy.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'brzbuildrecipe/dailydeb.py'
--- brzbuildrecipe/dailydeb.py	2020-02-22 01:55:36 +0000
+++ brzbuildrecipe/dailydeb.py	2022-08-19 17:37:12 +0000
@@ -161,7 +161,7 @@
         control_path = os.path.join(working_directory, "debian", "control")
         if not os.path.exists(control_path):
             if args.package is None:
-                raise errors.BzrCommandError(
+                raise errors.CommandError(
                     "No control file to "
                     "take the package name from, and --package not "
                     "specified.")
@@ -178,7 +178,7 @@
                 append_version=args.append_version)
         else:
             if args.append_version:
-                raise errors.BzrCommandError(
+                raise errors.CommandError(
                     "--append-version only "
                     "supported for autobuild recipes (with a 'deb-version' "
                     "header)")
@@ -203,7 +203,7 @@
                         package_version.upstream_version, args.working_basedir)
                 except errors.NoSuchTag as e:
                     if not args.allow_fallback_to_native:
-                        raise errors.BzrCommandError(
+                        raise errors.CommandError(
                             "Unable to find the upstream source. Import it "
                             "as tag %s or build with "
                             "--allow-fallback-to-native." % e.tag_name)

=== modified file 'brzbuildrecipe/deb_util.py'
--- brzbuildrecipe/deb_util.py	2020-02-22 01:55:36 +0000
+++ brzbuildrecipe/deb_util.py	2022-08-19 17:37:12 +0000
@@ -164,7 +164,7 @@
         try:
             substitute_changelog_vars(base_branch, None, cl)
         except SubstitutionUnavailable as e:
-            raise errors.BzrCommandError(
+            raise errors.CommandError(
                 "No previous changelog to "
                 "take the upstream version from as %s was "
                 "used: %s: %s." % (e.name, e.reason, reason))
@@ -188,7 +188,7 @@
     try:
         changelog.Version(version)
     except (changelog.VersionError, ValueError) as e:
-        raise errors.BzrCommandError(
+        raise errors.CommandError(
             "Invalid deb-version: %s: %s" % (version, e))
     cl.new_block(
         package=package, version=version,
@@ -255,9 +255,9 @@
         success_exit_codes = [0]
     if proc.returncode not in success_exit_codes:
         if quiet:
-            raise errors.BzrCommandError("%s: %s" % (error_msg, output))
+            raise errors.CommandError("%s: %s" % (error_msg, output))
         else:
-            raise errors.BzrCommandError(error_msg)
+            raise errors.CommandError(error_msg)
 
 
 def build_source_package(basedir, tgz_check=True):
@@ -323,5 +323,5 @@
     if current_format == "3.0 (quilt)":
         convert_3_0_quilt_to_native(working_tree_path)
     elif current_format not in ("1.0", "3.0 (native)"):
-        raise errors.BzrCommandError("Unknown source format %s" %
-                                     current_format)
+        raise errors.CommandError("Unknown source format %s" %
+                                  current_format)

=== modified file 'brzbuildrecipe/deb_version.py'
--- brzbuildrecipe/deb_version.py	2020-02-22 01:55:36 +0000
+++ brzbuildrecipe/deb_version.py	2022-08-19 17:37:12 +0000
@@ -142,7 +142,7 @@
             for name in base_branch.list_branch_names():
                 available_tokens.append(var_kls.determine_name(name))
             available_tokens.append(var_kls.determine_name(None))
-        raise errors.BzrCommandError(
+        raise errors.CommandError(
                 "deb-version not fully "
                 "expanded: %s. Valid substitutions in recipe format %s are: %s"
                 % (base_branch.deb_version, base_branch.format,
@@ -150,7 +150,7 @@
 
 
 def substitute_branch_vars(base_branch, branch_name, branch, revid):
-    """Substitute the branch variables for the given branch name in deb_version.
+    """Substitute the branch variables for the given branch name.
 
     Where deb_version has a place to substitute the revno for a branch
     this will substitute it for the given branch name.

=== modified file 'brzbuildrecipe/main.py'
--- brzbuildrecipe/main.py	2020-02-22 01:55:36 +0000
+++ brzbuildrecipe/main.py	2022-08-19 17:37:12 +0000
@@ -64,7 +64,7 @@
         (basename, f) = get_recipe_from_location(
             recipe_location, possible_transports)
     except errors.NoSuchFile:
-        raise errors.BzrCommandError(
+        raise errors.CommandError(
             "Specified recipe does not exist: %s" % recipe_location)
     try:
         parser = RecipeParser(f, filename=recipe_location)
@@ -169,6 +169,6 @@
             location, possible_transports=possible_transports)
     else:
         if revspec is not None:
-            raise errors.BzrCommandError(
+            raise errors.CommandError(
                 "--revision only supported when building from branch")
     return base_branch

=== modified file 'brzbuildrecipe/ppa.py'
--- brzbuildrecipe/ppa.py	2020-02-22 01:55:36 +0000
+++ brzbuildrecipe/ppa.py	2022-08-19 17:37:12 +0000
@@ -51,7 +51,7 @@
         if not sourceRecords:
             if time.time() - 900 > start:
                 # Over 15 minutes and no source yet, upload FAIL.
-                raise errors.BzrCommandError(
+                raise errors.CommandError(
                     "No source record in %s/%s for "
                     "package %s=%s after 15 minutes." % (
                         owner_name, archive_name, package_name, version))

=== modified file 'brzbuildrecipe/recipe.py'
--- brzbuildrecipe/recipe.py	2020-02-22 16:11:41 +0000
+++ brzbuildrecipe/recipe.py	2022-08-19 17:37:12 +0000
@@ -38,6 +38,11 @@
     from breezy.config import NoWhoami
 from breezy.merge import MergeIntoMerger
 
+try:
+    from breezy.revisionspec import InvalidRevisionSpec
+except ImportError:  # breezy < 3.3
+    from breezy.errors import InvalidRevisionSpec
+
 
 def subprocess_setup():
     signal.signal(signal.SIGPIPE, signal.SIG_DFL)
@@ -175,7 +180,7 @@
     def get(self):
         revno = self.get_revno()
         if revno is None:
-            raise errors.BzrCommandError(
+            raise errors.CommandError(
                 "Can't substitute revno of "
                 "branch %s in deb-version, as it's revno can't be "
                 "determined" % revno)
@@ -233,7 +238,7 @@
         try:
             revno = extract_svn_revnum(rev)
         except errors.InvalidRevisionId:
-            raise errors.BzrCommandError(
+            raise errors.CommandError(
                 "unable to expand %s for %r in %r: "
                 "not a Subversion revision" % (
                     self.name, self.revid, self.branch))
@@ -269,7 +274,7 @@
         try:
             commit_sha = extract_git_foreign_revid(rev)
         except errors.InvalidRevisionId:
-            raise errors.BzrCommandError(
+            raise errors.CommandError(
                 "unable to expand %s for %r in %r: "
                 "not a Git revision" % (
                     self.name, self.revid, self.branch))
@@ -290,7 +295,7 @@
                 if revid in reverse_tag_dict:
                     return list(reverse_tag_dict[revid])[0]
             else:
-                raise errors.BzrCommandError(
+                raise errors.CommandError(
                     "No tags set on branch %s mainline" % self.branch_name)
 
 
@@ -322,8 +327,8 @@
     except errors.FileExists:
         pass
     except errors.NoSuchFile:
-        raise errors.BzrCommandError('Parent of "%s" does not exist.'
-                                     % to_transport.base)
+        raise errors.CommandError('Parent of "%s" does not exist.'
+                                  % to_transport.base)
 
 
 def pull_or_branch(
@@ -399,7 +404,7 @@
             conflicts = tree_to.conflicts()
             if len(conflicts) > 0:
                 # FIXME: better reporting
-                raise errors.BzrCommandError("Conflicts... aborting.")
+                raise errors.CommandError("Conflicts... aborting.")
         except BaseException:
             if created_br_to:
                 br_to.unlock()
@@ -430,7 +435,7 @@
             try:
                 merge_revid = merge_revspec.as_revision_id(
                     child_branch.branch)
-            except errors.InvalidRevisionSpec as e:
+            except InvalidRevisionSpec as e:
                 # Give the user a hint if they didn't mean to speciy
                 # a revspec.
                 e.extra = (
@@ -459,7 +464,7 @@
         merger.set_pending()
         if conflict_count:
             # FIXME: better reporting
-            raise errors.BzrCommandError("Conflicts from merge")
+            raise errors.CommandError("Conflicts from merge")
         config = br_to.get_config()
         try:
             committer = config.username()
@@ -510,7 +515,7 @@
 
     if conflict_count:
         # FIXME: better reporting
-        raise errors.BzrCommandError("Conflicts from merge")
+        raise errors.CommandError("Conflicts from merge")
     tree_to.commit(
         "Merge %s of %s" %
         (subpath, urlutils.unescape_for_display(child_branch.url, 'utf-8')))

=== modified file 'brzbuildrecipe/tests/test_deb_version.py'
--- brzbuildrecipe/tests/test_deb_version.py	2020-02-22 16:11:41 +0000
+++ brzbuildrecipe/tests/test_deb_version.py	2022-08-19 17:37:12 +0000
@@ -188,7 +188,7 @@
         resolve_revisions(
             branch1, substitute_branch_vars=substitute_branch_vars)
         self.assertRaises(
-            errors.BzrCommandError, check_expanded_deb_version, branch1)
+            errors.CommandError, check_expanded_deb_version, branch1)
 
     def test_substitute_svn_not_svn(self):
         br = self.make_branch("source")
@@ -197,7 +197,7 @@
         source.commit("two")
         branch1 = BaseRecipeBranch("source", "foo-{svn-revno}", 0.4)
         e = self.assertRaises(
-            errors.BzrCommandError, resolve_revisions,
+            errors.CommandError, resolve_revisions,
             branch1, None, substitute_branch_vars)
         self.assertTrue(str(e).startswith(
             "unable to expand {svn-revno} "), e)
@@ -220,7 +220,7 @@
         source.commit("two")
         branch1 = BaseRecipeBranch("source", "foo-{git-commit}", 0.4)
         e = self.assertRaises(
-            errors.BzrCommandError, resolve_revisions,
+            errors.CommandError, resolve_revisions,
             branch1, None, substitute_branch_vars)
         self.assertTrue(str(e).startswith("unable to expand {git-commit} "), e)
 
@@ -249,7 +249,7 @@
         source.commit("two")
         branch1 = BaseRecipeBranch("source", "foo-{latest-tag}", 0.4)
         e = self.assertRaises(
-            errors.BzrCommandError, resolve_revisions, branch1,
+            errors.CommandError, resolve_revisions, branch1,
             substitute_branch_vars=substitute_branch_vars)
         self.assertTrue(
             str(e).startswith("No tags set on branch None mainline"), e)

=== modified file 'brzbuildrecipe/tests/test_recipe.py'
--- brzbuildrecipe/tests/test_recipe.py	2020-02-22 01:55:36 +0000
+++ brzbuildrecipe/tests/test_recipe.py	2022-08-19 17:37:12 +0000
@@ -24,11 +24,14 @@
         TestCaseInTempDir,
         TestCaseWithTransport,
         )
+
+
 from ..recipe import (
         BaseRecipeBranch,
         build_tree,
         ensure_basedir,
         InstructionParseError,
+        InvalidRevisionSpec,
         ForbiddenInstructionError,
         MERGE_INSTRUCTION,
         NEST_INSTRUCTION,
@@ -596,7 +599,7 @@
         ensure_basedir(to_transport)
         self.assertPathExists("a")
         e = self.assertRaises(
-            errors.BzrCommandError, ensure_basedir,
+            errors.CommandError, ensure_basedir,
             transport.get_transport("b/c"))
         self.assertTrue('Parent of "' in str(e))
         self.assertTrue('" does not exist.' in str(e))
@@ -825,7 +828,7 @@
         merged_branch = RecipeBranch("merged", "source2")
         base_branch.merge_branch(merged_branch)
         self.assertRaises(
-            errors.BzrCommandError, build_tree, base_branch, "target")
+            errors.CommandError, build_tree, base_branch, "target")
         self.assertPathExists("target")
         tree = workingtree.WorkingTree.open("target")
         self.assertEqual(source1_rev_id, tree.last_revision())
@@ -968,7 +971,7 @@
         rev_id = source.commit("two")
         source.branch.tags.set_tag("one", rev_id)
         e = self.assertRaises(
-            errors.BzrCommandError, pull_or_branch, tree_to, br_to,
+            errors.CommandError, pull_or_branch, tree_to, br_to,
             source.branch, to_transport, rev_id, accelerator_tree=source)
         self.assertEqual("Conflicts... aborting.", str(e))
         tree_to.unlock()
@@ -1005,7 +1008,7 @@
         merged_branch = RecipeBranch("merged", "source", revspec="debian")
         base_branch.merge_branch(merged_branch)
         e = self.assertRaises(
-            errors.InvalidRevisionSpec, build_tree, base_branch, "target")
+            InvalidRevisionSpec, build_tree, base_branch, "target")
         self.assertTrue(
             str(e).startswith(
                 "Requested revision: 'debian' does not exist in branch: "))

=== modified file 'releaser.conf'
--- releaser.conf	2022-08-19 17:26:43 +0000
+++ releaser.conf	2022-08-19 17:37:12 +0000
@@ -1,7 +1,7 @@
 # See https://github.com/jelmer/releaser
 timeout_days: 5
 tag_name: "$VERSION"
-verify_command: "flake8 && BRZ_PLUGINS_AT=loom@`pwd` brz selftest -s bp.builder"
+verify_command: "flake8 && PYTHONPATH=`pwd` python3 -m unittest brzbuildrecipe.tests.test_suite"
 update_version {
   path: "setup.py"
   new_line: "version = $TUPLED_STATUS_VERSION"