Skip to content
Browse files

fixes tests

  • Loading branch information...
1 parent 6e84527 commit 38769854266cee39dda6f7a62631ae63b04197ac @saxix committed Jan 3, 2014
Showing with 9 additions and 0 deletions.
  1. +8 −0 conftest.py
  2. +1 −0 tests/functional/test_merge.py
View
8 conftest.py
@@ -10,6 +10,14 @@ def pytest_configure(config):
if not settings.configured:
os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.settings'
+ try:
+ from django.apps import AppConfig
+ import django
+
+ django.setup()
+ except ImportError:
+ pass
+
def runtests(args=None):
import pytest
View
1 tests/functional/test_merge.py
@@ -33,6 +33,7 @@ def test_success(self):
url = reverse('admin:auth_user_changelist')
test_file = os.path.join(os.path.dirname(__file__), 'casper-tests/merge.js')
+ assert os.path.exists(test_file)
self.assertTrue(self.casper(test_file,
url=url,
ids=ids,

0 comments on commit 3876985

Please sign in to comment.
Something went wrong with that request. Please try again.