import 15.2.4

[ceph.git] / ceph / src / pybind / mgr / cephadm / tests / test_completion.py

diff --git a/ceph/src/pybind/mgr/cephadm/tests/test_completion.py b/ceph/src/pybind/mgr/cephadm/tests/test_completion.py
index 085ea6c0a803b374570e26f2aa22bff0dcf13b62..2f7956667fc8aca5f9ef781a7ccbd7449f8a461e 100644 (file)
--- a/ceph/src/pybind/mgr/cephadm/tests/test_completion.py
+++ b/ceph/src/pybind/mgr/cephadm/tests/test_completion.py
@@ -12,7 +12,7 @@ import pytest
 
 from tests import mock
 from .fixtures import cephadm_module, wait
-from ..module import trivial_completion, async_completion, async_map_completion
+from ..module import trivial_completion, forall_hosts
 
 
 class TestCompletion(object):
@@ -23,18 +23,13 @@ class TestCompletion(object):
             return x+1
         assert wait(cephadm_module, run(1)) == 2
 
-    @pytest.mark.parametrize("input", [
-        ((1, ), ),
-        ((1, 2), ),
-        (("hallo", ), ),
-        (("hallo", "foo"), ),
-    ])
-    def test_async(self, input, cephadm_module):
-        @async_completion
-        def run(*args):
-            return str(args)
-
-        assert wait(cephadm_module, run(*input)) == str(input)
+    def test_exception(self, cephadm_module):
+        @trivial_completion
+        def run(x):
+            raise ValueError
+        c = run(1)
+        with pytest.raises(ValueError):
+            wait(cephadm_module, c)
 
     @pytest.mark.parametrize("input,expected", [
         ([], []),
@@ -45,25 +40,11 @@ class TestCompletion(object):
         ([(1, 2), (3, 4)], ["(1, 2)", "(3, 4)"]),
     ])
     def test_async_map(self, input, expected, cephadm_module):
-        @async_map_completion
-        def run(*args):
+        @forall_hosts
+        def run_forall(*args):
             return str(args)
+        assert run_forall(input) == expected
 
-        c = run(input)
-        wait(cephadm_module, c)
-        assert c.result == expected
-
-    def test_async_self(self, cephadm_module):
-        class Run(object):
-            def __init__(self):
-                self.attr = 1
-
-            @async_completion
-            def run(self, x):
-                assert self.attr == 1
-                return x + 1
-
-        assert wait(cephadm_module, Run().run(1)) == 2
 
     @pytest.mark.parametrize("input,expected", [
         ([], []),
@@ -78,101 +59,9 @@ class TestCompletion(object):
             def __init__(self):
                 self.attr = 1
 
-            @async_map_completion
-            def run(self, *args):
+            @forall_hosts
+            def run_forall(self, *args):
                 assert self.attr == 1
                 return str(args)
 
-        c = Run().run(input)
-        wait(cephadm_module, c)
-        assert c.result == expected
-
-    def test_then1(self, cephadm_module):
-        @async_map_completion
-        def run(x):
-            return x+1
-
-        assert wait(cephadm_module, run([1,2]).then(str)) == '[2, 3]'
-
-    def test_then2(self, cephadm_module):
-        @async_map_completion
-        def run(x):
-            time.sleep(0.1)
-            return x+1
-
-        @async_completion
-        def async_str(results):
-            return str(results)
-
-        c = run([1,2]).then(async_str)
-
-        wait(cephadm_module, c)
-        assert c.result == '[2, 3]'
-
-    def test_then3(self, cephadm_module):
-        @async_map_completion
-        def run(x):
-            time.sleep(0.1)
-            return x+1
-
-        def async_str(results):
-            return async_completion(str)(results)
-
-        c = run([1,2]).then(async_str)
-
-        wait(cephadm_module, c)
-        assert c.result == '[2, 3]'
-
-    def test_then4(self, cephadm_module):
-        @async_map_completion
-        def run(x):
-            time.sleep(0.1)
-            return x+1
-
-        def async_str(results):
-            return async_completion(str)(results).then(lambda x: x + "hello")
-
-        c = run([1,2]).then(async_str)
-
-        wait(cephadm_module, c)
-        assert c.result == '[2, 3]hello'
-
-    @pytest.mark.skip(reason="see limitation of async_map_completion")
-    def test_then5(self, cephadm_module):
-        @async_map_completion
-        def run(x):
-            time.sleep(0.1)
-            return async_completion(str)(x+1)
-
-        c = run([1,2])
-
-        wait(cephadm_module, c)
-        assert c.result == "['2', '3']"
-
-    def test_raise(self, cephadm_module):
-        @async_completion
-        def run(x):
-            raise ZeroDivisionError()
-
-        with pytest.raises(ZeroDivisionError):
-            wait(cephadm_module, run(1))
-
-    def test_progress(self, cephadm_module):
-        @async_map_completion
-        def run(*args):
-            return str(args)
-
-        c = run(list(range(2)))
-        c.update_progress = True
-        c.add_progress(
-            mgr=cephadm_module,
-            message="my progress"
-        )
-        wait(cephadm_module, c)
-        assert c.result == [str((x,)) for x in range(2)]
-        assert cephadm_module.remote.mock_calls == [
-            mock.call('progress', 'update', mock.ANY, 'my progress', float(i) / 2, [('origin', 'orchestrator')])
-            for i in range(2+1)] + [
-            mock.call('progress', 'update', mock.ANY, 'my progress', 1.0, [('origin', 'orchestrator')]),
-            mock.call('progress', 'complete', mock.ANY),
-        ]
+        assert Run().run_forall(input) == expected