|
 |
00afc5 |
From 3bb7b0923a197f40ba9d3463c9340c2525c3f3ff Mon Sep 17 00:00:00 2001
|
|
|
00afc5 |
From: "Brian C. Lane" <bcl@redhat.com>
|
|
|
00afc5 |
Date: Mon, 16 Jul 2018 14:23:01 -0700
|
|
|
00afc5 |
Subject: [PATCH] Fix django tests
|
|
|
00afc5 |
|
|
|
00afc5 |
When django isn't installed it shouldn't evaluate django.VERSION
|
|
|
00afc5 |
otherwise it will crash. decorators are always evaluated, so this needs
|
|
|
00afc5 |
to be short-circuited.
|
|
|
00afc5 |
---
|
|
|
00afc5 |
tests/test_django.py | 4 ++--
|
|
|
00afc5 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
00afc5 |
|
|
|
00afc5 |
diff --git a/tests/test_django.py b/tests/test_django.py
|
|
|
00afc5 |
index 1c3c46a..489caf4 100644
|
|
|
00afc5 |
--- a/tests/test_django.py
|
|
|
00afc5 |
+++ b/tests/test_django.py
|
|
|
00afc5 |
@@ -139,7 +139,7 @@ class DjangoFieldTestCase(unittest.TestCase):
|
|
|
00afc5 |
self.assertEqual(Version('23.0.0'), obj2.version)
|
|
|
00afc5 |
self.assertEqual(Version('0.1.2+3.4.5-6', partial=True), obj2.partial)
|
|
|
00afc5 |
|
|
|
00afc5 |
- @unittest.skipIf(django.VERSION[:2] < (1, 8), "Django<1.8 casts values on setattr")
|
|
|
00afc5 |
+ @unittest.skipIf(django_loaded and django.VERSION[:2] < (1, 8), "Django<1.8 casts values on setattr")
|
|
|
00afc5 |
def test_invalid_input(self):
|
|
|
00afc5 |
v = models.VersionModel(version='0.1.1', spec='blah')
|
|
|
00afc5 |
self.assertRaises(ValueError, v.full_clean)
|
|
|
00afc5 |
@@ -147,7 +147,7 @@ class DjangoFieldTestCase(unittest.TestCase):
|
|
|
00afc5 |
v2 = models.VersionModel(version='0.1', spec='==0.1.1,!=0.1.1-alpha')
|
|
|
00afc5 |
self.assertRaises(ValueError, v2.full_clean)
|
|
|
00afc5 |
|
|
|
00afc5 |
- @unittest.skipUnless(django.VERSION[:2] < (1, 8), "Django>=1.8 doesn't mangle setattr")
|
|
|
00afc5 |
+ @unittest.skipUnless(django_loaded and django.VERSION[:2] < (1, 8), "Django>=1.8 doesn't mangle setattr")
|
|
|
00afc5 |
def test_invalid_input_full_clean(self):
|
|
|
00afc5 |
self.assertRaises(ValueError, models.VersionModel, version='0.1.1', spec='blah')
|
|
|
00afc5 |
self.assertRaises(ValueError, models.VersionModel, version='0.1', spec='==0.1.1,!=0.1.1-alpha')
|
|
|
00afc5 |
--
|
|
|
00afc5 |
2.17.1
|
|
|
00afc5 |
|