2 files changed, 24 insertions, 38 deletions
diff --git a/functest/api/resources/v1/envs.py b/functest/api/resources/v1/envs.py
index 65e61c4b..3e6f05ac 100644
--- a/functest/api/resources/v1/envs.py
+++ b/functest/api/resources/v1/envs.py
@@ -20,7 +20,6 @@ from flasgger.utils import swag_from
 from functest.api.base import ApiResource
 from functest.api.common import api_utils
 from functest.cli.commands.cli_env import Env
-import functest.utils.functest_utils as ft_utils
 
 ADDRESS = socket.gethostbyname(socket.gethostname())
 ENDPOINT_ENVS = ('http://{}:5000/api/v1/functest/envs'.format(ADDRESS))
@@ -45,16 +44,6 @@ class V1Envs(ApiResource):
         """ Used to handle post request """
         return self._dispatch_post()
 
-    def prepare(self, args):  # pylint: disable=no-self-use, unused-argument
-        """ Prepare environment """
-
-        result_env = ft_utils.execute_command("prepare_env start")
-        if not result_env == 0:
-            return api_utils.result_handler(
-                status=1, data="Failed to prepare env")
-        return api_utils.result_handler(
-            status=0, data="Prepare env successfully")
-
     def update_hosts(self, hosts_info):  # pylint: disable=no-self-use
         """ Update hosts info """
 
diff --git a/functest/api/resources/v1/testcases.py b/functest/api/resources/v1/testcases.py
index 7cc70bbc..01571548 100644
--- a/functest/api/resources/v1/testcases.py
+++ b/functest/api/resources/v1/testcases.py
@@ -115,34 +115,31 @@ class V1Testcase(ApiResource):
         case_name = args.get('testcase')
         self._update_logging_ini(args.get('task_id'))
 
-        if not os.path.isfile(CONST.__getattribute__('env_active')):
-            raise Exception("Functest environment is not ready.")
+        try:
+            cmd = "run_tests -t {}".format(case_name)
+            runner = ft_utils.execute_command(cmd)
+        except Exception:  # pylint: disable=broad-except
+            result = 'FAIL'
+            LOGGER.exception("Running test case %s failed!", case_name)
+        if runner == os.EX_OK:
+            result = 'PASS'
         else:
-            try:
-                cmd = "run_tests -t {}".format(case_name)
-                runner = ft_utils.execute_command(cmd)
-            except Exception:  # pylint: disable=broad-except
-                result = 'FAIL'
-                LOGGER.exception("Running test case %s failed!", case_name)
-            if runner == os.EX_OK:
-                result = 'PASS'
-            else:
-                result = 'FAIL'
-
-            env_info = {
-                'installer': CONST.__getattribute__('INSTALLER_TYPE'),
-                'scenario': CONST.__getattribute__('DEPLOY_SCENARIO'),
-                'build_tag': CONST.__getattribute__('BUILD_TAG'),
-                'ci_loop': CONST.__getattribute__('CI_LOOP')
-            }
-            result = {
-                'task_id': args.get('task_id'),
-                'testcase': case_name,
-                'env_info': env_info,
-                'result': result
-            }
-
-            return {'result': result}
+            result = 'FAIL'
+
+        env_info = {
+            'installer': CONST.__getattribute__('INSTALLER_TYPE'),
+            'scenario': CONST.__getattribute__('DEPLOY_SCENARIO'),
+            'build_tag': CONST.__getattribute__('BUILD_TAG'),
+            'ci_loop': CONST.__getattribute__('CI_LOOP')
+        }
+        result = {
+            'task_id': args.get('task_id'),
+            'testcase': case_name,
+            'env_info': env_info,
+            'result': result
+        }
+
+        return {'result': result}
 
     def _update_logging_ini(self, task_id):  # pylint: disable=no-self-use
         """ Update the log file for each task"""