summaryrefslogtreecommitdiff
path: root/yaksh/tests/test_code_server.py
diff options
context:
space:
mode:
authormaheshgudi2016-12-23 15:00:27 +0530
committermaheshgudi2016-12-23 15:00:27 +0530
commitb582c624a7c49e3312e07196df87f26180a520c2 (patch)
tree909679721d2fa2b55a27e7621999dd04c9d36146 /yaksh/tests/test_code_server.py
parent5f6b103408ff8a520c741d2d21d1aff24a823dad (diff)
parent48366e84b98157ac32b22b2aa19b1c1cde68afd4 (diff)
downloadonline_test-b582c624a7c49e3312e07196df87f26180a520c2.tar.gz
online_test-b582c624a7c49e3312e07196df87f26180a520c2.tar.bz2
online_test-b582c624a7c49e3312e07196df87f26180a520c2.zip
fixed pull conflicts
Diffstat (limited to 'yaksh/tests/test_code_server.py')
-rw-r--r--yaksh/tests/test_code_server.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/yaksh/tests/test_code_server.py b/yaksh/tests/test_code_server.py
index d46c9dd..19698a5 100644
--- a/yaksh/tests/test_code_server.py
+++ b/yaksh/tests/test_code_server.py
@@ -55,7 +55,7 @@ class TestCodeServer(unittest.TestCase):
# Then
data = json.loads(result)
self.assertFalse(data['success'])
- self.assertTrue('infinite loop' in data['error'])
+ self.assertTrue('infinite loop' in data['error'][0])
def test_correct_answer(self):
# Given
@@ -77,7 +77,6 @@ class TestCodeServer(unittest.TestCase):
# Then
data = json.loads(result)
self.assertTrue(data['success'])
- self.assertIn('Correct answer', data['error'])
def test_wrong_answer(self):
# Given
@@ -99,7 +98,7 @@ class TestCodeServer(unittest.TestCase):
# Then
data = json.loads(result)
self.assertFalse(data['success'])
- self.assertTrue('AssertionError' in data['error'])
+ self.assertTrue('AssertionError' in data['error'][0])
def test_multiple_simultaneous_hits(self):
# Given
@@ -139,7 +138,7 @@ class TestCodeServer(unittest.TestCase):
for i in range(N):
data = results.get()
self.assertFalse(data['success'])
- self.assertTrue('infinite loop' in data['error'])
+ self.assertTrue('infinite loop' in data['error'][0])
def test_server_pool_status(self):
# Given