From d53e3d7a4e34502781b095e2221f73f3c805b43a Mon Sep 17 00:00:00 2001
From: StrikerRUS <nekit94-12@hotmail.com>
Date: Fri, 22 Nov 2019 06:25:29 +0300
Subject: [PATCH] move global tmp dir creation to pytest fixture

---
 tests/conftest.py                   |  8 ++++++++
 tests/e2e/executors/base.py         |  8 +++-----
 tests/e2e/executors/visual_basic.py | 17 +++++++----------
 tests/e2e/test_e2e.py               |  5 +++--
 4 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 47e38dfa..0fed8f28 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,5 +1,7 @@
 import pytest
 
+from tests import utils
+
 
 def pytest_addoption(parser):
     parser.addoption(
@@ -11,3 +13,9 @@ def pytest_addoption(parser):
 @pytest.fixture
 def is_fast(request):
     return request.config.getoption("--fast")
+
+
+@pytest.fixture(scope="module")
+def global_tmp_dir():
+    with utils.tmp_dir() as directory:
+        yield directory
diff --git a/tests/e2e/executors/base.py b/tests/e2e/executors/base.py
index 0ee47e08..adb62637 100644
--- a/tests/e2e/executors/base.py
+++ b/tests/e2e/executors/base.py
@@ -6,7 +6,6 @@
 class BaseExecutor:
 
     _resource_tmp_dir = None
-    _global_resource_tmp_dir = None
 
     @contextlib.contextmanager
     def prepare_then_cleanup(self):
@@ -23,7 +22,6 @@ def prepare(self):
         raise NotImplementedError
 
     @classmethod
-    def prepare_global(cls):
-        if cls._global_resource_tmp_dir is None:
-            with utils.tmp_dir() as tmp_dirpath:
-                cls._global_resource_tmp_dir = tmp_dirpath
+    def prepare_global(cls, **kwargs):
+        for key, value in kwargs.items():
+            setattr(cls, "_{}".format(key), value)
diff --git a/tests/e2e/executors/visual_basic.py b/tests/e2e/executors/visual_basic.py
index 8df3eba7..0e2363dd 100644
--- a/tests/e2e/executors/visual_basic.py
+++ b/tests/e2e/executors/visual_basic.py
@@ -56,17 +56,16 @@ def predict(self, X):
         return utils.predict_from_commandline(exec_args)
 
     @classmethod
-    def prepare_global(cls):
-        super(VisualBasicExecutor, cls).prepare_global()
+    def prepare_global(cls, **kwargs):
+        super(VisualBasicExecutor, cls).prepare_global(**kwargs)
         if cls.target_exec_dir is None:
-            cls.target_exec_dir = os.path.join(cls._global_resource_tmp_dir,
-                                               "bin")
+            cls.target_exec_dir = os.path.join(cls._global_tmp_dir, "bin")
 
             subprocess.call([cls._dotnet,
                              "new",
                              "console",
                              "--output",
-                             cls._global_resource_tmp_dir,
+                             cls._global_tmp_dir,
                              "--name",
                              cls.project_name,
                              "--language",
@@ -81,10 +80,8 @@ def prepare(self):
             print_code=print_code)
         model_code = self.interpreter.interpret(self.model_ast)
 
-        model_file_name = os.path.join(self._global_resource_tmp_dir,
-                                       "Model.vb")
-        executor_file_name = os.path.join(self._global_resource_tmp_dir,
-                                          "Program.vb")
+        model_file_name = os.path.join(self._global_tmp_dir, "Model.vb")
+        executor_file_name = os.path.join(self._global_tmp_dir, "Program.vb")
         with open(model_file_name, "w") as f:
             f.write(model_code)
         with open(executor_file_name, "w") as f:
@@ -92,7 +89,7 @@ def prepare(self):
 
         subprocess.call([self._dotnet,
                          "build",
-                         os.path.join(self._global_resource_tmp_dir,
+                         os.path.join(self._global_tmp_dir,
                                       "{}.vbproj".format(self.project_name)),
                          "--output",
                          self.target_exec_dir])
diff --git a/tests/e2e/test_e2e.py b/tests/e2e/test_e2e.py
index 97b8703a..2cf7db65 100644
--- a/tests/e2e/test_e2e.py
+++ b/tests/e2e/test_e2e.py
@@ -173,7 +173,8 @@ def classification_binary(model):
 
     # <empty>
 )
-def test_e2e(estimator, executor_cls, model_trainer, is_fast):
+def test_e2e(estimator, executor_cls, model_trainer,
+             is_fast, global_tmp_dir):
     sys.setrecursionlimit(RECURSION_LIMIT)
 
     X_test, y_pred_true = model_trainer(estimator)
@@ -181,7 +182,7 @@ def test_e2e(estimator, executor_cls, model_trainer, is_fast):
 
     idxs_to_test = [0] if is_fast else range(len(X_test))
 
-    executor.prepare_global()
+    executor.prepare_global(global_tmp_dir=global_tmp_dir)
     with executor.prepare_then_cleanup():
         for idx in idxs_to_test:
             y_pred_executed = executor.predict(X_test[idx])