From 9411ab221e007a6c3e2901ce34f38f2267288b6e Mon Sep 17 00:00:00 2001
From: adityacp
Date: Thu, 28 Jul 2016 00:12:51 +0530
Subject: rebase changes and changed expected input format in cpp tests

---
 yaksh/evaluator_tests/test_c_cpp_evaluation.py | 2 +-
 yaksh/test_views.py                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/yaksh/evaluator_tests/test_c_cpp_evaluation.py b/yaksh/evaluator_tests/test_c_cpp_evaluation.py
index a2fc51f..ff3cddf 100644
--- a/yaksh/evaluator_tests/test_c_cpp_evaluation.py
+++ b/yaksh/evaluator_tests/test_c_cpp_evaluation.py
@@ -82,7 +82,7 @@ class CppStdioEvaluationTestCases(unittest.TestCase):
 
     def test_array_input(self):
         self.test_case_data = [{'expected_output': '561',
-                                'expected_input': '5,6,1'}]
+                                'expected_input': '5\n6\n1'}]
         user_answer = dedent("""
         #include<stdio.h>
         int main(void){
diff --git a/yaksh/test_views.py b/yaksh/test_views.py
index 6e59e26..2544276 100644
--- a/yaksh/test_views.py
+++ b/yaksh/test_views.py
@@ -8,7 +8,7 @@ from django.test import Client
 
 from yaksh.models import User, Profile, Question, Quiz, QuestionPaper,\
     QuestionSet, AnswerPaper, Answer, Course, StandardTestCase,\
-    StdoutBasedTestCase, has_profile
+    StdioBasedTestCase, has_profile
 
 
 class TestProfile(TestCase):
-- 
cgit