summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Mekin <amekin@crystalnix.com>2015-09-16 15:15:30 +0600
committerEgor Yurtaev <yurtaev.egor@gmail.com>2015-09-16 17:12:04 +0600
commitee1eee182637fdd4a636075a827d857b95f2fc85 (patch)
tree95df734b2bd2c3999b53fce3ce18b8e0c0129a78
parent1fabd6b1ee96ac618d288040db3ac4604738b2e4 (diff)
downloadomaha-server-ee1eee182637fdd4a636075a827d857b95f2fc85.zip
omaha-server-ee1eee182637fdd4a636075a827d857b95f2fc85.tar.gz
omaha-server-ee1eee182637fdd4a636075a827d857b95f2fc85.tar.bz2
Try to workaround Disallowing packages: python-psycopg2
-rw-r--r--omaha_server/crash/tests/test_views.py4
-rw-r--r--requirements-dev.txt1
-rw-r--r--requirements-test.txt1
3 files changed, 5 insertions, 1 deletions
diff --git a/omaha_server/crash/tests/test_views.py b/omaha_server/crash/tests/test_views.py
index 7a8884a..168c945 100644
--- a/omaha_server/crash/tests/test_views.py
+++ b/omaha_server/crash/tests/test_views.py
@@ -67,6 +67,10 @@ class CrashViewTest(test.TestCase):
self.assertIsNotNone(obj.upload_file_minidump)
self.assertEquals(obj.ip, '8.8.8.8')
+ @test.override_settings(
+ CELERY_ALWAYS_EAGER=False,
+ CELERY_EAGER_PROPAGATES_EXCEPTIONS=False,
+ )
def test_view_empty_ip(self):
if settings.DATABASES['default']['ENGINE'] == 'django.db.backends.postgresql_psycopg2':
meta = dict(
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 04bc1e7..19a211c 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,6 +1,5 @@
-r requirements-test.txt
-psycopg2==2.6.1
lxml==3.4.4
django-debug-toolbar==1.3.2
django-debug-panel==0.8.1
diff --git a/requirements-test.txt b/requirements-test.txt
index b5570fb..6d02ad3 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -12,3 +12,4 @@ factory-boy==2.5.2
mock==1.3.0
tox==1.9.2
pyquery==1.2.9
+psycopg2==2.6.1 \ No newline at end of file