Loading tests/integration/conftest.py +1 −2 Original line number Diff line number Diff line Loading @@ -19,8 +19,7 @@ from pathlib import Path from harness.logger import logger, initialize_logging, finalize_logging from harness.cli import add_cli_options, set_default_log_formatter from harness.workspace import Workspace, FileCreator from harness.gkfs import Daemon, Client, ShellClient, FwdDaemon, FwdClient, ShellFwdClient from harness.factory import FwdDaemonCreator, FwdClientCreator from harness.gkfs import Daemon, Client, ShellClient, FwdDaemon, FwdClient, ShellFwdClient, FwdDaemonCreator, FwdClientCreator from harness.reporter import report_test_status, report_test_headline, report_assertion_pass def pytest_configure(config): Loading tests/integration/harness/factory.pydeleted 100644 → 0 +0 −58 Original line number Diff line number Diff line ################################################################################ # Copyright 2018-2020, Barcelona Supercomputing Center (BSC), Spain # # Copyright 2015-2020, Johannes Gutenberg Universitaet Mainz, Germany # # # # This software was partially supported by the # # EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu). # # # # This software was partially supported by the # # ADA-FS project under the SPPEXA project funded by the DFG. # # # # SPDX-License-Identifier: MIT # ################################################################################ import os, re, hashlib from harness.logger import logger from harness.gkfs import FwdDaemon, FwdClient class FwdDaemonCreator: """ Factory that allows tests to create forwarding daemons in a workspace. """ def __init__(self, interface, workspace): self._interface = interface self._workspace = workspace def create(self): """ Create a forwarding daemon in the tests workspace. Returns ------- The `FwdDaemon` object to interact with the daemon. """ daemon = FwdDaemon(self._interface, self._workspace) daemon.run() return daemon class FwdClientCreator: """ Factory that allows tests to create forwarding daemons in a workspace. """ def __init__(self, workspace): self._workspace = workspace def create(self, identifier): """ Create a forwarding client in the tests workspace. Returns ------- The `FwdClient` object to interact with the daemon. """ return FwdClient(self._workspace, identifier) tests/integration/harness/gkfs.py +43 −0 Original line number Diff line number Diff line Loading @@ -140,6 +140,49 @@ def _process_exists(pid): return True class FwdDaemonCreator: """ Factory that allows tests to create forwarding daemons in a workspace. """ def __init__(self, interface, workspace): self._interface = interface self._workspace = workspace def create(self): """ Create a forwarding daemon in the tests workspace. Returns ------- The `FwdDaemon` object to interact with the daemon. """ daemon = FwdDaemon(self._interface, self._workspace) daemon.run() return daemon class FwdClientCreator: """ Factory that allows tests to create forwarding daemons in a workspace. """ def __init__(self, workspace): self._workspace = workspace def create(self, identifier): """ Create a forwarding client in the tests workspace. Returns ------- The `FwdClient` object to interact with the daemon. """ return FwdClient(self._workspace, identifier) class Daemon: def __init__(self, interface, workspace): Loading Loading
tests/integration/conftest.py +1 −2 Original line number Diff line number Diff line Loading @@ -19,8 +19,7 @@ from pathlib import Path from harness.logger import logger, initialize_logging, finalize_logging from harness.cli import add_cli_options, set_default_log_formatter from harness.workspace import Workspace, FileCreator from harness.gkfs import Daemon, Client, ShellClient, FwdDaemon, FwdClient, ShellFwdClient from harness.factory import FwdDaemonCreator, FwdClientCreator from harness.gkfs import Daemon, Client, ShellClient, FwdDaemon, FwdClient, ShellFwdClient, FwdDaemonCreator, FwdClientCreator from harness.reporter import report_test_status, report_test_headline, report_assertion_pass def pytest_configure(config): Loading
tests/integration/harness/factory.pydeleted 100644 → 0 +0 −58 Original line number Diff line number Diff line ################################################################################ # Copyright 2018-2020, Barcelona Supercomputing Center (BSC), Spain # # Copyright 2015-2020, Johannes Gutenberg Universitaet Mainz, Germany # # # # This software was partially supported by the # # EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu). # # # # This software was partially supported by the # # ADA-FS project under the SPPEXA project funded by the DFG. # # # # SPDX-License-Identifier: MIT # ################################################################################ import os, re, hashlib from harness.logger import logger from harness.gkfs import FwdDaemon, FwdClient class FwdDaemonCreator: """ Factory that allows tests to create forwarding daemons in a workspace. """ def __init__(self, interface, workspace): self._interface = interface self._workspace = workspace def create(self): """ Create a forwarding daemon in the tests workspace. Returns ------- The `FwdDaemon` object to interact with the daemon. """ daemon = FwdDaemon(self._interface, self._workspace) daemon.run() return daemon class FwdClientCreator: """ Factory that allows tests to create forwarding daemons in a workspace. """ def __init__(self, workspace): self._workspace = workspace def create(self, identifier): """ Create a forwarding client in the tests workspace. Returns ------- The `FwdClient` object to interact with the daemon. """ return FwdClient(self._workspace, identifier)
tests/integration/harness/gkfs.py +43 −0 Original line number Diff line number Diff line Loading @@ -140,6 +140,49 @@ def _process_exists(pid): return True class FwdDaemonCreator: """ Factory that allows tests to create forwarding daemons in a workspace. """ def __init__(self, interface, workspace): self._interface = interface self._workspace = workspace def create(self): """ Create a forwarding daemon in the tests workspace. Returns ------- The `FwdDaemon` object to interact with the daemon. """ daemon = FwdDaemon(self._interface, self._workspace) daemon.run() return daemon class FwdClientCreator: """ Factory that allows tests to create forwarding daemons in a workspace. """ def __init__(self, workspace): self._workspace = workspace def create(self, identifier): """ Create a forwarding client in the tests workspace. Returns ------- The `FwdClient` object to interact with the daemon. """ return FwdClient(self._workspace, identifier) class Daemon: def __init__(self, interface, workspace): Loading
