Merge pull request #55 from edx/test-runner

Resolved deprecation warning

Merge pull request #55 from edx/test-runner
Resolved deprecation warning
541d5b35 · Clinton Blackburn · 12d98207 · acaa38f0 · 541d5b35 · 541d5b35
Commit 541d5b35 authored Apr 13, 2015 by Clinton Blackburn
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

ecommerce/settings/base.py
+3 -0

manage.py
+0 -0

No files found.
--- a/ecommerce/settings/base.py
+++ b/ecommerce/settings/base.py
@@ -391,3 +391,6 @@ REST_FRAMEWORK = {
    'PAGE_SIZE': 20
 }
 # END DJANGO REST FRAMEWORK
+
+# Resolving deprecation warning
+TEST_RUNNER = 'django.test.runner.DiscoverRunner'
--- a/manage.py
+++ b/manage.py