From a7588410b2fccf86759c8c6ab406d2240abb056d Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Tue, 5 Feb 2013 16:11:04 -0500
Subject: [PATCH] Fix tests

---
 .../xmodule/xmodule/tests/test_combined_open_ended.py  | 10 ++++------
 .../lib/xmodule/xmodule/tests/test_self_assessment.py  |  6 ++----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py b/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
index 69c502cd5d..e58e8c024b 100644
--- a/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
+++ b/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
@@ -41,16 +41,15 @@ class OpenEndedChildTest(unittest.TestCase):
             'max_score': max_score, 
             'display_name': 'Name',
             'accept_file_upload' : False,
+            'close_date': None
             }
     definition = Mock()
-    parent = Mock()
-    parent.closed.return_value = False;
     descriptor = Mock()
 
     def setUp(self):
         self.openendedchild = OpenEndedChild(test_system, self.location, 
                 self.definition, self.descriptor, self.static_data, 
-                self.parent, self.metadata) 
+                self.metadata) 
  
 
     def test_latest_answer_empty(self):
@@ -158,6 +157,7 @@ class OpenEndedModuleTest(unittest.TestCase):
             'max_score': max_score, 
             'display_name': 'Name',
             'accept_file_upload': False,
+            'close_date': None
             }
 
     oeparam = etree.XML('''
@@ -169,8 +169,6 @@ class OpenEndedModuleTest(unittest.TestCase):
     ''')
     definition = {'oeparam': oeparam}
     descriptor = Mock()
-    parent = Mock()
-    parent.closed.return_value = False;
 
     def setUp(self):
         test_system.location = self.location
@@ -179,7 +177,7 @@ class OpenEndedModuleTest(unittest.TestCase):
         test_system.xqueue = {'interface':self.mock_xqueue, 'callback_url':'/', 'default_queuename': 'testqueue', 'waittime': 1}
         self.openendedmodule = OpenEndedModule(test_system, self.location, 
                 self.definition, self.descriptor, self.static_data, 
-                self.parent, self.metadata) 
+                self.metadata) 
 
     def test_message_post(self):
         get = {'feedback': 'feedback text',
diff --git a/common/lib/xmodule/xmodule/tests/test_self_assessment.py b/common/lib/xmodule/xmodule/tests/test_self_assessment.py
index 74018cf101..3cae123ffe 100644
--- a/common/lib/xmodule/xmodule/tests/test_self_assessment.py
+++ b/common/lib/xmodule/xmodule/tests/test_self_assessment.py
@@ -30,8 +30,6 @@ class SelfAssessmentTest(unittest.TestCase):
     metadata = {'attempts': '10'}
 
     descriptor = Mock()
-    parent = Mock()
-    parent.closed.return_value = False
 
     def setUp(self):
         state = json.dumps({'student_answers': ["Answer 1", "answer 2", "answer 3"],
@@ -47,11 +45,12 @@ class SelfAssessmentTest(unittest.TestCase):
                 'max_score': 1,
                 'display_name': "Name",
                 'accept_file_upload' : False,
+                'close_date': None
                 }
 
         self.module = SelfAssessmentModule(test_system, self.location,
                                       self.definition, self.descriptor,
-                                      static_data, self.parent, 
+                                      static_data, 
                                       state, metadata=self.metadata)
 
     def test_get_html(self):
@@ -75,7 +74,6 @@ class SelfAssessmentTest(unittest.TestCase):
 
         # if we now assess as right, skip the REQUEST_HINT state
         self.module.save_answer({'student_answer': 'answer 4'}, test_system)
-        self.parent.closed.assert_called_with()
         self.module.save_assessment({'assessment': '1'}, test_system)
         self.assertEqual(self.module.state, self.module.DONE)