Fixed database to work on Jenkins (now stored in test_root),

moved syncdb/migration steps into the rake test_acceptance commands
and updated the documentation.

cms/envs/acceptance.py

@@ -27,8 +27,8 @@ DATA_DIR = COURSES_ROOT
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': ENV_ROOT / "db" / "test_mitx.db",
-        'TEST_NAME': ENV_ROOT / "db" / "test_mitx.db",
+        'NAME': TEST_ROOT / "db" / "test_mitx.db",
+        'TEST_NAME': TEST_ROOT / "db" / "test_mitx.db",
     }
 }
 

doc/testing.md

@@ -166,14 +166,6 @@ uses [Selenium](http://docs.seleniumhq.org/) to control the browser.
 **Prerequisite**: You must have [ChromeDriver](https://code.google.com/p/selenium/wiki/ChromeDriver) 
 installed to run the tests in Chrome.  
 
-Before running the tests, you need to set up the test database:
-
-    rm ../db/test_mitx.db
-    rake django-admin[syncdb,lms,acceptance,--noinput]
-    rake django-admin[migrate,lms,acceptance,--noinput]
-    rake django-admin[syncdb,cms,acceptance,--noinput]
-    rake django-admin[migrate,cms,acceptance,--noinput]
-
 To run all the acceptance tests:
 
     rake test_acceptance_lms

lms/envs/acceptance.py

@@ -43,8 +43,8 @@ CONTENTSTORE = {
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': ENV_ROOT / "db" / "test_mitx.db",
-        'TEST_NAME': ENV_ROOT / "db" / "test_mitx.db",
+        'NAME': TEST_ROOT / "db" / "test_mitx.db",
+        'TEST_NAME': TEST_ROOT / "db" / "test_mitx.db",
     }
 }
 

rakefile

@@ -244,7 +244,8 @@ def run_tests(system, report_dir, stop_on_failure=true)
 end
 
 def run_acceptance_tests(system, report_dir, harvest_args)
-    ENV['NOSE_XUNIT_FILE'] = File.join(report_dir, 'acceptance_tests.xml')
+    sh(django_admin(system, 'acceptance', 'syncdb', '--noinput'))
+    sh(django_admin(system, 'acceptance', 'migrate', '--noinput'))
     sh(django_admin(system, 'acceptance', 'harvest', '--debug-mode', harvest_args))
 end