From 8624488bd27873b4c8d52cfc30755bddf4841708 Mon Sep 17 00:00:00 2001 From: cortadocodes Date: Fri, 18 Jun 2021 18:49:59 +0100 Subject: [PATCH 1/2] TST: Ensure tests always receive test result modifier on Windows --- tests/__init__.py | 7 ------- tests/base.py | 6 ++++++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/__init__.py b/tests/__init__.py index b8cefa61e..0aed1d6aa 100644 --- a/tests/__init__.py +++ b/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) diff --git a/tests/base.py b/tests/base.py index fdaae2cef..42f17a843 100644 --- a/tests/base.py +++ b/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__)) From 3f076d693133c02eebe4bbc342a4e29b6e495777 Mon Sep 17 00:00:00 2001 From: cortadocodes Date: Fri, 18 Jun 2021 18:55:31 +0100 Subject: [PATCH 2/2] OPS: Increase version to 0.1.24 skip_ci_tests --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3b00f1d9b..157d92636 100644 --- a/setup.py +++ b/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",