Updating tests from jube2 to jube

Author: Julia Wellmann

.gitlab-ci.yml

@@ -31,7 +31,7 @@ dependencies:
         # Checking installed packages and their versions
         - pip3 list
         # PATH required for tests
-        - export PYTHONPATH=${CI_PROJECT_DIR}/jube2:${PYTHONPATH}
+        - export PYTHONPATH=${CI_PROJECT_DIR}/jube:${PYTHONPATH}
 
 .clone_repo: &clone_repo
     before_script:
@@ -84,7 +84,7 @@ build:year:
 
 build:version:
     variables:
-        FILE_LIST: jube2/conf.py docs/conf.py setup.py
+        FILE_LIST: jube/conf.py docs/conf.py setup.py
         COMMIT_MESSAGE: "Updating Version"
     stage: build
     script:
@@ -95,7 +95,7 @@ build:version:
         # Updating version in files
         - |
             sed -i "s/'version': '.*'/'version': '${RELEASE}'/g" ${CI_PROJECT_DIR}/${CI_JOB_NAME#*:}/setup.py
-        - sed -i "s/JUBE_VERSION = \".*\"/JUBE_VERSION = \"${RELEASE}\"/g" ${CI_PROJECT_DIR}/${CI_JOB_NAME#*:}/jube2/conf.py
+        - sed -i "s/JUBE_VERSION = \".*\"/JUBE_VERSION = \"${RELEASE}\"/g" ${CI_PROJECT_DIR}/${CI_JOB_NAME#*:}/jube/conf.py
         - sed -i "s/version = '.*'/version = '${VERSION}'/g" ${CI_PROJECT_DIR}/${CI_JOB_NAME#*:}/docs/conf.py
         - sed -i "s/release = '.*'/release = '${RELEASE}'/g" ${CI_PROJECT_DIR}/${CI_JOB_NAME#*:}/docs/conf.py
     <<: *push_files
@@ -122,7 +122,7 @@ build:release_notes:
 
 build:help:
     variables:
-        FILE_LIST: jube2/help.txt
+        FILE_LIST: jube/help.txt
         COMMIT_MESSAGE: "Updating $FILE_LIST"
     stage: build
     script:
@@ -280,4 +280,4 @@ pages:production:
         - "sshpass -e -P 'passphrase for key' rsync -rlgoDzP --del docs/_build/html/* apps_jube_docu:docu/"
     environment:
         name: production
-        url: https://apps.fz-juelich.de/jsc/jube/jube2/docu/
+        url: https://apps.fz-juelich.de/jsc/jube/jube/docu/

tests/benchmark_tests.py

@@ -26,32 +26,32 @@
 import unittest
 import shutil
 import os
-import jube2.step
-import jube2.parameter
-import jube2.benchmark
-import jube2.workpackage
+import jube.step
+import jube.parameter
+import jube.benchmark
+import jube.workpackage
 
 
 class TestBenchmark(unittest.TestCase):
 
     """Benchmark test class"""
 
     def setUp(self):
-        self.parameter = jube2.parameter.StaticParameter(
+        self.parameter = jube.parameter.StaticParameter(
             name='i',
             value='",".join(str(i) for i in range(4))',
             separator=',',
             parameter_type='int',
             parameter_mode='python')
-        self.parameterset = jube2.parameter.Parameterset(name='param_set')
+        self.parameterset = jube.parameter.Parameterset(name='param_set')
         self.parameterset.add_parameter(self.parameter)
-        self.step = jube2.step.Step(name='execution', depend=set())
+        self.step = jube.step.Step(name='execution', depend=set())
         self.step.add_uses(['param_set'])
-        self.operation = jube2.step.Operation('echo "$i"', stdout_filename='stdout',
+        self.operation = jube.step.Operation('echo "$i"', stdout_filename='stdout',
                                               stderr_filename='stderr',
                                               work_dir='.', error_filename='error')
         self.step.add_operation(self.operation)
-        self.benchmark = jube2.benchmark.Benchmark(
+        self.benchmark = jube.benchmark.Benchmark(
             name='workpackages',
             outpath='bench_run',
             parametersets={'param_set': self.parameterset},

tests/conf_tests.py

@@ -23,16 +23,16 @@
                         division)
 
 import unittest
-import jube2.conf
-from jube2.util.version import StrictVersion
+import jube.conf
+from jube.util.version import StrictVersion
 
 class TestConf(unittest.TestCase):
 
     """Class for testing the configurations"""
 
     def test_version_number(self):
         """version number testing"""
-        StrictVersion(jube2.conf.JUBE_VERSION)
+        StrictVersion(jube.conf.JUBE_VERSION)
 
 
 if __name__ == "__main__":

tests/example_tests/example_result_creation_tests.py

@@ -24,7 +24,7 @@
 
 import unittest
 import os
-import jube2.main
+import jube.main
 from examples_tests import TestCase
 
 class TestResultCreationExample(TestCase.TestExample):

tests/example_tests/example_shared_tests.py

@@ -24,7 +24,7 @@
 
 import unittest
 import os
-import jube2.main
+import jube.main
 from examples_tests import TestCase
 
 class TestSharedExample(TestCase.TestExample):

tests/examples_tests.py

@@ -25,7 +25,7 @@
 import unittest
 import shutil
 import os
-import jube2.main
+import jube.main
 import examples_tests
 
 EXAMPLES_PREFIX = os.path.join(os.path.dirname(__file__), "../examples")
@@ -67,7 +67,7 @@ def _execute_commands(cls, run_args=[""]):
             #Execute all commands and save the created worpackage directories
             cls._wp_paths = {}
             for command_id, command in enumerate(cls._commands):
-                jube2.main.main(command)
+                jube.main.main(command)
                 run_path = cls._get_run_path(cls, cls._bench_run_path, command_id)
                 cls._wp_paths[run_path] = cls._get_wp_pathes(cls, run_path)
 

tests/multiprocessing_tests.py

@@ -26,34 +26,34 @@
 import unittest
 import shutil
 import os
-import jube2.step
-import jube2.parameter
-import jube2.benchmark
-import jube2.workpackage
+import jube.step
+import jube.parameter
+import jube.benchmark
+import jube.workpackage
 
 
 class TestMultiprocessing(unittest.TestCase):
 
     """Multiprocessing test class"""
 
     def setUp(self):
-        self.parallelParameter = jube2.parameter.StaticParameter(
+        self.parallelParameter = jube.parameter.StaticParameter(
             name='i',
             value='",".join(str(i) for i in range(4))',
             separator=',',
             parameter_type='int',
             parameter_mode='python')
-        self.parallelParameterset = jube2.parameter.Parameterset(
+        self.parallelParameterset = jube.parameter.Parameterset(
             name='param_set')
         self.parallelParameterset.add_parameter(self.parallelParameter)
-        self.parallelStep = jube2.step.Step(
+        self.parallelStep = jube.step.Step(
             name='parallel_execution', depend=set(), procs=2)
         self.parallelStep.add_uses(['param_set'])
-        self.parallelOperation = jube2.step.Operation('echo "$i"', stdout_filename='stdout',
+        self.parallelOperation = jube.step.Operation('echo "$i"', stdout_filename='stdout',
                                                       stderr_filename='stderr',
                                                       work_dir='.', error_filename='error')
         self.parallelStep.add_operation(self.parallelOperation)
-        self.parallelBenchmark = jube2.benchmark.Benchmark(
+        self.parallelBenchmark = jube.benchmark.Benchmark(
             name='parallel_workpackages',
             outpath='bench_run',
             parametersets={'param_set': self.parallelParameterset},