Commit 4eb5d0d1 authored by Flavio TARSETTI's avatar Flavio TARSETTI
Browse files

Merge branch 'reorganize_v1_related_prefix_content' into 'master'

Move all API v1 algorithms in test prefix to their own folder

See merge request !81
parents ec8e2dc9 76215b98
Pipeline #31592 passed with stages
in 17 minutes and 29 seconds
......@@ -148,7 +148,7 @@ def test_invalid_v3():
@nose.tools.with_setup(teardown=cleanup)
def test_export():
name = "user/for_dep/1"
name = "v1/for_dep/1"
obj = Algorithm(prefix, name)
nose.tools.assert_true(obj.valid, "\n * %s" % "\n * ".join(obj.errors))
......
......@@ -72,7 +72,7 @@ CONFIGURATION = {
"channel": "integers",
}
},
"algorithm": "user/integers_echo/1",
"algorithm": "v1/integers_echo/1",
"parameters": {},
"environment": {"name": "Python 2.7", "version": "1.2.0"},
"outputs": {
......
......@@ -75,10 +75,10 @@ def test_load_valid_experiment():
nose.tools.eq_(len(experiment.analyzers), 1)
nose.tools.eq_(len(experiment.algorithms), 2)
nose.tools.assert_true("user/sum/1" in experiment.algorithms)
nose.tools.assert_true(experiment.algorithms["user/sum/1"].valid)
nose.tools.assert_true("user/integers_analysis/1" in experiment.algorithms)
nose.tools.assert_true(experiment.algorithms["user/integers_analysis/1"].valid)
nose.tools.assert_true("v1/sum/1" in experiment.algorithms)
nose.tools.assert_true(experiment.algorithms["v1/sum/1"].valid)
nose.tools.assert_true("v1/integers_analysis/1" in experiment.algorithms)
nose.tools.assert_true(experiment.algorithms["v1/integers_analysis/1"].valid)
def test_load_one_dataset_two_blocks_toolchain():
......@@ -102,10 +102,10 @@ def test_load_one_dataset_two_blocks_toolchain():
nose.tools.eq_(len(experiment.analyzers), 1)
nose.tools.eq_(len(experiment.algorithms), 2)
nose.tools.assert_true("user/sum/1" in experiment.algorithms)
nose.tools.assert_true(experiment.algorithms["user/sum/1"].valid)
nose.tools.assert_true("user/integers_analysis/1" in experiment.algorithms)
nose.tools.assert_true(experiment.algorithms["user/integers_analysis/1"].valid)
nose.tools.assert_true("v1/sum/1" in experiment.algorithms)
nose.tools.assert_true(experiment.algorithms["v1/sum/1"].valid)
nose.tools.assert_true("v1/integers_analysis/1" in experiment.algorithms)
nose.tools.assert_true(experiment.algorithms["v1/integers_analysis/1"].valid)
def test_load_two_datasets_three_blocks_toolchain():
......@@ -128,10 +128,10 @@ def test_load_two_datasets_three_blocks_toolchain():
nose.tools.eq_(len(experiment.analyzers), 1)
nose.tools.eq_(len(experiment.algorithms), 2)
nose.tools.assert_true("user/sum/1" in experiment.algorithms)
nose.tools.assert_true(experiment.algorithms["user/sum/1"].valid)
nose.tools.assert_true("user/integers_analysis/1" in experiment.algorithms)
nose.tools.assert_true(experiment.algorithms["user/integers_analysis/1"].valid)
nose.tools.assert_true("v1/sum/1" in experiment.algorithms)
nose.tools.assert_true(experiment.algorithms["v1/sum/1"].valid)
nose.tools.assert_true("v1/integers_analysis/1" in experiment.algorithms)
nose.tools.assert_true(experiment.algorithms["v1/integers_analysis/1"].valid)
def test_no_description():
......
......@@ -482,7 +482,7 @@ class TestOneWorker(TestWorkerBase):
prepare_database(db_name)
config = dict(CONFIGURATION1)
config["algorithm"] = "user/integers_echo_slow/1"
config["algorithm"] = "v1/integers_echo_slow/1"
self.controller.execute(WORKER1, 1, CONFIGURATION1)
self.controller.execute(WORKER1, 2, config)
......@@ -510,7 +510,7 @@ class TestOneWorker(TestWorkerBase):
prepare_database(db_name)
config = dict(CONFIGURATION1)
config["algorithm"] = "user/integers_echo_slow/1"
config["algorithm"] = "v1/integers_echo_slow/1"
self.controller.execute(WORKER1, 1, config)
self.controller.cancel(WORKER1, 1)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment