Fix test cases

FOSSEE · Oct 13, 2015 · 5061c2a · 5061c2a
1 parent bc5fc32
commit 5061c2a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,6 +17,6 @@ before_install:
   - sudo apt-get install -y scilab
 
 # command to run tests
-script: 
-  - nosetests ./yaksh/evaluator_tests/
-  - python manage.py test
+script:
+  - test $DJANGO=1.5.7 && nosetests ./yaksh/evaluator_tests/
+  - python manage.py test yaksh
diff --git a/yaksh/tests.py b/yaksh/tests.py
@@ -19,10 +19,11 @@ def setUpModule():
         Question.objects.create(summary='Q%d' % (i), points=1)
 
     # create a quiz
-    Quiz.objects.create(start_date='2014-06-16', duration=30, active=False,
+    Quiz.objects.create(start_date_time=datetime.datetime(2015, 10, 9, 10, 8, 15, 0),
+                         duration=30, active=False,
                          attempts_allowed=-1, time_between_attempts=0,
-                        description='demo quiz', pass_criteria=40,
-                        language='Python', prerequisite=None)
+                         description='demo quiz', pass_criteria=40,
+                         language='Python', prerequisite=None)
 
 
 def tearDownModule():
@@ -51,10 +52,6 @@ def test_user_profile(self):
 class QuestionTestCases(unittest.TestCase):
     def setUp(self):
         # Single question details
-        # self.question = Question(summary='Demo question', language='Python',
-        #                          type='Code', active=True,
-        #                          description='Write a function', points=1.0,
-        #                          test='Test Cases', snippet='def myfunc()')
         self.question = Question(summary='Demo question', language='Python',
                                  type='Code', active=True,
                                  description='Write a function', points=1.0,
@@ -130,8 +127,10 @@ def setUp(self):
 
     def test_quiz(self):
         """ Test Quiz"""
-        self.assertEqual((self.quiz.start_date).strftime('%Y-%m-%d'),
-                         '2014-06-16')
+        self.assertEqual((self.quiz.start_date_time).strftime('%Y-%m-%d'),
+                         '2015-10-09')
+        self.assertEqual((self.quiz.start_date_time).strftime('%H:%M:%S'),
+                         '10:08:15')
         self.assertEqual(self.quiz.duration, 30)
         self.assertTrue(self.quiz.active is False)
         self.assertEqual(self.quiz.description, 'demo quiz')