Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

Conflicts:
	lms/envs/aws.py

jenkins/quality.sh

@@ -3,6 +3,8 @@
 set -e
 set -x
 
+git remote prune origin
+
 # Reset the submodule, in case it changed
 git submodule foreach 'git reset --hard HEAD'
 

jenkins/test.sh

@@ -15,6 +15,8 @@ function github_mark_failed_on_exit {
     trap '[ $? == "0" ] || github_status state:failure "failed"' EXIT
 }
 
+git remote prune origin
+
 github_mark_failed_on_exit
 github_status state:pending "is running"
 

lms/envs/aws.py

@@ -83,7 +83,8 @@ XQUEUE_INTERFACE = AUTH_TOKENS['XQUEUE_INTERFACE']
 MODULESTORE = AUTH_TOKENS.get('MODULESTORE', MODULESTORE)
 CONTENTSTORE = AUTH_TOKENS.get('CONTENTSTORE', CONTENTSTORE)
 
-STAFF_GRADING_INTERFACE = AUTH_TOKENS.get('STAFF_GRADING_INTERFACE')
+STAFF_GRADING_INTERFACE = AUTH_TOKENS.get('STAFF_GRADING_INTERFACE', STAFF_GRADING_INTERFACE)
+PEER_GRADING_INTERFACE = AUTH_TOKENS.get('PEER_GRADING_INTERFACE', PEER_GRADING_INTERFACE)
 
 PEARSON_TEST_USER = "pearsontest"
 PEARSON_TEST_PASSWORD = AUTH_TOKENS.get("PEARSON_TEST_PASSWORD")

lms/envs/common.py

@@ -328,12 +328,28 @@ WIKI_LINK_DEFAULT_LEVEL = 2
 
 ################################# Staff grading config  #####################
 
-STAFF_GRADING_INTERFACE = None
+#By setting up the default settings with an incorrect user name and password,
+# will get an error when attempting to connect
+STAFF_GRADING_INTERFACE = {
+    'url': 'http://sandbox-grader-001.m.edx.org/staff_grading',
+    'username': 'incorrect_user',
+    'password': 'incorrect_pass',
+    }
+
 # Used for testing, debugging
 MOCK_STAFF_GRADING = False
 
 ################################# Peer grading config  #####################
-PEER_GRADING_INTERFACE = None
+
+#By setting up the default settings with an incorrect user name and password,
+# will get an error when attempting to connect
+PEER_GRADING_INTERFACE = {
+    'url': 'http://sandbox-grader-001.m.edx.org/peer_grading',
+    'username': 'incorrect_user',
+    'password': 'incorrect_pass',
+    }
+
+# Used for testing, debugging
 MOCK_PEER_GRADING = False
 
 ################################# Jasmine ###################################