From 5af8bc99f0618293d1f759e49d5eab7a3ed9dc21 Mon Sep 17 00:00:00 2001 From: Matt Prahl Date: Wed, 1 Mar 2017 14:27:16 -0500 Subject: [PATCH] Change format_mmd test to be more consistent. --- tests/test_utils/test_utils.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/test_utils/test_utils.py b/tests/test_utils/test_utils.py index 4795ae91..3fec6159 100644 --- a/tests/test_utils/test_utils.py +++ b/tests/test_utils/test_utils.py @@ -43,10 +43,11 @@ class TestUtils(unittest.TestCase): mocked_scm.return_value.commit = \ '620ec77321b2ea7b0d67d82992dda3e1d67055b4' # For all the RPMs in testmodule, get_latest is called - mocked_scm.return_value.get_latest.side_effect = [ + hashes_returned = [ '4ceea43add2366d8b8c5a622a2fb563b625b9abf', 'fbed359411a1baa08d4a88e0d12d426fbf8f602c', '76f9d8c8e87eed0aab91034b01d3d5ff6bd5b4cb'] + mocked_scm.return_value.get_latest.side_effect = hashes_returned mmd = modulemd.ModuleMetadata() with open(path.join(BASE_DIR, '..', 'staged_data', 'testmodule.yaml')) \ as mmd_file: @@ -55,13 +56,13 @@ class TestUtils(unittest.TestCase): ('git://pkgs.stg.fedoraproject.org/modules/testmodule.git' '?#620ec77321b2ea7b0d67d82992dda3e1d67055b4') module_build_service.utils.format_mmd(mmd, scmurl) + + # Make sure all the commit hashes were properly set on the RPMs + for i, pkg in enumerate(mmd.components.rpms.values()): + self.assertEqual( + pkg.ref, hashes_returned[i]) + self.assertEqual(mmd.buildrequires, {'base-runtime': 'master'}) - self.assertEqual(mmd.components.rpms['perl-Tangerine'].ref, - '4ceea43add2366d8b8c5a622a2fb563b625b9abf') - self.assertEqual(mmd.components.rpms['tangerine'].ref, - 'fbed359411a1baa08d4a88e0d12d426fbf8f602c') - self.assertEqual(mmd.components.rpms['perl-List-Compare'].ref, - '76f9d8c8e87eed0aab91034b01d3d5ff6bd5b4cb') xmd = { 'mbs': { 'commit': '620ec77321b2ea7b0d67d82992dda3e1d67055b4',