Remove get_installer_type 53/40353/2
authorLinda Wang <wangwulin@huawei.com>
Mon, 28 Aug 2017 08:26:08 +0000 (08:26 +0000)
committerLinda Wang <wangwulin@huawei.com>
Tue, 29 Aug 2017 03:47:02 +0000 (03:47 +0000)
JIRA: FUNCTEST-763

Change-Id: Ib05f699063393eb6eaa9f559854aca50b77aead3
Signed-off-by: Linda Wang <wangwulin@huawei.com>
functest/tests/unit/utils/test_functest_utils.py
functest/utils/functest_utils.py

index d67f413..17fb4c1 100644 (file)
@@ -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)
index a7c61ce..e406237 100644 (file)
@@ -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