Removed all references to nose, since was implemented incorrectly in …

…the tests, and also prevented db model migration from occurring correctly.

formhub/settings.py

@@ -164,7 +164,6 @@
     'django.contrib.admindocs',
     'registration',
     'south',
-    'django_nose',
     'django_digest',
     'corsheaders',
     'oauth2_provider',
@@ -364,12 +363,6 @@ def skip_suspicious_operations(record):
 # default content length for submission requests
 DEFAULT_CONTENT_LENGTH = 10000000
 
-TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
-NOSE_ARGS = ['--with-fixture-bundling']
-#NOSE_PLUGINS = [
-#    'utils.nose_plugins.SilenceSouth'
-#]
-
 # re-captcha in registrations
 REGISTRATION_REQUIRE_CAPTCHA = False
 RECAPTCHA_USE_SSL = False

main/tests/test_base.py

@@ -9,7 +9,6 @@
 from django.contrib.auth.models import User
 from django_digest.test import Client as DigestClient
 from django.test import TestCase
-# from django_nose import FastFixtureTestCase as TestCase
 from django.test.client import Client
 
 from odk_logger.models import XForm, Instance, Attachment

main/tests/test_form_enter_data.py

@@ -10,7 +10,6 @@
 from django.core.urlresolvers import reverse
 from django.core.validators import URLValidator
 from django.conf import settings
-from nose import SkipTest
 
 from test_base import MainTestCase
 from main.views import set_perm, show, qrcode
@@ -60,7 +59,7 @@ def _running_enketo(self):
 
     def test_enketo_remote_server(self):
         if not self._running_enketo():
-            raise SkipTest
+            return
         server_url = 'https://testserver.com/bob'
         form_id = "test_%s" % re.sub(re.compile("\."), "_", str(time()))
         url = enketo_url(server_url, form_id)
@@ -91,7 +90,7 @@ def test_qrcode_view_with_enketo_error(self):
 
     def test_enter_data_redir(self):
         if not self._running_enketo():
-            raise SkipTest
+            return 
         factory = RequestFactory()
         request = factory.get('/')
         request.user = self.user