Fixing tests created on master

cms/djangoapps/contentstore/tests/test_contentstore.py

@@ -276,10 +276,11 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
 
         course = ms.get_item(location)
 
+        metadata = own_metadata(course)
         # add a bool piece of unknown metadata so we can verify we don't throw an exception
-        course.metadata['new_metadata'] = True
+        metadata['new_metadata'] = True
 
-        ms.update_metadata(location, course.metadata)
+        ms.update_metadata(location, metadata)
 
         print 'Exporting to tempdir = {0}'.format(root_dir)
 

common/lib/xmodule/xmodule/capa_module.py

@@ -135,6 +135,9 @@ class CapaModule(XModule):
                 # see comment on randomization_bin
                 self.seed = randomization_bin(system.seed, self.location.url)
 
+        if self.max_attempts == '':
+            self.max_attempts = None
+
         # Need the problem location in openendedresponse to send out.  Adding
         # it to the system here seems like the least clunky way to get it
         # there.

common/lib/xmodule/xmodule/tests/test_annotatable_module.py

@@ -28,13 +28,11 @@ class AnnotatableModuleTestCase(unittest.TestCase):
             <annotation title="footnote" body="the end">The Iliad of Homer by Samuel Butler</annotation>
         </annotatable>
     '''
-    definition = { 'data': sample_xml }
     descriptor = Mock()
-    instance_state = None
-    shared_state = None
+    module_data = {'data': sample_xml}
 
     def setUp(self):
-        self.annotatable = AnnotatableModule(test_system(), self.location, self.definition, self.descriptor, self.instance_state, self.shared_state)
+        self.annotatable = AnnotatableModule(test_system(), self.location, self.descriptor, self.module_data)
 
     def test_annotation_data_attr(self):
         el = etree.fromstring('<annotation title="bar" body="foo" problem="0">test</annotation>')