Small fixes to rebase to edx-platform

manage.py

@@ -16,6 +16,7 @@ if __name__ == "__main__":
         import logging
         logging.captureWarnings(True)
         sys.argv.append('--noinput')
+        sys.argv.append('--logging-clear-handlers')
 
     from django.core.management import execute_from_command_line
     execute_from_command_line(sys.argv)

openassessment/assessment/api/staff.py

@@ -242,7 +242,7 @@ def create_assessment(
         raise StaffAssessmentInternalError(error_message)
 
 
-@transaction.commit_on_success
+@transaction.atomic
 def _complete_assessment(
         submission_uuid,
         scorer_id,

openassessment/workflow/models.py

@@ -112,8 +112,6 @@ class AssessmentWorkflow(TimeStampedModel, StatusModel):
 
     @classmethod
     @transaction.atomic
-    def include_staff_in_class(cls):
-        if 'staff' not in cls.STEPS:
     def start_workflow(cls, submission_uuid, step_names, on_init_params):
         """
         Start a new workflow.

openassessment/workflow/test/test_api.py

@@ -15,7 +15,7 @@ from openassessment.assessment.models import StudentTrainingWorkflow
 import submissions.api as sub_api
 from openassessment.assessment.api import peer as peer_api
 from openassessment.assessment.api import self as self_api
-from openassessment.workflow.models import AssessmentWorkflow
+from openassessment.workflow.models import AssessmentWorkflow, AssessmentApiLoadError
 from openassessment.workflow.errors import AssessmentWorkflowInternalError
 
 
@@ -368,7 +368,7 @@ class TestAssessmentWorkflowApi(CacheResetTest):
             item_id=ITEM_1['item_id']
         )
 
-        with self.assertRaises(AssessmentWorkflowInternalError):
+        with self.assertRaises(AssessmentApiLoadError):
             workflow_api.update_from_assessments(submission['uuid'], {})
 
     def test_cancel_the_assessment_workflow(self):

requirements/test-acceptance.txt

 bok-choy==0.4.7
-ddt==0.8.0
+ddt==1.0.0
 nose==1.3.3

scripts/render-templates.sh

@@ -3,5 +3,5 @@
 cd `dirname $BASH_SOURCE` && cd ..
 
 echo "Generating HTML fixtures for JavaScript tests..."
-export DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-"settings.test"}
+export DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-"settings.test_with_coverage"}
 ./scripts/render_templates.py openassessment/xblock/static/js/fixtures/templates.json

scripts/render_templates.py

@@ -30,8 +30,8 @@ import dateutil.parser
 import pytz
 
 # This is a bit of a hack to ensure that the root repo directory
-# is in the Python path, so Django can find the settings module.
-sys.path.append(os.path.dirname(os.path.dirname(__file__)))
+# is in the front of the Python path, so Django can find the settings module.
+sys.path.insert(1,os.path.dirname(os.path.dirname(__file__)))
 import django
 from django.template.context import Context
 from django.template.loader import get_template

scripts/test-python.sh

@@ -6,5 +6,5 @@ cd `dirname $BASH_SOURCE` && cd ..
 git clean -xfd "./storage/test/"
 
 echo "Running Python tests..."
-export DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-"settings.test"}
+export DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-"settings.test_with_coverage"}
 python manage.py test $1