Update tests to allow LMS tests to use published branch setting.
Conflicts: cms/djangoapps/contentstore/views/tests/test_container_page.py common/djangoapps/external_auth/tests/test_shib.py common/djangoapps/student/tests/test_login.py common/lib/xmodule/xmodule/modulestore/tests/django_utils.py common/lib/xmodule/xmodule/modulestore/tests/factories.py common/lib/xmodule/xmodule/modulestore/xml_importer.py lms/djangoapps/branding/tests.py lms/djangoapps/courseware/tests/test_submitting_problems.py lms/djangoapps/courseware/tests/test_video_handlers.py lms/djangoapps/instructor_task/tests/test_base.py lms/djangoapps/instructor_task/tests/test_integration.py
Showing
- cms/djangoapps/contentstore/tests/utils.py 1 addition, 1 deletioncms/djangoapps/contentstore/tests/utils.py
- cms/djangoapps/contentstore/views/tests/test_container_page.py 21 additions, 22 deletions...jangoapps/contentstore/views/tests/test_container_page.py
- common/djangoapps/contentserver/tests/test.py 1 addition, 1 deletioncommon/djangoapps/contentserver/tests/test.py
- common/djangoapps/external_auth/tests/test_shib.py 35 additions, 13 deletionscommon/djangoapps/external_auth/tests/test_shib.py
- common/djangoapps/student/tests/test_login.py 13 additions, 4 deletionscommon/djangoapps/student/tests/test_login.py
- common/lib/xmodule/xmodule/modulestore/tests/django_utils.py 15 additions, 7 deletionscommon/lib/xmodule/xmodule/modulestore/tests/django_utils.py
- common/lib/xmodule/xmodule/modulestore/tests/factories.py 62 additions, 50 deletionscommon/lib/xmodule/xmodule/modulestore/tests/factories.py
- common/lib/xmodule/xmodule/modulestore/xml_importer.py 141 additions, 138 deletionscommon/lib/xmodule/xmodule/modulestore/xml_importer.py
- lms/djangoapps/branding/tests.py 5 additions, 4 deletionslms/djangoapps/branding/tests.py
- lms/djangoapps/courseware/features/annotatable.py 1 addition, 5 deletionslms/djangoapps/courseware/features/annotatable.py
- lms/djangoapps/courseware/features/common.py 0 additions, 4 deletionslms/djangoapps/courseware/features/common.py
- lms/djangoapps/courseware/features/conditional.py 1 addition, 4 deletionslms/djangoapps/courseware/features/conditional.py
- lms/djangoapps/courseware/features/gst.py 1 addition, 1 deletionlms/djangoapps/courseware/features/gst.py
- lms/djangoapps/courseware/tests/test_lti_integration.py 4 additions, 2 deletionslms/djangoapps/courseware/tests/test_lti_integration.py
- lms/djangoapps/courseware/tests/test_video_handlers.py 3 additions, 1 deletionlms/djangoapps/courseware/tests/test_video_handlers.py
- lms/djangoapps/instructor_task/tests/test_base.py 5 additions, 2 deletionslms/djangoapps/instructor_task/tests/test_base.py
- lms/djangoapps/instructor_task/tests/test_integration.py 4 additions, 1 deletionlms/djangoapps/instructor_task/tests/test_integration.py
- lms/envs/test.py 0 additions, 1 deletionlms/envs/test.py
Loading
Please register or sign in to comment