diff --git a/README.md b/README.md index 5a604a4..3164f56 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ New version of the post-processing agent for automated reduction and cataloging. For the old version of the post-processing agent, see https://github.com/mantidproject/autoreduce +[![codecov](https://codecov.io/github/neutrons/post_processing_agent/graph/badge.svg?token=OYoTSnbmEL)](https://codecov.io/github/neutrons/post_processing_agent) + Configuration ------------- A configuration must be placed in `/etc/post_process_consumer.conf`. diff --git a/tests/conftest.py b/tests/conftest.py index 89ef5c4..b4ef5bc 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -91,3 +91,24 @@ def docker_exec_and_cat(filename): shell=True, ) return filecontents + + +def getDevConfiguration(dev_output_dir=""): + """ + Create a Configuration object with a now developer directory + @param dev_output_dir: Location of the output directory + """ + from postprocessing.Configuration import Configuration + + srcdir = os.path.dirname(os.path.realpath(__file__)) # directory this file is in + # go up 1 level to get out of tests directory + srcdir = os.path.split(srcdir)[0] + + # load the developer configuration file + config = Configuration( + os.path.join(srcdir, "configuration/post_process_consumer.conf.development") + ) + if dev_output_dir: + config.dev_output_dir = dev_output_dir + config.dev_instrument_shared = os.path.join(dev_output_dir, "shared") + return config diff --git a/tests/unit/postprocessing/test_Consumer.py b/tests/unit/postprocessing/test_Consumer.py deleted file mode 100644 index 3f6d9bb..0000000 --- a/tests/unit/postprocessing/test_Consumer.py +++ /dev/null @@ -1,10 +0,0 @@ -# third-party imports -import pytest - - -class TestConsumer(object): - pass - - -if __name__ == "__main__": - pytest.main([__file__]) diff --git a/tests/unit/postprocessing/test_PostProcessAdmin.py b/tests/unit/postprocessing/test_PostProcessAdmin.py index 8273cc5..bc425ac 100644 --- a/tests/unit/postprocessing/test_PostProcessAdmin.py +++ b/tests/unit/postprocessing/test_PostProcessAdmin.py @@ -2,32 +2,13 @@ import shutil -from postprocessing.Configuration import Configuration from postprocessing.PostProcessAdmin import PostProcessAdmin # third-party imports import os import pytest import tempfile - - -def getDevConfiguration(dev_output_dir=""): - """ - Create a Configuration object with a now developer directory - @param dev_output_dir: Location of the output directory - """ - srcdir = os.path.dirname(os.path.realpath(__file__)) # directory this file is in - # go up 3 levels - for i in range(3): - srcdir = os.path.split(srcdir)[0] - # load the developer configuration file - config = Configuration( - os.path.join(srcdir, "configuration/post_process_consumer.conf.development") - ) - if dev_output_dir: - config.dev_output_dir = dev_output_dir - config.dev_instrument_shared = os.path.join(dev_output_dir, "shared") - return config +from tests.conftest import getDevConfiguration def createEmptyFile(filename):