diff --git a/beat/core/test/test_algorithm_loading.py b/beat/core/test/test_algorithm_loading.py index 2a4bf92982154d716702ee91f5590a9bf92c39e2..02501c98330ccac973b2a34c8933e304e6261e58 100644 --- a/beat/core/test/test_algorithm_loading.py +++ b/beat/core/test/test_algorithm_loading.py @@ -34,7 +34,6 @@ ################################################################################### -import six import nose.tools from ..algorithm import Algorithm @@ -49,7 +48,9 @@ from .utils import cleanup def test_load_default_algorithm(): algorithm = Algorithm(prefix, data=None) - assert algorithm.valid, "\n * %s" % "\n * ".join(algorithm.errors) + nose.tools.assert_true( + algorithm.valid, "\n * %s" % "\n * ".join(algorithm.errors) + ) # ---------------------------------------------------------- @@ -58,8 +59,10 @@ def test_load_default_algorithm(): def test_missing_inputs(): algorithm = Algorithm(prefix, "user/no_inputs_declarations/1") - assert algorithm.valid is False - assert algorithm.errors[0].find("'inputs' is a required property") != -1 + nose.tools.assert_false(algorithm.valid) + nose.tools.assert_not_equal( + algorithm.errors[0].find("'inputs' is a required property"), -1 + ) # ---------------------------------------------------------- @@ -68,8 +71,10 @@ def test_missing_inputs(): def test_missing_outputs(): algorithm = Algorithm(prefix, "user/no_outputs_declarations/1") - assert algorithm.valid is False - assert algorithm.errors[0].find("'outputs' is a required property") != -1 + nose.tools.assert_false(algorithm.valid) + nose.tools.assert_not_equal( + algorithm.errors[0].find("'outputs' is a required property"), -1 + ) # ---------------------------------------------------------- @@ -78,8 +83,10 @@ def test_missing_outputs(): def test_invalid_loop_channel(): algorithm = Algorithm(prefix, "schema/invalid_loop_channel/1") - assert algorithm.valid is False - assert algorithm.errors[0].find("'request' is a required property") != -1 + nose.tools.assert_false(algorithm.valid) + nose.tools.assert_not_equal( + algorithm.errors[0].find("'request' is a required property"), -1 + ) # ---------------------------------------------------------- @@ -88,33 +95,41 @@ def test_invalid_loop_channel(): def test_v2(): algorithm = Algorithm(prefix, "user/integers_add_v2/1") - assert algorithm.valid, "\n * %s" % "\n * ".join(algorithm.errors) + nose.tools.assert_true( + algorithm.valid, "\n * %s" % "\n * ".join(algorithm.errors) + ) def test_analyzer_v2(): algorithm = Algorithm(prefix, "user/integers_echo_analyzer_v2/1") - assert algorithm.valid, "\n * %s" % "\n * ".join(algorithm.errors) + nose.tools.assert_true( + algorithm.valid, "\n * %s" % "\n * ".join(algorithm.errors) + ) def test_v3(): algorithm = Algorithm(prefix, "autonomous/loop/1") - assert algorithm.valid, "\n * %s" % "\n * ".join(algorithm.errors) + nose.tools.assert_true( + algorithm.valid, "\n * %s" % "\n * ".join(algorithm.errors) + ) algorithm = Algorithm(prefix, "autonomous/loop_user/1") - assert algorithm.valid, "\n * %s" % "\n * ".join(algorithm.errors) + nose.tools.assert_true( + algorithm.valid, "\n * %s" % "\n * ".join(algorithm.errors) + ) def test_invalid_v3(): algorithm = Algorithm(prefix, "schema/invalid_loop_output/1") - assert not algorithm.valid + nose.tools.assert_false(algorithm.valid) algorithm = Algorithm(prefix, "schema/invalid_loop_type/1") - assert not algorithm.valid + nose.tools.assert_false(algorithm.valid) algorithm = Algorithm(prefix, "schema/invalid_loop_user_type/1") - assert not algorithm.valid + nose.tools.assert_false(algorithm.valid) # ---------------------------------------------------------- @@ -125,10 +140,10 @@ def test_export(): name = "user/for_dep/1" obj = Algorithm(prefix, name) - assert obj.valid, "\n * %s" % "\n * ".join(obj.errors) + nose.tools.assert_true(obj.valid, "\n * %s" % "\n * ".join(obj.errors)) obj.export(tmp_prefix) # load from tmp_prefix and validates exported = Algorithm(tmp_prefix, name) - assert exported.valid, "\n * %s" % "\n * ".join(exported.errors) + nose.tools.assert_true(exported.valid, "\n * %s" % "\n * ".join(exported.errors))