- Fix tests

- Fix minor views.py
- Fix minor errors caused due to conflict resolution, rebasing
- Fix errors in forms, views
- Minor Button label change in addquestion.html
- Add snippet to question
- Remove commented code

1 files changed, 0 insertions, 40 deletions

diff --git a/yaksh/evaluator_tests/test_bash_evaluation.py b/yaksh/evaluator_tests/test_bash_evaluation.py
index 39247f7..7c58c43 100644
--- a/yaksh/evaluator_tests/test_bash_evaluation.py
+++ b/yaksh/evaluator_tests/test_bash_evaluation.py
@@ -10,15 +10,6 @@ class BashEvaluationTestCases(unittest.TestCase):
         self.timeout_msg = ("Code took more than {0} seconds to run. "
                             "You probably have an infinite loop in your code.").format(SERVER_TIMEOUT)
 
-    # def setUp(self):
-    #     self.language = "bash"
-    #     self.ref_code_path = "bash_files/sample.sh,bash_files/sample.args"
-    #     self.in_dir = "/tmp"
-    #     self.test_case_data = []
-    #     self.timeout_msg = ("Code took more than {0} seconds to run. "
-    #                         "You probably have an infinite loop in your code.").format(SERVER_TIMEOUT)
-    #     self.test = None
-
     def test_correct_answer(self):
         user_answer = "#!/bin/bash\n[[ $# -eq 2 ]] && echo $(( $1 + $2 )) && exit $(( $1 + $2 ))"
         get_class = BashCodeEvaluator(self.in_dir)
@@ -49,37 +40,6 @@ class BashEvaluationTestCases(unittest.TestCase):
         self.assertFalse(result.get("success"))
         self.assertEquals(result.get("error"), self.timeout_msg)
 
-    # def test_infinite_loop(self):
-    #     user_answer = "#!/bin/bash\nwhile [ 1 ] ; do echo "" > /dev/null ; done"
-    #     get_class = BashCodeEvaluator(self.test_case_data, self.test, self.language, user_answer, self.ref_code_path, self.in_dir)
-    #     result = get_class.evaluate()
-
-    #     self.assertFalse(result.get("success"))
-    #     self.assertEquals(result.get("error"), self.timeout_msg)
-
-    # def test_correct_answer(self):
-    #     user_answer = "#!/bin/bash\n[[ $# -eq 2 ]] && echo $(( $1 + $2 )) && exit $(( $1 + $2 ))"
-    #     get_class = BashCodeEvaluator(self.test_case_data, self.test, self.language, user_answer, self.ref_code_path, self.in_dir)
-    #     result = get_class.evaluate()
-
-    #     self.assertTrue(result.get("success"))
-    #     self.assertEqual(result.get("error"), "Correct answer")
-
-    # def test_error(self):
-    #     user_answer = "#!/bin/bash\n[[ $# -eq 2 ]] && echo $(( $1 - $2 )) && exit $(( $1 - $2 ))"
-    #     get_class = BashCodeEvaluator(self.test_case_data, self.test, self.language, user_answer, self.ref_code_path, self.in_dir)
-    #     result = get_class.evaluate()
-
-    #     self.assertFalse(result.get("success"))
-    #     self.assertTrue("Error" in result.get("error"))
-
-    # def test_infinite_loop(self):
-    #     user_answer = "#!/bin/bash\nwhile [ 1 ] ; do echo "" > /dev/null ; done"
-    #     get_class = BashCodeEvaluator(self.test_case_data, self.test, self.language, user_answer, self.ref_code_path, self.in_dir)
-    #     result = get_class.evaluate()
-
-    #     self.assertFalse(result.get("success"))
-    #     self.assertEquals(result.get("error"), self.timeout_msg)
 
 if __name__ == '__main__':
     unittest.main()