Skip to content

E
edx-platform
Commit 99b02996 by Ben Patterson
Options

Merge pull request #11097 from edx/ziafazal/SOL-1560 

ziafazal/SOL-1560:load db_fixures when run with --testsonly
parents 6a24fd66 2f275f31
Showing with 35 additions and 18 deletions
common/djangoapps/util/milestones_helpers.py
......@@ -186,7 +186,13 @@ def fulfill_course_milestone(course_key, user):
if not settings.FEATURES.get('MILESTONES_APP', False):
return None
from milestones import api as milestones_api
course_milestones = milestones_api.get_course_milestones(course_key=course_key, relationship="fulfills")
from milestones.exceptions import InvalidMilestoneRelationshipTypeException
try:
course_milestones = milestones_api.get_course_milestones(course_key=course_key, relationship="fulfills")
except InvalidMilestoneRelationshipTypeException:
# we have not seeded milestone relationship types
seed_milestone_relationship_types()
course_milestones = milestones_api.get_course_milestones(course_key=course_key, relationship="fulfills")
for milestone in course_milestones:
milestones_api.add_user_milestone({'id': user.id}, milestone)
......
common/test/db_cache/bok_choy_data.json
This source diff could not be displayed because it is too large. You can view the blob instead.
common/test/db_fixtures/certificates_web_view.json
......@@ -3,7 +3,7 @@
"pk": 99,
"model": "certificates.certificategenerationconfiguration",
"fields": {
"change_date": "2015-06-18 11:02:13",
"change_date": "2015-06-18 11:02:13.007790+00:00",
"changed_by": 99,
"enabled": true
}
......@@ -12,7 +12,7 @@
"pk": 99,
"model": "certificates.certificategenerationcoursesetting",
"fields": {
"modified": "2015-06-18 11:02:13",
"modified": "2015-06-18 11:02:13.007790+00:00",
"course_key": "course-v1:test_org+3355358979513794782079645765720179311111+test_run",
"enabled": true
}
......@@ -21,7 +21,7 @@
"pk": 99,
"model": "auth.user",
"fields": {
"date_joined": "2015-06-12 11:02:13",
"date_joined": "2015-06-12 11:02:13.007790+00:00",
"username": "testcert",
"first_name": "john",
"last_name": "doe",
......@@ -53,7 +53,7 @@
"pk": 2,
"model": "certificates.certificatehtmlviewconfiguration",
"fields": {
"change_date": "2050-05-15 11:02:13",
"change_date": "2050-05-15 11:02:13.007790+00:00",
"changed_by": 99,
"enabled": true,
"configuration": "{\"default\": {\"accomplishment_class_append\": \"accomplishment-certificate\",\"platform_name\": \"edX\",\"company_privacy_url\": \"http://www.edx.org/edx-privacy-policy\",\"company_about_url\": \"http://www.edx.org/about-us\",\"company_tos_url\": \"http://www.edx.org/edx-terms-service\",\"company_verified_certificate_url\": \"http://www.edx.org/verified-certificate\",\"document_stylesheet_url_application\": \"/static/certificates/sass/main-ltr.css\",\"logo_src\": \"/static/certificates/images/logo-edx.svg\",\"logo_url\": \"http://www.edx.org\"},\"honor\": {\"certificate_type\": \"Honor Code\",\"document_body_class_append\": \"is-honorcode\"},\"verified\": {\"certificate_type\": \"Verified\",\"document_body_class_append\": \"is-idverified\"},\"xseries\": {\"certificate_type\": \"XSeries\",\"document_body_class_append\": \"is-xseries\"}}"
......@@ -73,8 +73,8 @@
"verify_uuid": "52bfac10394d49219385dcd4cc17177e",
"download_uuid": "52bfac10394d49219385dcd4cc17177r",
"name": "testcert",
"created_date": "2015-06-12 11:02:13",
"modified_date": "2015-06-12 11:02:13",
"created_date": "2015-06-12 11:02:13.007790+00:00",
"modified_date": "2015-06-12 11:02:13.007790+00:00",
"error_reason": "",
"mode": "honor"
}
......@@ -93,8 +93,8 @@
"verify_uuid": "52bfac10394d49219385dcd4cc17177e",
"download_uuid": "52bfac10394d49219385dcd4cc17177r",
"name": "testcert",
"created_date": "2015-06-12 11:02:13",
"modified_date": "2015-06-12 11:02:13",
"created_date": "2015-06-12 11:02:13.007790+00:00",
"modified_date": "2015-06-12 11:02:13.007790+00:00",
"error_reason": "",
"mode": "honor"
}
......@@ -103,7 +103,7 @@
"pk": 1,
"model": "student.linkedinaddtoprofileconfiguration",
"fields": {
"change_date": "2050-06-15 11:02:13",
"change_date": "2050-06-15 11:02:13.007790+00:00",
"changed_by": 99,
"enabled": true,
"dashboard_tracking_code": "edx-course-v1&TESTCOURSE",
......
pavelib/utils/test/suites/bokchoy_suite.py
......@@ -77,6 +77,9 @@ class BokChoyTestSuite(TestSuite):
if not self.testsonly:
self.prepare_bokchoy_run()
else:
# load data in db_fixtures
self.load_data()
msg = colorize('green', "Confirming servers have started...")
print msg
......@@ -147,13 +150,8 @@ class BokChoyTestSuite(TestSuite):
bokchoy_utils.clear_mongo()
self.cache.flush_all()
sh(
"DEFAULT_STORE={default_store}"
" ./manage.py lms --settings bok_choy loaddata --traceback"
" common/test/db_fixtures/*.json".format(
default_store=self.default_store,
)
)
# load data in db_fixtures
self.load_data()
if self.imports_dir:
sh(
......@@ -169,6 +167,19 @@ class BokChoyTestSuite(TestSuite):
print msg
bokchoy_utils.start_servers(self.default_store, self.coveragerc)
def load_data(self):
"""
Loads data into database from db_fixtures
"""
print 'Loading data from json fixtures in db_fixtures directory'
sh(
"DEFAULT_STORE={default_store}"
" ./manage.py lms --settings bok_choy loaddata --traceback"
" common/test/db_fixtures/*.json".format(
default_store=self.default_store,
)
)
def run_servers_continuously(self):
"""
Infinite loop. Servers will continue to run in the current session unless interrupted.
......
scripts/reset-test-db.sh
......@@ -28,7 +28,7 @@ DB_CACHE_DIR="common/test/db_cache"
echo "CREATE DATABASE IF NOT EXISTS edxtest;" | mysql -u root
# Clear out the test database
./manage.py lms --settings bok_choy reset_db --traceback --noinput
./manage.py lms --settings bok_choy flush --traceback --noinput
# If there are cached database schemas/data, load them
if [[ -f $DB_CACHE_DIR/bok_choy_schema.sql && -f $DB_CACHE_DIR/bok_choy_migrations_data.sql && -f $DB_CACHE_DIR/bok_choy_data.json ]]; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment