trying to get lettuce tests to run again

klorydryk · Feb 24, 2011 · 1aaa2d4 · 1aaa2d4
1 parent 3dcd3a6
commit 1aaa2d4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/bin/run-all-tests.sh b/bin/run-all-tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 export PYTHONPATH="apps/:"$PYTHONPATH
 
-django-admin.py test --settings=memopol2.testsettings --with-coverage --cover-package=memopol2 --with-xunit --with-xcoverage
-django-admin.py harvest  --settings=memopol2.testsettings --verbosity=3 -a memopol2.main
-pylint --rcfile=.pylintrc memopol2 | tee pylint.out
+django-admin.py test --settings=memopol2.testsettings --with-coverage --cover-package=apps --with-xunit --with-xcoverage
+django-admin.py harvest  --settings=memopol2.testsettings --verbosity=3 -a apps
+pylint --rcfile=.pylintrc apps | tee pylint.out
diff --git a/memopol2/settings.py b/memopol2/settings.py
@@ -130,4 +130,4 @@
      ('votes', '%s/votes' % COUCHDB),
      ('mps',   '%s/mps' % COUCHDB),
      ('meps',  '%s/meps' % COUCHDB),
- )
+)
diff --git a/memopol2/templates/404.html b/memopol2/templates/404.html
@@ -0,0 +1 @@
+404 !
diff --git a/memopol2/templates/500.html b/memopol2/templates/500.html
@@ -0,0 +1 @@
+500 !
diff --git a/memopol2/urls.py b/memopol2/urls.py
@@ -5,6 +5,8 @@
 from django.contrib import admin
 from django.views.static import serve
 
+from django.conf.urls.defaults import *
+
 from meps import views
 
 admin.autodiscover()