diff options
author | Cedric Ollivier <cedric.ollivier@orange.com> | 2017-09-11 06:08:20 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-09-11 06:08:20 +0000 |
commit | 6dac04c5556db7fa2dc4088116b91509f4e73084 (patch) | |
tree | 22981177937e4a3bf177461e801a0f082cc4cac1 | |
parent | 94442c0ea7245b0f69da547c1924b0a9325f21cc (diff) | |
parent | fc8a2b28d5ee71290a7c057946b2e72db0f4a39e (diff) |
Merge "Remove get_repo_tag"
-rw-r--r-- | functest/opnfv_tests/openstack/tempest/conf_utils.py | 11 | ||||
-rw-r--r-- | functest/tests/unit/openstack/tempest/test_conf_utils.py | 11 |
2 files changed, 0 insertions, 22 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index 72ea5ce72..4202df625 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -115,17 +115,6 @@ def get_verifier_deployment_dir(verifier_id, deployment_id): 'for-deployment-{}'.format(deployment_id)) -def get_repo_tag(repo): - """ - Returns last tag of current branch - """ - cmd = ("git -C {0} describe --abbrev=0 HEAD".format(repo)) - p = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True) - tag = p.stdout.readline().rstrip() - - return str(tag) - - def backup_tempest_config(conf_file): """ Copy config file to tempest results directory diff --git a/functest/tests/unit/openstack/tempest/test_conf_utils.py b/functest/tests/unit/openstack/tempest/test_conf_utils.py index 22017a7a2..50b0edc60 100644 --- a/functest/tests/unit/openstack/tempest/test_conf_utils.py +++ b/functest/tests/unit/openstack/tempest/test_conf_utils.py @@ -157,17 +157,6 @@ class OSTempestConfUtilsTesting(unittest.TestCase): self.assertTrue(m1.called) self.assertTrue(m2.called) - def test_get_repo_tag_default(self): - mock_popen = mock.Mock() - attrs = {'stdout.readline.return_value': 'test_tag'} - mock_popen.configure_mock(**attrs) - - with mock.patch('functest.opnfv_tests.openstack.tempest.' - 'conf_utils.subprocess.Popen', - return_value=mock_popen): - self.assertEqual(conf_utils.get_repo_tag('test_repo'), - 'test_tag') - def test_backup_tempest_config_default(self): with mock.patch('functest.opnfv_tests.openstack.tempest.' 'conf_utils.os.path.exists', |