Merge pull request #336 from edx/docker-testing

Docker testing improvements

Makefile

@@ -96,3 +96,7 @@ open-devstack:
 
 accept:
 	nosetests --with-ignore-docstrings -v acceptance_tests
+
+make dev.test:
+	coverage run ./manage.py test course_discovery --settings=course_discovery.settings.devstack_test --keepdb
+	coverage report

course_discovery/settings/devstack_test.py

+from course_discovery.settings.devstack import *
+# noinspection PyUnresolvedReferences
+from course_discovery.settings.shared.test import *
+
+INSTALLED_APPS += [
+    'django_nose',
+]
+
+JWT_AUTH['JWT_SECRET_KEY'] = 'course-discovery-jwt-secret-key'
+
+LOGGING['handlers']['local'] = {'class': 'logging.NullHandler'}

course_discovery/settings/shared/test.py

+import os
+
+TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
+
+NOSE_ARGS = [
+    '--with-ignore-docstrings',
+    '--logging-level=DEBUG',
+    '--logging-clear-handlers',
+    '--exclude-dir=course_discovery/settings',
+]
+
+HAYSTACK_CONNECTIONS = {
+    'default': {
+        'ENGINE': 'course_discovery.apps.edx_haystack_extensions.backends.EdxElasticsearchSearchEngine',
+        'URL': os.environ.get('TEST_ELASTICSEARCH_URL', 'http://localhost:9200/'),
+        'INDEX_NAME': 'catalog_test',
+    },
+}
+
+EDX_DRF_EXTENSIONS = {
+    'OAUTH2_USER_INFO_URL': 'http://example.com/oauth2/user_info',
+}
+
+DEFAULT_PARTNER_ID = 1
+
+# Enable offline compression of CSS/JS
+COMPRESS_ENABLED = True
+COMPRESS_OFFLINE = True
+
+SOLO_CACHE = None

course_discovery/settings/test.py

 from course_discovery.settings.base import *
+# noinspection PyUnresolvedReferences
+from course_discovery.settings.shared.test import *
 
-# TEST SETTINGS
 INSTALLED_APPS += [
     'django_nose',
     'course_discovery.apps.edx_catalog_extensions',
 ]
 
-TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
-
-NOSE_ARGS = [
-    '--with-ignore-docstrings',
-    '--logging-level=DEBUG',
-    '--logging-clear-handlers',
-]
-
-# END TEST SETTINGS
-
-
 # IN-MEMORY TEST DATABASE
 DATABASES = {
     'default': {
@@ -30,26 +20,6 @@ DATABASES = {
 }
 # END IN-MEMORY TEST DATABASE
 
-HAYSTACK_CONNECTIONS = {
-    'default': {
-        'ENGINE': 'course_discovery.apps.edx_haystack_extensions.backends.EdxElasticsearchSearchEngine',
-        'URL': os.environ.get('TEST_ELASTICSEARCH_URL', 'http://localhost:9200/'),
-        'INDEX_NAME': 'catalog_test',
-    },
-}
-
 JWT_AUTH['JWT_SECRET_KEY'] = 'course-discovery-jwt-secret-key'
 
-EDX_DRF_EXTENSIONS = {
-    'OAUTH2_USER_INFO_URL': 'http://example.com/oauth2/user_info',
-}
-
-DEFAULT_PARTNER_ID = 1
-
-# Enable offline compression of CSS/JS
-COMPRESS_ENABLED = True
-COMPRESS_OFFLINE = True
-
-SOLO_CACHE = None
-
 LOGGING['handlers']['local'] = {'class': 'logging.NullHandler'}

docker-compose.yml

@@ -4,6 +4,7 @@ services:
   db:
     image: mysql:5.6
     container_name: db
+    command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci
     environment:
       MYSQL_ROOT_PASSWORD: ""
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"

requirements/test.txt

@@ -9,6 +9,7 @@ factory-boy==2.7.0
 freezegun==0.3.7
 lxml==3.6.1
 mock==2.0.0
+nose-exclude==0.5.0
 nose-ignore-docstring==0.2
 pep8==1.7.0
 responses==0.5.1