Merge pull request #8172 from edx/benp/revert-pycontracts-enablement

Revert "Enable PyContracts during tests"

cms/djangoapps/contentstore/views/tests/test_assets.py

@@ -309,14 +309,13 @@ class DownloadTestCase(AssetsTestCase):
     def test_metadata_found_in_modulestore(self):
         # Insert asset metadata into the modulestore (with no accompanying asset).
         asset_key = self.course.id.make_asset_key(AssetMetadata.GENERAL_ASSET_TYPE, 'pic1.jpg')
-        asset_md = AssetMetadata(
-            asset_key,
-            internal_name='EKMND332DDBK',
-            pathname='pix/archive',
-            locked=False,
-            curr_version='14',
-            prev_version='13',
-        )
+        asset_md = AssetMetadata(asset_key, {
+            'internal_name': 'EKMND332DDBK',
+            'basename': 'pix/archive',
+            'locked': False,
+            'curr_version': '14',
+            'prev_version': '13'
+        })
         modulestore().save_asset_metadata(asset_md, 15)
         # Get the asset metadata and have it be found in the modulestore.
         # Currently, no asset metadata should be found in the modulestore. The code is not yet storing it there.

lms/djangoapps/courseware/tests/test_module_render.py

@@ -48,7 +48,7 @@ from xmodule.modulestore import ModuleStoreEnum
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import ItemFactory, CourseFactory, check_mongo_calls
-from xmodule.x_module import XModuleDescriptor, XModule, STUDENT_VIEW, CombinedSystem, DescriptorSystem
+from xmodule.x_module import XModuleDescriptor, XModule, STUDENT_VIEW, CombinedSystem
 
 TEST_DATA_DIR = settings.COMMON_TEST_DATA_ROOT
 
@@ -1108,7 +1108,7 @@ class TestAnonymousStudentId(ModuleStoreTestCase, LoginEnrollmentTestCase):
             location=location,
             static_asset_path=None,
             _runtime=Mock(
-                spec=DescriptorSystem,
+                spec=Runtime,
                 resources_fs=None,
                 mixologist=Mock(_mixins=(), name='mixologist'),
                 name='runtime',

lms/djangoapps/lms_xblock/test/test_runtime.py

@@ -11,7 +11,6 @@ from urlparse import urlparse
 from opaque_keys.edx.locations import SlashSeparatedCourseKey
 from lms.djangoapps.lms_xblock.runtime import quote_slashes, unquote_slashes, LmsModuleSystem
 from xblock.fields import ScopeIds
-from xmodule.x_module import DescriptorSystem
 
 TEST_STRINGS = [
     '',
@@ -49,12 +48,12 @@ class TestHandlerUrl(TestCase):
         self.course_key = SlashSeparatedCourseKey("org", "course", "run")
         self.runtime = LmsModuleSystem(
             static_url='/static',
-            track_function=Mock(name='track_function'),
-            get_module=Mock(name='get_module'),
-            render_template=Mock(name='render_template'),
+            track_function=Mock(),
+            get_module=Mock(),
+            render_template=Mock(),
             replace_urls=str,
             course_id=self.course_key,
-            descriptor_runtime=Mock(spec=DescriptorSystem, name='descriptor_runtime'),
+            descriptor_runtime=Mock(),
         )
 
     def test_trailing_characters(self):
@@ -121,13 +120,13 @@ class TestUserServiceAPI(TestCase):
 
         self.runtime = LmsModuleSystem(
             static_url='/static',
-            track_function=Mock(name="track_function"),
-            get_module=Mock(name="get_module"),
-            render_template=Mock(name="render_template"),
+            track_function=Mock(),
+            get_module=Mock(),
+            render_template=Mock(),
             replace_urls=str,
             course_id=self.course_id,
             get_real_user=mock_get_real_user,
-            descriptor_runtime=Mock(spec=DescriptorSystem, name="descriptor_runtime"),
+            descriptor_runtime=Mock(),
         )
         self.scope = 'course'
         self.key = 'key1'

lms/djangoapps/open_ended_grading/tests.py

@@ -24,7 +24,6 @@ from lms.djangoapps.lms_xblock.runtime import LmsModuleSystem
 from student.roles import CourseStaffRole
 from student.models import unique_id_for_user
 from xmodule import peer_grading_module
-from xmodule.x_module import DescriptorSystem
 from xmodule.error_module import ErrorDescriptor
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
@@ -289,7 +288,7 @@ class TestPeerGradingService(ModuleStoreTestCase, LoginEnrollmentTestCase):
             open_ended_grading_interface=test_util_open_ended.OPEN_ENDED_GRADING_INTERFACE,
             mixins=settings.XBLOCK_MIXINS,
             error_descriptor_class=ErrorDescriptor,
-            descriptor_runtime=Mock(spec=DescriptorSystem, name="descriptor_runtime"),
+            descriptor_runtime=None,
         )
         self.descriptor = peer_grading_module.PeerGradingDescriptor(self.system, field_data, ScopeIds(None, None, None, None))
         self.descriptor.xmodule_runtime = self.system

manage.py

@@ -113,5 +113,4 @@ if __name__ == "__main__":
 
     from django.core.management import execute_from_command_line
 
-    sys.argv[1:] = django_args
-    execute_from_command_line(sys.argv)
+    execute_from_command_line([sys.argv[0]] + django_args)

pavelib/utils/test/suites/nose_suite.py

@@ -120,7 +120,7 @@ class SystemTestSuite(NoseTestSuite):
     @property
     def cmd(self):
         cmd = (
-            './manage.py {system} --contracts test --verbosity={verbosity} '
+            './manage.py {system} test --verbosity={verbosity} '
             '{test_id} {test_opts} --traceback --settings=test {extra} '
             '--with-xunit --xunit-file={xunit_report}'.format(
                 system=self.root,