summaryrefslogtreecommitdiff
path: root/yaksh/evaluator_tests
diff options
context:
space:
mode:
authoradityacp2021-03-15 19:09:46 +0530
committeradityacp2021-03-15 19:09:46 +0530
commit800bc1c002b4a57f6c307ca37726d85946a5d7cb (patch)
tree4f8f3b931b78eebb0ea3b88e49bd6ed21ec2cdd3 /yaksh/evaluator_tests
parent542433598aad0efffee7619e1f113425147bcec0 (diff)
parent6fda19daaa06482b8eb52eeb62f9b0a15d0a3da6 (diff)
downloadonline_test-800bc1c002b4a57f6c307ca37726d85946a5d7cb.tar.gz
online_test-800bc1c002b4a57f6c307ca37726d85946a5d7cb.tar.bz2
online_test-800bc1c002b4a57f6c307ca37726d85946a5d7cb.zip
Fix conflicts
Diffstat (limited to 'yaksh/evaluator_tests')
-rw-r--r--yaksh/evaluator_tests/test_simple_question_types.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/yaksh/evaluator_tests/test_simple_question_types.py b/yaksh/evaluator_tests/test_simple_question_types.py
index 5edd545..13d639e 100644
--- a/yaksh/evaluator_tests/test_simple_question_types.py
+++ b/yaksh/evaluator_tests/test_simple_question_types.py
@@ -662,16 +662,8 @@ class ArrangeQuestionTestCases(unittest.TestCase):
regrade_answer.answer = 1
regrade_answer.save()
details = self.answerpaper.regrade(self.question1.id)
- err_msg = dedent("""\
- User: {0}; Quiz: {1}; Question: {2}.
- {3} answer not a list.""".format(
- self.user.username,
- self.quiz.description,
- self.question1.summary,
- self.question1.type
- ))
self.assertFalse(details[0])
- self.assertEqual(details[1], err_msg)
+ self.assertIn("arrange answer not a list", details[1])
# Try regrade with incorrect answer
# When