diff options
| author | adityacp | 2016-12-23 15:03:37 +0530 |
|---|---|---|
| committer | adityacp | 2016-12-23 15:03:37 +0530 |
| commit | d442941819dc7f8b65a2965fbcefe000fea1cde2 (patch) | |
| tree | 624d8ba12cf83cf57f685bc8cee158be14aee783 /yaksh/tests | |
| parent | 14b628f49a7d0aa58c22c021c62a5d0a748ae881 (diff) | |
| parent | 48366e84b98157ac32b22b2aa19b1c1cde68afd4 (diff) | |
| download | online_test-d442941819dc7f8b65a2965fbcefe000fea1cde2.tar.gz online_test-d442941819dc7f8b65a2965fbcefe000fea1cde2.tar.bz2 online_test-d442941819dc7f8b65a2965fbcefe000fea1cde2.zip | |
Fix conflict
Diffstat (limited to 'yaksh/tests')
| -rw-r--r-- | yaksh/tests/test_code_server.py | 7 |
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 |