summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--omaha_server/omaha/factories.py2
-rw-r--r--omaha_server/omaha_server/settings_test_postgres.py3
-rw-r--r--pavement.py5
3 files changed, 7 insertions, 3 deletions
diff --git a/omaha_server/omaha/factories.py b/omaha_server/omaha/factories.py
index 180d1ca..775d2cf 100644
--- a/omaha_server/omaha/factories.py
+++ b/omaha_server/omaha/factories.py
@@ -46,7 +46,7 @@ class PlatformFactory(factory.DjangoModelFactory):
class Meta:
model = 'omaha.Platform'
- name = factory.Sequence(lambda n: 'platform%s' % n)
+ name = factory.Sequence(lambda n: 'p_%s' % n)
class ChannelFactory(factory.DjangoModelFactory):
diff --git a/omaha_server/omaha_server/settings_test_postgres.py b/omaha_server/omaha_server/settings_test_postgres.py
index 0fc7bbe..46b06cc 100644
--- a/omaha_server/omaha_server/settings_test_postgres.py
+++ b/omaha_server/omaha_server/settings_test_postgres.py
@@ -33,8 +33,7 @@ INSTALLED_APPS += (
'django_nose',
)
-# TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
-TEST_RUNNER = 'omaha_server.runner.CustomNoseTestSuiteRunner'
+TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
NOSE_ARGS = [
'--with-coverage',
diff --git a/pavement.py b/pavement.py
index c9bcccf..bca54cf 100644
--- a/pavement.py
+++ b/pavement.py
@@ -34,6 +34,11 @@ def test():
@task
+def test_postgres():
+ sh('./manage.py test --settings=omaha_server.settings_test_postgres', cwd='omaha_server')
+
+
+@task
def up_local_dev_server():
"""
Requirements: