OC-1320 Reverting test environment changes.

I was running the tests inside the devstack environment instead of in a separate virtualenv.

run_tests.py

@@ -18,7 +18,7 @@ if __name__ == "__main__":
     sys.path.append(xblock_sdk_dir)
 
     # Use the workbench settings file:
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "tests.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
     # Configure a range of ports in case the default port of 8081 is in use
     os.environ.setdefault("DJANGO_LIVE_TEST_SERVER_ADDRESS", "localhost:8081-8099")
 

tests/settings.py

-SECRET_KEY="notagoodsecretkey"
-
-# grabbed from tests/settings.py removed from
-# https://github.com/open-craft/xblock-drag-and-drop-v2/commit/d1e4d124f068be84d6d513d9699bb54114e39fe5
-DEBUG = True
-
-INSTALLED_APPS = (
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    'workbench',
-    'sample_xblocks.basic',
-    'django_nose',
-)
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': 'drag_and_drop_v2.db'
-    }
-}
-
-CACHES = {
-    'default': {
-        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache'
-    }
-}
-
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.eggs.Loader',
-)
-
-#JV FIXME ROOT_URLCONF = 'urls'
-ROOT_URLCONF = 'tests.urls'
-
-TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
-
-STATIC_ROOT = ''
-STATIC_URL = '/static/'
- 
-WORKBENCH = {'reset_state_on_restart': False}

tests/urls.py

-from django.conf.urls import include, url
-urlpatterns = [
-    url(r'^', include('workbench.urls')),
-]