Tests related fixes

- fixed import
- set default TEST_RUNNER setting (hushes django warnings)
- enforce null prefix for tests

Author: vinilios

settings.py

@@ -303,6 +303,8 @@ def get_from_env(var, default):
 USE_X_FORWARDED_HOST = True
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
 
+TEST_RUNNER = "django.test.runner.DiscoverRunner"
+
 # useful trick for custom settings
 try:
     from local_settings import *

test_settings.py

@@ -96,3 +96,4 @@ def mkdir_p(path):
     ZEUS_RESULTS_FONT_BOLD_PATH = '/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-B.ttf'
 
 USE_X_SENDFILE = False
+SERVER_PREFIX = ''

zeus/tests/test_functional.py

@@ -16,11 +16,11 @@
 from helios import datatypes
 from helios.crypto.elgamal import DLog_challenge_generator
 from helios.crypto import algs
-from helios.views import ELGAMAL_PARAMS
 from helios.models import Election, Voter, Poll, Trustee
 from zeus.tests.utils import SetUpAdminAndClientMixin
 from zeus.core import to_relative_answers, gamma_encode, prove_encryption
 from zeus import auth
+from zeus.views.common import ELGAMAL_PARAMS
 
 pytestmark = pytest.mark.django_db(transaction=True)