Merge 3485a73 into e70c89f

release-engineering · Apr 30, 2019 · 9092ef1 · 9092ef1
2 parents e70c89f + 3485a73
commit 9092ef1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/tests/integration/flatten/flatten_test.py b/tests/integration/flatten/flatten_test.py
@@ -3,7 +3,6 @@
 # see the LICENSE file for license
 #
 
-import json
 import shutil
 import requests
 from distutils import dir_util
@@ -54,12 +53,7 @@ def test_flatten_with_nvr(omps, quay, koji, tmp_path_factory):
     flattened = tmp_path_factory.mktemp('flattened')
     koji.download_manifest(nvr, koji_data)
     courier.flatten(koji_data.as_posix(), flattened.as_posix())
-    koji_bundle = courier.build_and_verify(source_dir=flattened.as_posix())
-
-    with open('quay.bundle', 'w') as fp:
-        json.dump(quay_bundle, fp, indent=4, sort_keys=True)
-    with open('koji.bundle', 'w') as fp:
-        json.dump(koji_bundle, fp, indent=4, sort_keys=True)
+    koji_bundle = courier.build_and_verify(source_dir=flattened.as_posix()).bundle
 
     # Note: this only confirms that OMPS used the right data from Koji,
     #       but tells nothing about the correctness of that data.

diff --git a/tests/integration/push_nvr/push_nvr_test.py b/tests/integration/push_nvr/push_nvr_test.py
@@ -89,7 +89,7 @@ def test_valid_zip_default_version(omps, quay, koji, tmp_path):
                                   test_env['test_package'], '1.0.0',
                                   authorization=None)
     koji.download_manifest(nvr, tmp_path)
-    koji_bundle = courier.build_and_verify(source_dir=tmp_path.as_posix())
+    koji_bundle = courier.build_and_verify(source_dir=tmp_path.as_posix()).bundle
 
     # Note: this only confirms that OMPS used the right data from Koji,
     #       but tells nothing about the correctness of that data.