test: Fix test_link_error integration suite

maybe-sybr · maybe-sybr · commit 1dac1850cbc2 · 2021-05-24T10:34:10.000+10:00
The non-eager tests needed the manager fixture so that there was a
worker to actually run the async tasks.
diff --git a/t/integration/test_canvas.py b/t/integration/test_canvas.py
@@ -44,59 +44,55 @@ def flaky(fn):
 
 
 class test_link_error:
-    @flaky
+    # Eager execution shouldn't need the manager fixture
     def test_link_error_eager(self):
-        exception = ExpectedException("Task expected to fail", "test")
-        result = fail.apply(args=("test",), link_error=return_exception.s())
-        actual = result.get(timeout=TIMEOUT, propagate=False)
-        assert actual == exception
-
-    @flaky
-    def test_link_error(self):
-        exception = ExpectedException("Task expected to fail", "test")
-        result = fail.apply(args=("test",), link_error=return_exception.s())
-        actual = result.get(timeout=TIMEOUT, propagate=False)
-        assert actual == exception
-
-    @flaky
-    def test_link_error_callback_error_callback_retries_eager(self):
-        exception = ExpectedException("Task expected to fail", "test")
         result = fail.apply(
-            args=("test",),
-            link_error=retry_once.s(countdown=None)
+            args=("test",), link_error=return_exception.s()
         )
-        assert result.get(timeout=TIMEOUT, propagate=False) == exception
+        with pytest.raises(ExpectedException):
+            result.get(timeout=TIMEOUT)
 
-    @flaky
-    def test_link_error_callback_retries(self):
-        exception = ExpectedException("Task expected to fail", "test")
-        result = fail.apply_async(
+    def test_link_error_callback_error_callback_retries_eager(self):
+        result = fail.apply(
             args=("test",),
             link_error=retry_once.s(countdown=None)
         )
-        assert result.get(timeout=TIMEOUT, propagate=False) == exception
+        with pytest.raises(ExpectedException):
+            result.get(timeout=TIMEOUT)
 
-    @flaky
     def test_link_error_using_signature_eager(self):
         fail = signature('t.integration.tasks.fail', args=("test",))
         retrun_exception = signature('t.integration.tasks.return_exception')
-
         fail.link_error(retrun_exception)
+        result = fail.apply()
+        with pytest.raises(ExpectedException):
+            result.get(timeout=TIMEOUT)
 
-        exception = ExpectedException("Task expected to fail", "test")
-        assert (fail.apply().get(timeout=TIMEOUT, propagate=False), True) == (
-            exception, True)
+    @pytest.mark.usefixtures("manager")
+    def test_link_error(self):
+        result = fail.apply_async(
+            args=("test",), link_error=return_exception.s()
+        )
+        with pytest.raises(ExpectedException):
+            result.get(timeout=TIMEOUT)
 
-    @flaky
+    @pytest.mark.usefixtures("manager")
+    def test_link_error_callback_retries(self):
+        result = fail.apply_async(
+            args=("test",),
+            link_error=retry_once.s(countdown=None)
+        )
+        with pytest.raises(ExpectedException):
+            result.get(timeout=TIMEOUT)
+
+    @pytest.mark.usefixtures("manager")
     def test_link_error_using_signature(self):
         fail = signature('t.integration.tasks.fail', args=("test",))
         retrun_exception = signature('t.integration.tasks.return_exception')
-
         fail.link_error(retrun_exception)
-
-        exception = ExpectedException("Task expected to fail", "test")
-        assert (fail.delay().get(timeout=TIMEOUT, propagate=False), True) == (
-            exception, True)
+        result = fail.delay()
+        with pytest.raises(ExpectedException):
+            result.get(timeout=TIMEOUT)
 
 
 class test_chain:
