updates travis config

saxix · Apr 5, 2015 · 366694a · 366694a
1 parent 444e0cc
commit 366694a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,5 +1,6 @@
 import sys
 import warnings
+import django
 import pytest
 
 
@@ -16,3 +17,5 @@ def pytest_configure(config):
 
 
 windows = pytest.mark.skipif(sys.platform != 'win32', reason="requires windows")
+skip14 = pytest.mark.skipif(django.VERSION[0:2] == [1, 4], reason="skip django 1.4")
+skip15 = pytest.mark.skipif(django.VERSION[0:2] == [1, 5], reason="skip django 1.4")
diff --git a/tests/demo/base.py b/tests/demo/base.py
@@ -6,13 +6,13 @@
 from django.contrib.auth.models import User, Group
 from django_webtest import WebTestMixin
 from .admin import admin_register_models
-# from concurrency.api import apply_concurrency_check
+from concurrency.api import apply_concurrency_check
 from concurrency.fields import IntegerVersionField
 
 SENTINEL = '**concurrent_update**'
 
 
-# apply_concurrency_check(Group, 'version', IntegerVersionField)
+apply_concurrency_check(Group, 'version', IntegerVersionField)
 
 DJANGO_TRUNK = django.VERSION[:2] >= (1, 8)
 

diff --git a/tests/test_base.py b/tests/test_base.py
@@ -1,5 +1,6 @@
 import pytest
 import django
+from concurrency.api import apply_concurrency_check
 import concurrency.config
 from concurrency.core import _set_version
 from concurrency.exceptions import RecordModifiedError
@@ -11,8 +12,16 @@
 pytest.mark.django_db(transaction=False)
 
 
+def pytest_generate_tests(metafunc):
+    if 'protocol' in metafunc.fixturenames:
+        if django.VERSION[1] in [4, 5]:
+            metafunc.parametrize("protocol", [1])
+        else:
+            metafunc.parametrize("protocol", [1, 2])
+
+
 @with_all_models
-@pytest.mark.parametrize("protocol", [1, 2])
+# @pytest.mark.parametrize("protocol", [1, 2])
 @pytest.mark.django_db
 def test_standard_save(model_class, protocol, monkeypatch):
     # this test pass if executed alone,
@@ -27,7 +36,6 @@ def test_standard_save(model_class, protocol, monkeypatch):
 
 @pytest.mark.django_db(transaction=False)
 @with_std_models
-@pytest.mark.parametrize("protocol", [1, 2])
 def test_conflict(model_class, protocol, monkeypatch):
     monkeypatch.setattr(concurrency.config.conf, 'PROTOCOL', protocol)
 
@@ -62,4 +70,3 @@ def test_do_not_check_if_no_version(model_class):
     instance.save()
     assert instance.get_concurrency_version() > 0
     assert instance.get_concurrency_version() != copy.get_concurrency_version()
-