Fix tests.

ognibuild/debian/build.py

@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 __all__ = [
-    "changes_filename",
     "get_build_architecture",
     "add_dummy_changelog_entry",
     "build",
@@ -54,11 +53,15 @@ class MissingChangesFile(Exception):
         self.filename = filename
 
 
-def changes_filename(package, version, arch):
+def find_changes_files(path, package, version):
     non_epoch_version = version.upstream_version
     if version.debian_version is not None:
         non_epoch_version += "-%s" % version.debian_version
-    return "%s_%s_%s.changes" % (package, non_epoch_version, arch)
+    c = re.compile('%s_%s_(.*).changes' % (re.escape(package), re.escape(non_epoch_version)))
+    for entry in os.scandir(path):
+        m = c.match(entry.name)
+        if m:
+            yield m.group(1), entry
 
 
 def get_build_architecture():
@@ -126,7 +129,7 @@ def add_dummy_changelog_entry(
             version.debian_revision = add_suffix(version.debian_revision, suffix)
         else:
             version.upstream_version = add_suffix(version.upstream_version, suffix)
-        editor.auto_version(version)
+        editor.auto_version(version, timestamp=timestamp)
         editor.add_entry(
             summary=[message], maintainer=maintainer, timestamp=timestamp, urgency='low')
         editor[0].distributions = suite
@@ -202,11 +205,10 @@ def build_once(
             raise worker_failure_from_sbuild_log(f)
 
     (cl_package, cl_version) = get_latest_changelog_version(local_tree, subpath)
-    changes_name = changes_filename(cl_package, cl_version, get_build_architecture())
+    changes_names = []
-    changes_path = os.path.join(output_directory, changes_name)
+    for kind, entry in find_changes_files(output_directory, cl_package, cl_version):
-    if not os.path.exists(changes_path):
+        changes_names.append((entry.name))
-        raise MissingChangesFile(changes_name)
+    return (changes_names, cl_version)
-    return (changes_name, cl_version)
 
 
 def gbp_dch(path):

ognibuild/debian/fix_build.py

@@ -647,7 +647,7 @@ def main(argv=None):
         apt = AptManager(session)
 
         try:
-            (changes_filename, cl_version) = build_incrementally(
+            (changes_filenames, cl_version) = build_incrementally(
                 tree,
                 apt,
                 args.suffix,
@@ -672,8 +672,8 @@ def main(argv=None):
             return 1
 
         logging.info(
-            'Built %s - changes file at %s.',
+            'Built %s - changes file at %r.',
-            os.path.join(output_directory, changes_filename))
+            os.path.join(output_directory, changes_files))
 
 
 if __name__ == "__main__":

ognibuild/tests/test_debian_build.py

@@ -53,17 +53,12 @@ janitor (0.1-1) UNRELEASED; urgency=medium
         )
         self.assertFileEqual(
             """\
-janitor (0.1-1jan+some1) some-fixes; urgency=low
+janitor (0.1-1jan+some1) some-fixes; urgency=medium
 
+  * Initial release. (Closes: #XXXXXX)
   * Dummy build.
 
  -- Jelmer Vernooij <jelmer@debian.org>  Sat, 05 Sep 2020 12:35:04 -0000
-
-janitor (0.1-1) UNRELEASED; urgency=medium
-
-  * Initial release. (Closes: #XXXXXX)
-
- -- Jelmer Vernooij <jelmer@debian.org>  Sat, 04 Apr 2020 14:12:13 +0000
 """,
             "debian/changelog",
         )
@@ -97,17 +92,12 @@ janitor (0.1) UNRELEASED; urgency=medium
         )
         self.assertFileEqual(
             """\
-janitor (0.1jan+some1) some-fixes; urgency=low
+janitor (0.1jan+some1) some-fixes; urgency=medium
 
+  * Initial release. (Closes: #XXXXXX)
   * Dummy build.
 
  -- Jelmer Vernooij <jelmer@debian.org>  Sat, 05 Sep 2020 12:35:04 -0000
-
-janitor (0.1) UNRELEASED; urgency=medium
-
-  * Initial release. (Closes: #XXXXXX)
-
- -- Jelmer Vernooij <jelmer@debian.org>  Sat, 04 Apr 2020 14:12:13 +0000
 """,
             "debian/changelog",
         )
@@ -141,17 +131,12 @@ janitor (0.1-1jan+some1) UNRELEASED; urgency=medium
         )
         self.assertFileEqual(
             """\
-janitor (0.1-1jan+some2) some-fixes; urgency=low
+janitor (0.1-1jan+some2) some-fixes; urgency=medium
 
+  * Initial release. (Closes: #XXXXXX)
   * Dummy build.
 
  -- Jelmer Vernooij <jelmer@debian.org>  Sat, 05 Sep 2020 12:35:04 -0000
-
-janitor (0.1-1jan+some1) UNRELEASED; urgency=medium
-
-  * Initial release. (Closes: #XXXXXX)
-
- -- Jelmer Vernooij <jelmer@debian.org>  Sat, 04 Apr 2020 14:12:13 +0000
 """,
             "debian/changelog",
         )