From 9b02605370f6b1d159f0bb4911daec53c2c96bc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Kadl=C4=8D=C3=ADk?= <frostyx@email.cz>
Date: Mon, 27 Feb 2017 21:03:20 +0100
Subject: [PATCH] Fix format_mmd function for empty scmurl

---
 module_build_service/utils.py  | 28 ++++++++++++++--------------
 tests/test_utils/test_utils.py | 29 +++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/module_build_service/utils.py b/module_build_service/utils.py
index aae2b7f7..51c2fb0a 100644
--- a/module_build_service/utils.py
+++ b/module_build_service/utils.py
@@ -444,23 +444,23 @@ def format_mmd(mmd, scmurl):
     # them because of dep-chain.
     from module_build_service.scm import SCM
 
-    mmd.xmd['mbs'] = {'scmurl': scmurl}
+    mmd.xmd['mbs'] = {'scmurl': scmurl, 'commit': None}
 
-    scm = SCM(scmurl)
-    # If a commit hash is provided, add that information to the modulemd
-    if scm.commit:
-        # We want to make sure we have the full commit hash for consistency
-        if SCM.is_full_commit_hash(scm.scheme, scm.commit):
-            full_scm_hash = scm.commit
-        else:
-            full_scm_hash = scm.get_full_commit_hash()
-
-        mmd.xmd['mbs']['commit'] = full_scm_hash
-    # If a commit hash wasn't provided then just get the latest from master
-    else:
+    # If module build was submitted via yaml file, there is no scmurl
+    if scmurl:
         scm = SCM(scmurl)
-        mmd.xmd['mbs']['commit'] = scm.get_latest()
+        # If a commit hash is provided, add that information to the modulemd
+        if scm.commit:
+            # We want to make sure we have the full commit hash for consistency
+            if SCM.is_full_commit_hash(scm.scheme, scm.commit):
+                full_scm_hash = scm.commit
+            else:
+                full_scm_hash = scm.get_full_commit_hash()
 
+            mmd.xmd['mbs']['commit'] = full_scm_hash
+        # If a commit hash wasn't provided then just get the latest from master
+        else:
+            mmd.xmd['mbs']['commit'] = scm.get_latest()
 
     # If the modulemd yaml specifies module buildrequires, replace the streams
     # with commit hashes
diff --git a/tests/test_utils/test_utils.py b/tests/test_utils/test_utils.py
index 3337d6ed..8cd37fd6 100644
--- a/tests/test_utils/test_utils.py
+++ b/tests/test_utils/test_utils.py
@@ -115,6 +115,35 @@ class TestUtils(unittest.TestCase):
         }
         self.assertEqual(mmd.xmd, xmd)
 
+    @vcr.use_cassette(
+        path.join(CASSETTES_DIR, 'tests.test_utils.TestUtils.test_format_mmd'))
+    @patch('module_build_service.scm.SCM')
+    def test_format_mmd_empty_scmurl(self, mocked_scm):
+        # For all the RPMs in testmodule, get_latest is called
+        mocked_scm.return_value.get_latest.side_effect = [
+             '4ceea43add2366d8b8c5a622a2fb563b625b9abf',
+             'fbed359411a1baa08d4a88e0d12d426fbf8f602c',
+             '76f9d8c8e87eed0aab91034b01d3d5ff6bd5b4cb']
+
+        mmd = modulemd.ModuleMetadata()
+        with open(path.join(BASE_DIR, '..', 'staged_data', 'testmodule.yaml')) \
+                as mmd_file:
+            mmd.loads(mmd_file)
+
+        module_build_service.utils.format_mmd(mmd, scmurl=None)
+        xmd = {
+            'mbs': {
+                'commit': None,
+                'buildrequires': {
+                    'base-runtime': {
+                        'ref': 'ae993ba84f4bce554471382ccba917ef16265f11',
+                        'stream': 'master',
+                        'version': '3'}},
+                'scmurl': None,
+            }
+        }
+        self.assertEqual(mmd.xmd, xmd)
+
     def test_get_reusable_component_same(self):
         test_reuse_component_init_data()
         new_module = models.ModuleBuild.query.filter_by(id=2).one()