get_hash() -> get_gitbuilder_hash()

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/teuthology/suite.py b/teuthology/suite.py
index 632f78fcd3250f0bd50753ad437ac1e4025594a8..35c19ab48d74042e3a9365c8ff1c39f583077550 100644 (file)
--- a/teuthology/suite.py
+++ b/teuthology/suite.py
@@ -239,8 +239,8 @@ def create_initial_config(suite, suite_branch, ceph_branch, teuthology_branch,
     elif kernel_branch is None:
         kernel_hash = None
     else:
-        kernel_hash = get_hash('kernel', kernel_branch, kernel_flavor,
-                               machine_type, distro)
+        kernel_hash = get_gitbuilder_hash('kernel', kernel_branch,
+                                          kernel_flavor, machine_type, distro)
         if not kernel_hash:
             schedule_fail(message="Kernel branch '{branch}' not found".format(
                 branch=kernel_branch), name=name)
@@ -423,8 +423,8 @@ def get_worker(machine_type):
         return machine_type
 
 
-def get_hash(project='ceph', branch='master', flavor='basic',
-             machine_type='plana', distro='ubuntu'):
+def get_gitbuilder_hash(project='ceph', branch='master', flavor='basic',
+                        machine_type='plana', distro='ubuntu'):
     """
     Find the hash representing the head of the project's repository via
     querying a gitbuilder repo.

diff --git a/teuthology/test/test_suite.py b/teuthology/test/test_suite.py
index ded7986cea0968c9ac09f26a67321bf02a1d9026..00be2b6d4888b59aeaa4473f8364944eb90c8d23 100644 (file)
--- a/teuthology/test/test_suite.py
+++ b/teuthology/test/test_suite.py
@@ -103,7 +103,7 @@ class TestSuiteOffline(object):
         mock_resp.ok = True
         mock_resp.text = "the_hash"
         m_get.return_value = mock_resp
-        result = suite.get_hash()
+        result = suite.get_gitbuilder_hash()
         m_get.assert_called_with("http://baseurl.com/ref/master/sha1")
         assert result == "the_hash"
 
@@ -114,7 +114,7 @@ class TestSuiteOffline(object):
         mock_resp = Mock()
         mock_resp.ok = False
         m_get.return_value = mock_resp
-        result = suite.get_hash()
+        result = suite.get_gitbuilder_hash()
         assert result is None
 
     @patch('teuthology.suite.get_gitbuilder_url')
@@ -874,7 +874,6 @@ class TestSuiteMain(object):
                 suite,
                 fetch_repos=DEFAULT,
                 prepare_and_schedule=prepare_and_schedule,
-                get_hash=fake_str,
                 package_version_for_hash=fake_str,
                 git_branch_exists=fake_bool,
                 git_ls_remote=fake_str,
@@ -916,8 +915,8 @@ class TestSuiteMain(object):
                 teuthology_schedule=DEFAULT,
                 sleep=DEFAULT,
                 get_arch=lambda x: 'x86_64',
+                get_gitbuilder_hash=DEFAULT,
                 git_ls_remote=lambda *args: '1234',
-                get_hash=DEFAULT,
                 package_version_for_hash=lambda *args: 'fake-9.5',
                 ) as m:
             config.suite_verify_ceph_hash = False
@@ -926,4 +925,4 @@ class TestSuiteMain(object):
                   '--throttle', throttle,
                   '--machine-type', machine_type])
             m['sleep'].assert_called_with(int(throttle))
-            m['get_hash'].assert_not_called()
+            m['get_gitbuilder_hash'].assert_not_called()