Integration test & unit tests jobs separation

.github/workflows/lint_python.yml

@@ -2,6 +2,8 @@ name: lint_python
 on: [pull_request, push]
 jobs:
   lint_python:
+    # XXX: DO NOT MERGE THIS LINE
+    if: false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

.github/workflows/python-package.yml

@@ -18,7 +18,7 @@ on:
         - '.github/workflows/python-package.yml'
 
 jobs:
-  build:
+  Unit:
 
     runs-on: ${{ matrix.os }}
     strategy:
@@ -85,3 +85,83 @@ jobs:
       run: python -m pip install tox
     - name: Lint with pre-commit
       run: tox --verbose -e lint
+
+
+  Integration:
+
+    needs:
+    - Unit
+    # XXX: DO NOT MERGE THIS LINE
+    if: ${{ always() }}
+
+    # XXX: We should set this to some reasonable maximum prior to merge. The
+    # default 6 hour timeout is far too long.
+    timeout-minutes: 240
+
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ['3.7', '3.8', '3.9', 'pypy3']
+        # XXX: Does each matrix variation get their own copy of the service
+        # containers? Test cross-talk may be an issue...
+        toxenv: ['redis', ] #'rabbitmq']
+
+     # additional service containers to run
+    services:
+      #rabbitmq:
+      #  # docker hub image
+      #  image: rabbitmq
+      #  # configure the instance
+      #  env:
+      #    # XXX: If we set these, we need to set TEST_{BROKER,BACKEND} URIs
+      #    RABBITMQ_DEFAULT_USER: craiga
+      #    RABBITMQ_DEFAULT_PASS: security_is_important
+      #  ports:
+      #    - 5432:5432
+
+      redis:
+        # Docker Hub image
+        image: redis
+        ports:
+        - 6379:6379
+        # configure the instance
+        env:
+        # The hostname used to communicate with the Redis service container
+          REDIS_HOST: localhost
+          # The default Redis port
+          REDIS_PORT: 6379
+
+    steps:
+    - name: Install apt packages
+      run: |
+        sudo apt-get install -f libcurl4-openssl-dev libssl-dev gnutls-dev httping expect libmemcached-dev
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Get pip cache dir
+      id: pip-cache
+      run: |
+        echo "::set-output name=dir::$(pip cache dir)"
+    # XXX: What does this do? Does using tox change its usefulness?
+    #- name: Cache
+    #  uses: actions/cache@v2
+    #  with:
+    #    path: ${{ steps.pip-cache.outputs.dir }}
+    #    key:
+    #      ${{ matrix.python-version }}-v1-${{ hashFiles('**/setup.py') }}
+    #    restore-keys: |
+    #      ${{ matrix.python-version }}-v1-
+
+    - name: Install tox
+      run: python -m pip install tox
+    - name: >
+        Run tox for
+        "${{ matrix.python-version }}-integration-${{ matrix.toxenv }}"
+      timeout-minutes: 20
+      run: >
+        tox --verbose --verbose -e
+        "${{ matrix.python-version }}-integration-${{ matrix.toxenv }}" -- -vv

requirements/test-ci-base.txt

@@ -1,5 +1,4 @@
 pytest-cov
-pytest-travis-fold
 codecov
 -r extras/redis.txt
 -r extras/sqlalchemy.txt

requirements/test-ci-default.txt

@@ -12,7 +12,7 @@
 -r extras/thread.txt
 -r extras/elasticsearch.txt
 -r extras/couchdb.txt
--r extras/couchbase.txt
+#-r extras/couchbase.txt
 -r extras/arangodb.txt
 -r extras/consul.txt
 -r extras/cosmosdbsql.txt

t/integration/test_canvas.py

@@ -101,59 +101,55 @@ def await_redis_count(expected_count, redis_key="redis-count", timeout=TIMEOUT):
 
 
 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:

t/integration/test_inspect.py

@@ -117,7 +117,7 @@ def test_active(self, inspect):
                     'exchange': '',
                     'routing_key': 'celery',
                     'priority': 0,
-                    'redelivered': False
+                    'redelivered': ANY,
                 },
                 'worker_pid': ANY
             }
@@ -147,7 +147,7 @@ def test_scheduled(self, inspect):
                         'exchange': '',
                         'routing_key': 'celery',
                         'priority': 0,
-                        'redelivered': False
+                        'redelivered': ANY,
                     },
                     'worker_pid': None
                 }
@@ -181,7 +181,7 @@ def test_query_task(self, inspect):
                         'exchange': '',
                         'routing_key': 'celery',
                         'priority': 0,
-                        'redelivered': False
+                        'redelivered': ANY,
                     },
                     # worker is running in the same process as separate thread
                     'worker_pid': ANY