diff options
| author |   Linda Wang <wangwulin@huawei.com> | 2017-08-28 08:26:08 +0000 |
|---|---|---|
| committer | Linda Wang <wangwulin@huawei.com> | 2017-08-29 03:47:02 +0000 |
| commit | 85ed13e38245eee2c957e76cd6834aa6668d6293 (patch) | |
| tree | 72ae5bb91ec0fc6d97d50345a39beb02481799ff | |
| parent | cb239a2a5ec46086ce8c046e2db4cb7eb7b18181 (diff) | |
Remove get_installer_type
JIRA: FUNCTEST-763
Change-Id: Ib05f699063393eb6eaa9f559854aca50b77aead3
Signed-off-by: Linda Wang <wangwulin@huawei.com>
| -rw-r--r-- | functest/tests/unit/utils/test_functest_utils.py | 17 | ||||
| -rw-r--r-- | functest/utils/functest_utils.py | 13 |
2 files changed, 0 insertions, 30 deletions
diff --git a/functest/tests/unit/utils/test_functest_utils.py b/functest/tests/unit/utils/test_functest_utils.py index d67f41350..17fb4c1f8 100644 --- a/functest/tests/unit/utils/test_functest_utils.py +++ b/functest/tests/unit/utils/test_functest_utils.py @@ -97,23 +97,6 @@ class FunctestUtilsTesting(unittest.TestCase): m.assert_called_once_with(dest, 'wb') self.assertTrue(mock_sh.called) - @mock.patch('functest.utils.functest_utils.logger.error') - def test_get_installer_type_failed(self, mock_logger_error): - with mock.patch.dict(os.environ, - {}, - clear=True): - self.assertEqual(functest_utils.get_installer_type(), - "Unknown_installer") - mock_logger_error.assert_called_once_with("Impossible to retrieve" - " the installer type") - - def test_get_installer_type_default(self): - with mock.patch.dict(os.environ, - {'INSTALLER_TYPE': 'test_installer'}, - clear=True): - self.assertEqual(functest_utils.get_installer_type(), - self.installer) - def test_get_version_daily_job(self): CONST.__setattr__('BUILD_TAG', self.build_tag) self.assertEqual(functest_utils.get_version(), self.version) diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py index a7c61ce15..e4062373c 100644 --- a/functest/utils/functest_utils.py +++ b/functest/utils/functest_utils.py @@ -68,19 +68,6 @@ def download_url(url, dest_path): # CI UTILS # # ----------------------------------------------------------- -def get_installer_type(): - """ - Get installer type (fuel, apex, joid, compass) - """ - try: - installer = os.environ['INSTALLER_TYPE'] - except KeyError: - logger.error("Impossible to retrieve the installer type") - installer = "Unknown_installer" - - return installer - - def get_version(): """ Get version |