add upstream test target with contrib allowed to fail

.travis.yml

@@ -40,17 +40,21 @@ jobs:
       env: TOXENV=py38-django3.0-drf3.10
     - python: 3.8
       env: TOXENV=py38-django3.0-drf3.11
+
     - python: 3.8
       env: TOXENV=py38-django3.0-drfmaster
     - python: 3.8
       env: TOXENV=py38-djangomaster-drf3.11
     - python: 3.8
       env: TOXENV=py38-drfmaster-djangomaster
+    - python: 3.8
+      env: TOXENV=py38-drfmaster-djangomaster-allowcontribfail
 
   allow_failures:
     - env: TOXENV=py38-django3.0-drfmaster
     - env: TOXENV=py38-djangomaster-drf3.11
     - env: TOXENV=py38-drfmaster-djangomaster
+    - env: TOXENV=py38-drfmaster-djangomaster-allowcontribfail
 
 install:
   - pip install -U pip

tests/conftest.py

@@ -15,7 +15,9 @@ def pytest_configure(config):
     contrib_apps = [
         'rest_framework_jwt',
         'oauth2_provider',
-        'polymorphic',
+        # this is not strictly required and when added django-polymorphic
+        # currently breaks the whole Django/DRF upstream testing.
+        # 'polymorphic',
     ]
 
     settings.configure(
@@ -89,17 +91,24 @@ def pytest_addoption(parser):
         default=False,
         help="skip tests depending on missing contrib packages"
     )
+    parser.addoption(
+        "--allow-contrib-fail",
+        action="store_true",
+        default=False,
+        help="run contrib tests but allow them to fail"
+    )
 
 
 def pytest_collection_modifyitems(config, items):
-    if not config.getoption("--skip-missing-contrib"):
-        return
     skip_missing_contrib = pytest.mark.skip(reason="skip tests for missing contrib package")
+    allow_contrib_fail = pytest.mark.xfail(reason="contrib test were allowed to fail")
     for item in items:
         for marker in item.own_markers:
-            if marker.name == 'contrib':
+            if marker.name == 'contrib' and config.getoption("--skip-missing-contrib"):
                 if not all([module_available(module_str) for module_str in marker.args]):
                     item.add_marker(skip_missing_contrib)
+            if marker.name == 'contrib' and config.getoption("--allow-contrib-fail"):
+                item.add_marker(allow_contrib_fail)
 
 
 @pytest.fixture()

tox.ini

@@ -5,6 +5,7 @@ envlist =
        py38-django3.0-drfmaster
        py38-djangomaster-drf3.11
        py38-drfmaster-djangomaster
+       py38-drfmaster-djangomaster-allowcontribfail
 skip_missing_interpreters = true
 
 [testenv]
@@ -26,6 +27,9 @@ deps =
        -r requirements/testing.txt
        -r requirements/optionals.txt
 
+[testenv:py38-drfmaster-djangomaster-allowcontribfail]
+commands = ./runtests.py {posargs:--fast --cov=drf_spectacular --cov=tests --allow-contrib-fail}
+
 [testenv:lint]
 commands = ./runtests.py --lintonly
 deps =
@@ -95,4 +99,4 @@ ignore_missing_imports = True
 ignore_missing_imports = True
 
 [mypy-djangorestframework_camel_case.util.*]
-ignore_missing_imports = True
+ignore_missing_imports = True