From ba7c850e35ebaa241bd3df3a297f3b146dfb9cea Mon Sep 17 00:00:00 2001
From: lukas leufen <l.leufen@fz-juelich.de>
Date: Thu, 18 Jun 2020 16:18:26 +0200
Subject: [PATCH] apply merge fixes
---
CI/update_badge.sh | 10 +-
src/configuration/__init__.py | 2 +-
src/configuration/path_config.py | 43 ++-
src/helpers.py | 314 --------------------
src/run_modules/experiment_setup.py | 5 +-
test/test_configuration/test_path_config.py | 30 +-
test/test_helpers.py | 74 -----
test/test_modules/test_partition_check.py | 11 +-
8 files changed, 40 insertions(+), 449 deletions(-)
delete mode 100644 src/helpers.py
delete mode 100644 test/test_helpers.py
diff --git a/CI/update_badge.sh b/CI/update_badge.sh
index 45e50f49..6238b16c 100644
--- a/CI/update_badge.sh
+++ b/CI/update_badge.sh
@@ -2,7 +2,7 @@
# 'running', 'success' or 'failure' is in this file
if [[ -e status.txt ]]; then
- EXIT_STATUS=`cat status.txt`
+ EXIT_STATUS=$(cat status.txt)
else
EXIT_STATUS="running"
fi
@@ -26,14 +26,14 @@ elif [[ ${EXIT_STATUS} = "success" ]]; then
BADGE_SUBJECT="passed"
BADGE_COLOR="brightgreen"
if [[ -e success.txt ]]; then
- SUCCESS_MESSAGE=`cat success.txt`
+ SUCCESS_MESSAGE=$(cat success.txt)
BADGE_SUBJECT="${SUCCESS_MESSAGE}"
fi
elif [[ ${EXIT_STATUS} = "incomplete" ]]; then
- EXIT_STATUS_MESSAGE=`cat incomplete.txt`
+ EXIT_STATUS_MESSAGE=$(cat incomplete.txt)
BADGE_SUBJECT="${EXIT_STATUS_MESSAGE}"
- EXIT_STATUS_RATIO="$(echo ${EXIT_STATUS_MESSAGE} | (grep -oP '\d*') | head -1)"
- printf "%s\n" ${EXIT_STATUS_RATIO}
+ EXIT_STATUS_RATIO="$(echo "${EXIT_STATUS_MESSAGE}" | (grep -oP '\d*') | head -1)"
+ printf "%s\n" "${EXIT_STATUS_RATIO}"
if [[ "${EXIT_STATUS_RATIO}" -lt "${FAILURE_THRESHOLD}" ]]; then
BADGE_COLOR="red"
else
diff --git a/src/configuration/__init__.py b/src/configuration/__init__.py
index 4b461174..48d9f38c 100644
--- a/src/configuration/__init__.py
+++ b/src/configuration/__init__.py
@@ -1,2 +1,2 @@
"""Collection of configuration functions, paths and classes."""
-from .path_config import ROOT_PATH, prepare_host, set_experiment_name, set_bootstrap_path, check_path_and_create
\ No newline at end of file
+from .path_config import ROOT_PATH, prepare_host, set_experiment_name, set_bootstrap_path, check_path_and_create, get_host
\ No newline at end of file
diff --git a/src/configuration/path_config.py b/src/configuration/path_config.py
index 289c1582..85a536cc 100644
--- a/src/configuration/path_config.py
+++ b/src/configuration/path_config.py
@@ -1,4 +1,5 @@
"""Functions related to path and os name setting."""
+import getpass
import logging
import os
import re
@@ -22,29 +23,23 @@ def prepare_host(create_new=True, data_path=None, sampling="daily") -> str:
:return: full path to data
"""
- hostname = socket.gethostname()
+ hostname = get_host()
+ user = getpass.getuser()
runner_regex = re.compile(r"runner-.*-project-2411-concurrent-\d+")
- try:
- user = os.getlogin()
- except OSError:
- user = "default"
- if data_path is None:
- if hostname == "ZAM144":
- path = f"/home/{user}/Data/toar_{sampling}/"
- elif hostname == "zam347":
- path = f"/home/{user}/Data/toar_{sampling}/"
- elif hostname == "linux-aa9b":
- path = f"/home/{user}/machinelearningtools/data/toar_{sampling}/"
- elif (len(hostname) > 2) and (hostname[:2] == "jr"):
- path = f"/p/project/cjjsc42/{user}/DATA/toar_{sampling}/"
- elif (len(hostname) > 2) and (hostname[:2] == "jw"):
- path = f"/p/home/jusers/{user}/juwels/intelliaq/DATA/toar_{sampling}/"
- elif runner_regex.match(hostname) is not None:
- path = f"/home/{user}/machinelearningtools/data/toar_{sampling}/"
- else:
- raise OSError(f"unknown host '{hostname}'")
+ if hostname == "ZAM144":
+ path = f"/home/{user}/Data/toar_{sampling}/"
+ elif hostname == "zam347":
+ path = f"/home/{user}/Data/toar_{sampling}/"
+ elif hostname == "linux-aa9b":
+ path = f"/home/{user}/machinelearningtools/data/toar_{sampling}/"
+ elif (len(hostname) > 2) and (hostname[:2] == "jr"):
+ path = f"/p/project/cjjsc42/{user}/DATA/toar_{sampling}/"
+ elif (len(hostname) > 2) and (hostname[:2] in ['jw', 'ju'] or hostname[:5] in ['hdfml']):
+ path = f"/p/project/deepacf/intelliaq/{user}/DATA/toar_{sampling}/"
+ elif runner_regex.match(hostname) is not None:
+ path = f"/home/{user}/machinelearningtools/data/toar_{sampling}/"
else:
- path = os.path.abspath(data_path)
+ raise OSError(f"unknown host '{hostname}'")
if not os.path.exists(path):
try:
if create_new:
@@ -114,4 +109,8 @@ def check_path_and_create(path: str) -> None:
os.makedirs(path)
logging.debug(f"Created path: {path}")
except FileExistsError:
- logging.debug(f"Path already exists: {path}")
\ No newline at end of file
+ logging.debug(f"Path already exists: {path}")
+
+
+def get_host():
+ return socket.gethostname()
\ No newline at end of file
diff --git a/src/helpers.py b/src/helpers.py
deleted file mode 100644
index 4a6b1b2f..00000000
--- a/src/helpers.py
+++ /dev/null
@@ -1,314 +0,0 @@
-import re
-
-__author__ = 'Lukas Leufen, Felix Kleinert'
-__date__ = '2019-10-21'
-
-
-import datetime as dt
-from functools import wraps
-import logging
-import math
-import os
-import getpass
-import socket
-import time
-import types
-
-
-import keras.backend as K
-import xarray as xr
-
-from typing import Dict, Callable, Pattern, Union
-
-
-def to_list(arg):
- if not isinstance(arg, list):
- arg = [arg]
- return arg
-
-
-def check_path_and_create(path):
- try:
- os.makedirs(path)
- logging.debug(f"Created path: {path}")
- except FileExistsError:
- logging.debug(f"Path already exists: {path}")
-
-
-def l_p_loss(power: int):
- """
- Calculate the L<p> loss for given power p. L1 (p=1) is equal to mean absolute error (MAE), L2 (p=2) is to mean
- squared error (MSE), ...
- :param power: set the power of the error calculus
- :return: loss for given power
- """
- def loss(y_true, y_pred):
- return K.mean(K.pow(K.abs(y_pred - y_true), power), axis=-1)
- return loss
-
-
-class TimeTrackingWrapper:
-
- def __init__(self, func):
- wraps(func)(self)
-
- def __call__(self, *args, **kwargs):
- with TimeTracking(name=self.__wrapped__.__name__):
- return self.__wrapped__(*args, **kwargs)
-
- def __get__(self, instance, cls):
- return types.MethodType(self, instance)
-
-
-class TimeTracking(object):
- """
- Track time to measure execution time. Time tracking automatically starts on initialisation and ends by calling stop
- method. Duration can always be shown by printing the time tracking object or calling get_current_duration.
- """
-
- def __init__(self, start=True, name="undefined job"):
- self.start = None
- self.end = None
- self._name = name
- if start:
- self._start()
-
- def _start(self):
- self.start = time.time()
- self.end = None
-
- def _end(self):
- self.end = time.time()
-
- def _duration(self):
- if self.end:
- return self.end - self.start
- else:
- return time.time() - self.start
-
- def __repr__(self):
- # return f"{round(self._duration(), 2)}s"
- return f"{dt.timedelta(seconds=math.ceil(self._duration()))} (hh:mm:ss)"
-
- def run(self):
- self._start()
-
- def stop(self, get_duration=False):
- if self.end is None:
- self._end()
- else:
- msg = f"Time was already stopped {time.time() - self.end}s ago."
- raise AssertionError(msg)
- if get_duration:
- return self.duration()
-
- def duration(self):
- return self._duration()
-
- def __enter__(self):
- return self
-
- def __exit__(self, exc_type, exc_val, exc_tb):
- self.stop()
- logging.info(f"{self._name} finished after {self}")
-
-
-def get_host():
- return socket.gethostname()
-
-
-def prepare_host(create_new=True, sampling="daily"):
-
- hostname = get_host()
- user = getpass.getuser()
- runner_regex = re.compile(r"runner-.*-project-2411-concurrent-\d+")
- if hostname == "ZAM144":
- path = f"/home/{user}/Data/toar_{sampling}/"
- elif hostname == "zam347":
- path = f"/home/{user}/Data/toar_{sampling}/"
- elif hostname == "linux-aa9b":
- path = f"/home/{user}/machinelearningtools/data/toar_{sampling}/"
- elif (len(hostname) > 2) and (hostname[:2] == "jr"):
- path = f"/p/project/cjjsc42/{user}/DATA/toar_{sampling}/"
- elif (len(hostname) > 2) and (hostname[:2] in ['jw', 'ju'] or hostname[:5] in ['hdfml']):
- path = f"/p/project/deepacf/intelliaq/{user}/DATA/toar_{sampling}/"
- elif runner_regex.match(hostname) is not None:
- path = f"/home/{user}/machinelearningtools/data/toar_{sampling}/"
- else:
- raise OSError(f"unknown host '{hostname}'")
- if not os.path.exists(path):
- try:
- if create_new:
- check_path_and_create(path)
- return path
- else:
- raise PermissionError
- except PermissionError:
- raise NotADirectoryError(f"path '{path}' does not exist for host '{hostname}'.")
- else:
- logging.debug(f"set path to: {path}")
- return path
-
-
-def set_experiment_name(experiment_date=None, experiment_path=None, sampling=None):
-
- if experiment_date is None:
- experiment_name = "TestExperiment"
- else:
- experiment_name = f"{experiment_date}_network"
- if sampling == "hourly":
- experiment_name += f"_{sampling}"
- if experiment_path is None:
- experiment_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", experiment_name))
- else:
- experiment_path = os.path.join(os.path.abspath(experiment_path), experiment_name)
- return experiment_name, experiment_path
-
-
-def set_bootstrap_path(bootstrap_path, data_path, sampling):
- if bootstrap_path is None:
- bootstrap_path = os.path.join(data_path, "..", f"bootstrap_{sampling}")
- check_path_and_create(bootstrap_path)
- return bootstrap_path
-
-
-class PyTestRegex:
- """Assert that a given string meets some expectations."""
-
- def __init__(self, pattern: Union[str, Pattern], flags: int = 0):
- self._regex = re.compile(pattern, flags)
-
- def __eq__(self, actual: str) -> bool:
- return bool(self._regex.match(actual))
-
- def __repr__(self) -> str:
- return self._regex.pattern
-
-
-class PyTestAllEqual:
-
- def __init__(self, check_list):
- self._list = check_list
-
- def _check_all_equal(self):
- equal = True
- for b in self._list:
- equal *= xr.testing.assert_equal(self._list[0], b) is None
- return equal == 1
-
- def is_true(self):
- return self._check_all_equal()
-
-
-def xr_all_equal(check_list):
- equal = True
- for b in check_list:
- equal *= xr.testing.assert_equal(check_list[0], b) is None
- return equal == 1
-
-
-def dict_to_xarray(d: Dict, coordinate_name: str) -> xr.DataArray:
- """
- Convert a dictionary of 2D-xarrays to single 3D-xarray. The name of new coordinate axis follows <coordinate_name>.
- :param d: dictionary with 2D-xarrays
- :param coordinate_name: name of the new created axis (2D -> 3D)
- :return: combined xarray
- """
- xarray = None
- for k, v in d.items():
- if xarray is None:
- xarray = v
- xarray.coords[coordinate_name] = k
- else:
- tmp_xarray = v
- tmp_xarray.coords[coordinate_name] = k
- xarray = xr.concat([xarray, tmp_xarray], coordinate_name)
- return xarray
-
-
-def float_round(number: float, decimals: int = 0, round_type: Callable = math.ceil) -> float:
- """
- Perform given rounding operation on number with the precision of decimals.
- :param number: the number to round
- :param decimals: numbers of decimals of the rounding operations (default 0 -> round to next integer value)
- :param round_type: the actual rounding operation. Can be any callable function like math.ceil, math.floor or python
- built-in round operation.
- :return: rounded number with desired precision
- """
- multiplier = 10. ** decimals
- return round_type(number * multiplier) / multiplier
-
-
-def list_pop(list_full: list, pop_items):
- pop_items = to_list(pop_items)
- if len(pop_items) > 1:
- return [e for e in list_full if e not in pop_items]
- else:
- l_pop = list_full.copy()
- try:
- l_pop.remove(pop_items[0])
- except ValueError:
- pass
- return l_pop
-
-
-def dict_pop(dict_orig: Dict, pop_keys):
- pop_keys = to_list(pop_keys)
- return {k: v for k, v in dict_orig.items() if k not in pop_keys}
-
-
-class Logger:
- """
- Basic logger class to unify all logging outputs. Logs are saved in local file and returned to std output. In default
- settings, logging level of file logger is DEBUG, logging level of stream logger is INFO. Class must be imported
- and initialised in starting script, all subscripts should log with logging.info(), debug, ...
- """
-
- def __init__(self, log_path=None, level_file=logging.DEBUG, level_stream=logging.INFO):
-
- # define shared logger format
- self.formatter = '%(asctime)s - %(levelname)s: %(message)s [%(filename)s:%(funcName)s:%(lineno)s]'
-
- # set log path
- self.log_file = self.setup_logging_path(log_path)
- # set root logger as file handler
- logging.basicConfig(level=level_file,
- format=self.formatter,
- filename=self.log_file,
- filemode='a')
- # add stream handler to the root logger
- logging.getLogger('').addHandler(self.logger_console(level_stream))
- # print logger path
- logging.info(f"File logger: {self.log_file}")
-
- @staticmethod
- def setup_logging_path(path: str = None):
- """
- Check if given path exists and creates if not. If path is None, use path from main. The logging file is named
- like `logging_<runtime>.log` where runtime=`%Y-%m-%d_%H-%M-%S` of current run.
- :param path: path to logfile
- :return: path of logfile
- """
- if not path: # set default path
- path = os.path.join(os.path.dirname(__file__), "..", "logging")
- if not os.path.exists(path):
- os.makedirs(path)
- runtime = time.strftime("%Y-%m-%d_%H-%M-%S", time.localtime())
- log_file = os.path.join(path, f'logging_{runtime}.log')
- return log_file
-
- def logger_console(self, level: int):
- """
- Defines a stream handler which writes messages of given level or higher to std out
- :param level: logging level as integer, e.g. logging.DEBUG or 10
- :return: defines stream handler
- """
- # define Handler
- console = logging.StreamHandler()
- # set level of Handler
- console.setLevel(level)
- # set a format which is simpler for console use
- formatter = logging.Formatter(self.formatter)
- # tell the handler to use this format
- console.setFormatter(formatter)
- return console
diff --git a/src/run_modules/experiment_setup.py b/src/run_modules/experiment_setup.py
index 112c3ff4..f34fb74d 100644
--- a/src/run_modules/experiment_setup.py
+++ b/src/run_modules/experiment_setup.py
@@ -5,9 +5,8 @@ import argparse
import logging
import os
from typing import Union, Dict, Any, List
-import socket
-
+import src.configuration.path_config
from src.configuration import path_config
from src import helpers
from src.run_modules.run_environment import RunEnvironment
@@ -248,7 +247,7 @@ class ExperimentSetup(RunEnvironment):
# experiment setup
self._set_param("data_path", path_config.prepare_host(data_path=data_path, sampling=sampling))
- self._set_param("hostname", helpers.get_host())
+ self._set_param("hostname", path_config.get_host())
self._set_param("hpc_hosts", hpc_hosts, default=DEFAULT_HPC_HOST_LIST + DEFAULT_HPC_LOGIN_LIST)
self._set_param("login_nodes", login_nodes, default=DEFAULT_HPC_LOGIN_LIST)
self._set_param("create_new_model", create_new_model, default=True)
diff --git a/test/test_configuration/test_path_config.py b/test/test_configuration/test_path_config.py
index cb40d583..c14d93bb 100644
--- a/test/test_configuration/test_path_config.py
+++ b/test/test_configuration/test_path_config.py
@@ -12,25 +12,25 @@ class TestPrepareHost:
@mock.patch("socket.gethostname", side_effect=["linux-aa9b", "ZAM144", "zam347", "jrtest", "jwtest",
"runner-6HmDp9Qd-project-2411-concurrent-01"])
- @mock.patch("os.getlogin", return_value="testUser")
+ @mock.patch("getpass.getuser", return_value="testUser")
@mock.patch("os.path.exists", return_value=True)
def test_prepare_host(self, mock_host, mock_user, mock_path):
assert prepare_host() == "/home/testUser/machinelearningtools/data/toar_daily/"
assert prepare_host() == "/home/testUser/Data/toar_daily/"
assert prepare_host() == "/home/testUser/Data/toar_daily/"
assert prepare_host() == "/p/project/cjjsc42/testUser/DATA/toar_daily/"
- assert prepare_host() == "/p/home/jusers/testUser/juwels/intelliaq/DATA/toar_daily/"
+ assert prepare_host() == "/p/project/deepacf/intelliaq/testUser/DATA/toar_daily/"
assert prepare_host() == '/home/testUser/machinelearningtools/data/toar_daily/'
@mock.patch("socket.gethostname", return_value="NotExistingHostName")
- @mock.patch("os.getlogin", return_value="zombie21")
+ @mock.patch("getpass.getuser", return_value="zombie21")
def test_error_handling_unknown_host(self, mock_user, mock_host):
with pytest.raises(OSError) as e:
prepare_host()
assert "unknown host 'NotExistingHostName'" in e.value.args[0]
- @mock.patch("os.getlogin", return_value="zombie21")
- @mock.patch("src.configuration.path_config.check_path_and_create", side_effect=PermissionError)
+ @mock.patch("getpass.getuser", return_value="zombie21")
+ @mock.patch("src.configuration.check_path_and_create", side_effect=PermissionError)
def test_error_handling(self, mock_cpath, mock_user):
# if "runner-6HmDp9Qd-project-2411-concurrent" not in platform.node():
# mock_host.return_value = "linux-aa9b"
@@ -42,26 +42,8 @@ class TestPrepareHost:
# assert "does not exist for host 'linux-aa9b'" in e.value.args[0]
assert PyTestRegex(r"path '.*' does not exist for host '.*'\.") == e.value.args[0]
- @mock.patch("socket.gethostname", side_effect=["linux-aa9b", "ZAM144", "zam347", "jrtest", "jwtest",
- "runner-6HmDp9Qd-project-2411-concurrent-01"])
- @mock.patch("os.getlogin", side_effect=OSError)
- @mock.patch("os.path.exists", return_value=True)
- def test_os_error(self, mock_path, mock_user, mock_host):
- path = prepare_host()
- assert path == "/home/default/machinelearningtools/data/toar_daily/"
- path = prepare_host()
- assert path == "/home/default/Data/toar_daily/"
- path = prepare_host()
- assert path == "/home/default/Data/toar_daily/"
- path = prepare_host()
- assert path == "/p/project/cjjsc42/default/DATA/toar_daily/"
- path = prepare_host()
- assert path == "/p/home/jusers/default/juwels/intelliaq/DATA/toar_daily/"
- path = prepare_host()
- assert path == '/home/default/machinelearningtools/data/toar_daily/'
-
@mock.patch("socket.gethostname", side_effect=["linux-aa9b"])
- @mock.patch("os.getlogin", return_value="testUser")
+ @mock.patch("getpass.getuser", return_value="testUser")
@mock.patch("os.path.exists", return_value=False)
@mock.patch("os.makedirs", side_effect=None)
def test_os_path_exists(self, mock_host, mock_user, mock_path, mock_check):
diff --git a/test/test_helpers.py b/test/test_helpers.py
deleted file mode 100644
index 7fd65f90..00000000
--- a/test/test_helpers.py
+++ /dev/null
@@ -1,74 +0,0 @@
-import logging
-import os
-import platform
-
-import keras
-import mock
-import numpy as np
-import pytest
-
-import re
-
-from src.helpers import *
-
-
-class TestPrepareHost:
-
- @mock.patch("socket.gethostname", side_effect=["linux-aa9b", "ZAM144", "zam347", "jrtest", "jwtest",
- "runner-6HmDp9Qd-project-2411-concurrent-01"])
- @mock.patch("os.getlogin", return_value="testUser")
- @mock.patch("os.path.exists", return_value=True)
- def test_prepare_host(self, mock_host, mock_user, mock_path):
- assert prepare_host() == "/home/testUser/machinelearningtools/data/toar_daily/"
- assert prepare_host() == "/home/testUser/Data/toar_daily/"
- assert prepare_host() == "/home/testUser/Data/toar_daily/"
- assert prepare_host() == "/p/project/cjjsc42/testUser/DATA/toar_daily/"
- assert prepare_host() == "/p/home/jusers/testUser/juwels/intelliaq/DATA/toar_daily/"
- assert prepare_host() == '/home/testUser/machinelearningtools/data/toar_daily/'
-
- @mock.patch("socket.gethostname", return_value="NotExistingHostName")
- @mock.patch("os.getlogin", return_value="zombie21")
- def test_error_handling_unknown_host(self, mock_user, mock_host):
- with pytest.raises(OSError) as e:
- prepare_host()
- assert "unknown host 'NotExistingHostName'" in e.value.args[0]
-
- @mock.patch("os.getlogin", return_value="zombie21")
- @mock.patch("src.helpers.check_path_and_create", side_effect=PermissionError)
- def test_error_handling(self, mock_cpath, mock_user):
- # if "runner-6HmDp9Qd-project-2411-concurrent" not in platform.node():
- # mock_host.return_value = "linux-aa9b"
- with pytest.raises(NotADirectoryError) as e:
- prepare_host()
- assert PyTestRegex(r"path '.*' does not exist for host '.*'\.") == e.value.args[0]
- with pytest.raises(NotADirectoryError) as e:
- prepare_host(False)
- # assert "does not exist for host 'linux-aa9b'" in e.value.args[0]
- assert PyTestRegex(r"path '.*' does not exist for host '.*'\.") == e.value.args[0]
-
- @mock.patch("socket.gethostname", side_effect=["linux-aa9b", "ZAM144", "zam347", "jrtest", "jwtest",
- "runner-6HmDp9Qd-project-2411-concurrent-01"])
- @mock.patch("os.getlogin", side_effect=OSError)
- @mock.patch("os.path.exists", return_value=True)
- def test_os_error(self, mock_path, mock_user, mock_host):
- path = prepare_host()
- assert path == "/home/default/machinelearningtools/data/toar_daily/"
- path = prepare_host()
- assert path == "/home/default/Data/toar_daily/"
- path = prepare_host()
- assert path == "/home/default/Data/toar_daily/"
- path = prepare_host()
- assert path == "/p/project/cjjsc42/default/DATA/toar_daily/"
- path = prepare_host()
- assert path == "/p/home/jusers/default/juwels/intelliaq/DATA/toar_daily/"
- path = prepare_host()
- assert path == '/home/default/machinelearningtools/data/toar_daily/'
-
- @mock.patch("socket.gethostname", side_effect=["linux-aa9b"])
- @mock.patch("os.getlogin", return_value="testUser")
- @mock.patch("os.path.exists", return_value=False)
- @mock.patch("os.makedirs", side_effect=None)
- def test_os_path_exists(self, mock_host, mock_user, mock_path, mock_check):
- path = prepare_host()
- assert path == "/home/testUser/machinelearningtools/data/toar_daily/"
-
diff --git a/test/test_modules/test_partition_check.py b/test/test_modules/test_partition_check.py
index 6966b2aa..d862b9e8 100644
--- a/test/test_modules/test_partition_check.py
+++ b/test/test_modules/test_partition_check.py
@@ -5,8 +5,7 @@ import mock
from src.run_modules.experiment_setup import ExperimentSetup
from src.run_modules.partition_check import PartitionCheck
from src.run_modules.run_environment import RunEnvironment
-from src.helpers import get_host
-from src.helpers import PyTestRegex
+from src.configuration import get_host
class TestPartitionCheck:
@@ -20,7 +19,7 @@ class TestPartitionCheck:
# RunEnvironment().__del__()
@pytest.fixture
- @mock.patch("src.helpers.get_host", return_value="juwels")
+ @mock.patch("socket.gethostname", return_value="juwels")
@mock.patch("getpass.getuser", return_value="testUser")
@mock.patch("os.path.exists", return_value=False)
@mock.patch("os.makedirs", side_effect=None)
@@ -33,7 +32,7 @@ class TestPartitionCheck:
RunEnvironment().__del__()
@pytest.fixture
- @mock.patch("src.helpers.get_host", return_value="hdfmlc01")
+ @mock.patch("socket.gethostname", return_value="hdfmlc01")
@mock.patch("getpass.getuser", return_value="testUser")
@mock.patch("os.path.exists", return_value=False)
@mock.patch("os.makedirs", side_effect=None)
@@ -55,7 +54,7 @@ class TestPartitionCheck:
RunEnvironment().__del__()
- @mock.patch("src.helpers.get_host", return_value="juwels")
+ @mock.patch("socket.gethostname", return_value="juwels")
@mock.patch("getpass.getuser", return_value="testUser")
@mock.patch("os.path.exists", return_value=False)
@mock.patch("os.makedirs", side_effect=None)
@@ -67,7 +66,7 @@ class TestPartitionCheck:
"validate a model." == \
e.value.args[0]
- @mock.patch("src.helpers.get_host", return_value="hdfmlc01")
+ @mock.patch("socket.gethostname", return_value="hdfmlc01")
@mock.patch("getpass.getuser", return_value="testUser")
@mock.patch("os.path.exists", return_value=False)
@mock.patch("os.makedirs", side_effect=None)
--
GitLab