Permalink
Browse files

Moved the tests into their own project and make them pass :)

  • Loading branch information...
1 parent 4dfe84d commit cf0bd3981a1ff730175b07844fb37f8e85768f05 @ericholscher committed Jun 11, 2009
View
@@ -0,0 +1 @@
+*.pyc
File renamed without changes.
View
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+from django.core.management import execute_manager
+try:
+ import settings # Assumed to be in the same directory.
+except ImportError:
+ import sys
+ sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n" % __file__)
+ sys.exit(1)
+
+if __name__ == "__main__":
+ execute_manager(settings)
No changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -6,9 +6,7 @@
DEBUG = False
TEMPLATE_DEBUG = DEBUG
-ADMINS = (
- # ('Eric', 'eric@ericholscher.com'),
-)
+ADMINS = ()
MANAGERS = ADMINS
@@ -62,10 +60,10 @@
'django.contrib.auth.middleware.AuthenticationMiddleware',
)
-ROOT_URLCONF = 'test.urls'
+ROOT_URLCONF = 'urls'
TEMPLATE_DIRS = (
- '/Users/ericholscher/lib/test/templates',
+ os.path.join(PROJECT_DIR, 'templates')
)
INSTALLED_APPS = (
@@ -74,8 +72,6 @@
'django.contrib.sessions',
'django.contrib.sites',
'django.contrib.admin',
- 'django.contrib.admindocs',
- 'test_utils.tests.polls',
- 'test_utils',
- 'django_extensions',
+ 'polls',
+ 'test_app',
)
No changes.
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
@@ -1,8 +1,9 @@
+from assertions_tests import *
from templatetags_tests import *
from testmaker_tests import *
-from assertions_tests import *
import twill_tests
+
__test__ = {
'TWILL': twill_tests,
}
@@ -14,7 +14,7 @@ class CrawlerTests(TestCase):
Tests to test the Crawler API
"""
urls = "test_utils.tests.polls.urls"
- fixtures = ['/Users/ericholscher/lib/django-test-utils/test_utils/tests/polls/fixtures/polls_testmaker.json']
+ fixtures = ['polls_testmaker.json']
def test_basic_crawling(self):
conf_urls = {}
@@ -29,7 +29,7 @@ class TestMakerTests(TestCase):
Tests to test basic testmaker functionality.
"""
urls = "test_utils.tests.polls.urls"
- fixtures = ['/Users/ericholscher/lib/django-test-utils/test_utils/tests/polls/fixtures/polls_testmaker.json']
+ fixtures = ['polls_testmaker.json']
def setUp(self):
setup_logging('test_file', 'serialize_file')

0 comments on commit cf0bd39

Please sign in to comment.