MRG: Merge pull request #189 from octue/fix/ensure-tests-always-use-test-result-modifier

Ensure tests always receive test result modifier on Windows

Author: cortadocodes

setup.py

@@ -17,7 +17,7 @@
 
 setup(
     name="octue",
-    version="0.1.23",  # Ensure all requirements files containing octue are updated, too (e.g. docs build).
+    version="0.1.24",  # Ensure all requirements files containing octue are updated, too (e.g. docs build).
     py_modules=["cli"],
     install_requires=[
         "click>=7.1.2",

tests/__init__.py

@@ -1,13 +1,6 @@
 import os
-import unittest
-
-from octue.cloud.emulators import GoogleCloudStorageEmulatorTestResultModifier
 
 
 TESTS_DIR = os.path.dirname(__file__)
 TEST_PROJECT_NAME = os.environ["TEST_PROJECT_NAME"]
 TEST_BUCKET_NAME = "octue-test-bucket"
-
-test_result_modifier = GoogleCloudStorageEmulatorTestResultModifier(default_bucket_name=TEST_BUCKET_NAME)
-setattr(unittest.TestResult, "startTestRun", test_result_modifier.startTestRun)
-setattr(unittest.TestResult, "stopTestRun", test_result_modifier.stopTestRun)

tests/base.py

@@ -5,9 +5,11 @@
 import uuid
 from tempfile import TemporaryDirectory, gettempdir
 
+from octue.cloud.emulators import GoogleCloudStorageEmulatorTestResultModifier
 from octue.logging_handlers import apply_log_handler
 from octue.mixins import MixinBase, Pathable
 from octue.resources import Datafile, Dataset, Manifest
+from tests import TEST_BUCKET_NAME
 
 
 logger = logging.getLogger(__name__)
@@ -23,6 +25,10 @@ class BaseTestCase(unittest.TestCase):
     - sets a path to the test data directory
     """
 
+    test_result_modifier = GoogleCloudStorageEmulatorTestResultModifier(default_bucket_name=TEST_BUCKET_NAME)
+    setattr(unittest.TestResult, "startTestRun", test_result_modifier.startTestRun)
+    setattr(unittest.TestResult, "stopTestRun", test_result_modifier.stopTestRun)
+
     def setUp(self):
         # Set up paths to the test data directory and to the app templates directory
         root_dir = os.path.dirname(os.path.abspath(__file__))