Commit 4a568476 by Ned Batchelder

Remove a number of unneeded super()-delegation methods

parent 1f8125df
...@@ -17,9 +17,6 @@ class TestArgParsingCourseExport(unittest.TestCase): ...@@ -17,9 +17,6 @@ class TestArgParsingCourseExport(unittest.TestCase):
""" """
Tests for parsing arguments for the `export` management command Tests for parsing arguments for the `export` management command
""" """
def setUp(self):
super(TestArgParsingCourseExport, self).setUp()
def test_no_args(self): def test_no_args(self):
""" """
Test export command with no arguments Test export command with no arguments
......
...@@ -86,9 +86,6 @@ class CourseDetailsViewTest(CourseTestCase, MilestonesTestCaseMixin): ...@@ -86,9 +86,6 @@ class CourseDetailsViewTest(CourseTestCase, MilestonesTestCaseMixin):
""" """
Tests for modifying content on the first course settings page (course dates, overview, etc.). Tests for modifying content on the first course settings page (course dates, overview, etc.).
""" """
def setUp(self):
super(CourseDetailsViewTest, self).setUp()
def alter_field(self, url, details, field, val): def alter_field(self, url, details, field, val):
""" """
Change the one field to the given value and then invoke the update post to see if it worked. Change the one field to the given value and then invoke the update post to see if it worked.
......
...@@ -131,9 +131,6 @@ class MixedWithOptionsTestCase(MixedSplitTestCase): ...@@ -131,9 +131,6 @@ class MixedWithOptionsTestCase(MixedSplitTestCase):
INDEX_NAME = None INDEX_NAME = None
DOCUMENT_TYPE = None DOCUMENT_TYPE = None
def setUp(self):
super(MixedWithOptionsTestCase, self).setUp()
def setup_course_base(self, store): def setup_course_base(self, store):
""" base version of setup_course_base is a no-op """ """ base version of setup_course_base is a no-op """
pass pass
......
...@@ -95,9 +95,6 @@ class PreviewModuleSystem(ModuleSystem): # pylint: disable=abstract-method ...@@ -95,9 +95,6 @@ class PreviewModuleSystem(ModuleSystem): # pylint: disable=abstract-method
# they are being rendered for preview (i.e. in Studio) # they are being rendered for preview (i.e. in Studio)
is_author_mode = True is_author_mode = True
def __init__(self, **kwargs):
super(PreviewModuleSystem, self).__init__(**kwargs)
def handler_url(self, block, handler_name, suffix='', query='', thirdparty=False): def handler_url(self, block, handler_name, suffix='', query='', thirdparty=False):
return reverse('preview_handler', kwargs={ return reverse('preview_handler', kwargs={
'usage_key_string': unicode(block.scope_ids.usage_id), 'usage_key_string': unicode(block.scope_ids.usage_id),
......
...@@ -210,12 +210,6 @@ class GroupConfigurationsListHandlerTestCase(CourseTestCase, GroupConfigurations ...@@ -210,12 +210,6 @@ class GroupConfigurationsListHandlerTestCase(CourseTestCase, GroupConfigurations
""" """
Test cases for group_configurations_list_handler. Test cases for group_configurations_list_handler.
""" """
def setUp(self):
"""
Set up GroupConfigurationsListHandlerTestCase.
"""
super(GroupConfigurationsListHandlerTestCase, self).setUp()
def _url(self): def _url(self):
""" """
Return url for the handler. Return url for the handler.
...@@ -609,10 +603,6 @@ class GroupConfigurationsUsageInfoTestCase(CourseTestCase, HelperMethods): ...@@ -609,10 +603,6 @@ class GroupConfigurationsUsageInfoTestCase(CourseTestCase, HelperMethods):
""" """
Tests for usage information of configurations and content groups. Tests for usage information of configurations and content groups.
""" """
def setUp(self):
super(GroupConfigurationsUsageInfoTestCase, self).setUp()
def _get_user_partition(self, scheme): def _get_user_partition(self, scheme):
""" """
Returns the first user partition with the specified scheme. Returns the first user partition with the specified scheme.
...@@ -947,9 +937,6 @@ class GroupConfigurationsValidationTestCase(CourseTestCase, HelperMethods): ...@@ -947,9 +937,6 @@ class GroupConfigurationsValidationTestCase(CourseTestCase, HelperMethods):
""" """
Tests for validation in Group Configurations. Tests for validation in Group Configurations.
""" """
def setUp(self):
super(GroupConfigurationsValidationTestCase, self).setUp()
@patch('xmodule.split_test_module.SplitTestDescriptor.validate_split_test') @patch('xmodule.split_test_module.SplitTestDescriptor.validate_split_test')
def verify_validation_add_usage_info(self, expected_result, mocked_message, mocked_validation_messages): def verify_validation_add_usage_info(self, expected_result, mocked_message, mocked_validation_messages):
""" """
......
...@@ -40,10 +40,7 @@ class DatabaseMicrositeBackendTests(DatabaseMicrositeTestCase): ...@@ -40,10 +40,7 @@ class DatabaseMicrositeBackendTests(DatabaseMicrositeTestCase):
""" """
def setUp(self): def setUp(self):
super(DatabaseMicrositeBackendTests, self).setUp() super(DatabaseMicrositeBackendTests, self).setUp()
self.addCleanup(microsite.clear)
def tearDown(self):
super(DatabaseMicrositeBackendTests, self).tearDown()
microsite.clear()
def test_get_value(self): def test_get_value(self):
""" """
......
...@@ -22,9 +22,6 @@ class TestMicrosites(DatabaseMicrositeTestCase): ...@@ -22,9 +22,6 @@ class TestMicrosites(DatabaseMicrositeTestCase):
Run through some Microsite logic Run through some Microsite logic
""" """
def setUp(self):
super(TestMicrosites, self).setUp()
@ddt.data(*MICROSITE_BACKENDS) @ddt.data(*MICROSITE_BACKENDS)
def test_get_value_for_org_when_microsite_has_no_org(self, site_backend): def test_get_value_for_org_when_microsite_has_no_org(self, site_backend):
""" """
......
...@@ -236,9 +236,6 @@ class CanonicalContentTest(SharedModuleStoreTestCase): ...@@ -236,9 +236,6 @@ class CanonicalContentTest(SharedModuleStoreTestCase):
set, CDN not set, etc. set, CDN not set, etc.
""" """
def setUp(self):
super(CanonicalContentTest, self).setUp()
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.courses = {} cls.courses = {}
......
...@@ -214,8 +214,7 @@ class OrgRole(RoleBase): ...@@ -214,8 +214,7 @@ class OrgRole(RoleBase):
""" """
A named role in a particular org independent of course A named role in a particular org independent of course
""" """
def __init__(self, role, org): pass
super(OrgRole, self).__init__(role, org)
@register_access_role @register_access_role
......
...@@ -94,9 +94,6 @@ class ActivationEmailTests(TestCase): ...@@ -94,9 +94,6 @@ class ActivationEmailTests(TestCase):
"This email message was automatically sent by edx.org" "This email message was automatically sent by edx.org"
] ]
def setUp(self):
super(ActivationEmailTests, self).setUp()
def test_activation_email(self): def test_activation_email(self):
self._create_account() self._create_account()
self._assert_activation_email(self.ACTIVATION_SUBJECT, self.OPENEDX_FRAGMENTS) self._assert_activation_email(self.ACTIVATION_SUBJECT, self.OPENEDX_FRAGMENTS)
......
...@@ -41,12 +41,6 @@ class CapaModule(CapaMixin, XModule): ...@@ -41,12 +41,6 @@ class CapaModule(CapaMixin, XModule):
js_module_name = "Problem" js_module_name = "Problem"
css = {'scss': [resource_string(__name__, 'css/capa/display.scss')]} css = {'scss': [resource_string(__name__, 'css/capa/display.scss')]}
def __init__(self, *args, **kwargs):
"""
Accepts the same arguments as xmodule.x_module:XModule.__init__
"""
super(CapaModule, self).__init__(*args, **kwargs)
def author_view(self, context): def author_view(self, context):
""" """
Renders the Studio preview view. Renders the Studio preview view.
......
...@@ -341,9 +341,6 @@ class CachingDescriptorSystem(MakoDescriptorSystem, EditInfoRuntimeMixin): ...@@ -341,9 +341,6 @@ class CachingDescriptorSystem(MakoDescriptorSystem, EditInfoRuntimeMixin):
key = UsageKey.from_string(ref_string) key = UsageKey.from_string(ref_string)
return key.replace(run=self.modulestore.fill_in_run(key.course_key).run) return key.replace(run=self.modulestore.fill_in_run(key.course_key).run)
def __setattr__(self, name, value):
return super(CachingDescriptorSystem, self).__setattr__(name, value)
def _convert_reference_fields_to_keys(self, class_, course_key, jsonfields): def _convert_reference_fields_to_keys(self, class_, course_key, jsonfields):
""" """
Find all fields of type reference and convert the payload into UsageKeys Find all fields of type reference and convert the payload into UsageKeys
......
...@@ -2039,12 +2039,6 @@ class TestPublish(SplitModuleTest): ...@@ -2039,12 +2039,6 @@ class TestPublish(SplitModuleTest):
""" """
Test the publishing api Test the publishing api
""" """
def setUp(self):
super(TestPublish, self).setUp()
def tearDown(self):
SplitModuleTest.tearDown(self)
@patch('xmodule.tabs.CourseTab.from_json', side_effect=mock_tab_from_json) @patch('xmodule.tabs.CourseTab.from_json', side_effect=mock_tab_from_json)
def test_publish_safe(self, _from_json): def test_publish_safe(self, _from_json):
""" """
......
...@@ -11,14 +11,6 @@ class DashboardPage(PageObject): ...@@ -11,14 +11,6 @@ class DashboardPage(PageObject):
Student dashboard, where the student can view Student dashboard, where the student can view
courses she/he has registered for. courses she/he has registered for.
""" """
def __init__(self, browser):
"""Initialize the page.
Arguments:
browser (Browser): The browser instance.
"""
super(DashboardPage, self).__init__(browser)
url = "{base}/dashboard".format(base=BASE_URL) url = "{base}/dashboard".format(base=BASE_URL)
def is_browser_on_page(self): def is_browser_on_page(self):
......
...@@ -14,14 +14,6 @@ class IndexPage(PageObject): ...@@ -14,14 +14,6 @@ class IndexPage(PageObject):
""" """
LMS index (home) page, the default landing page for Open edX users when they are not logged in LMS index (home) page, the default landing page for Open edX users when they are not logged in
""" """
def __init__(self, browser):
"""Initialize the page.
Arguments:
browser (Browser): The browser instance.
"""
super(IndexPage, self).__init__(browser)
url = "{base}/".format(base=BASE_URL) url = "{base}/".format(base=BASE_URL)
def is_browser_on_page(self): def is_browser_on_page(self):
......
...@@ -71,9 +71,6 @@ class ResetPasswordPage(PageObject): ...@@ -71,9 +71,6 @@ class ResetPasswordPage(PageObject):
""" """
url = BASE_URL + "/login#forgot-password-modal" url = BASE_URL + "/login#forgot-password-modal"
def __init__(self, browser):
super(ResetPasswordPage, self).__init__(browser)
def is_browser_on_page(self): def is_browser_on_page(self):
return ( return (
self.q(css="#login-anchor").is_present() and self.q(css="#login-anchor").is_present() and
......
...@@ -171,9 +171,6 @@ class FakeSoftwareSecureVerificationPage(PageObject): ...@@ -171,9 +171,6 @@ class FakeSoftwareSecureVerificationPage(PageObject):
url = BASE_URL + '/verify_student/software-secure-fake-response' url = BASE_URL + '/verify_student/software-secure-fake-response'
def __init__(self, browser):
super(FakeSoftwareSecureVerificationPage, self).__init__(browser)
def is_browser_on_page(self): def is_browser_on_page(self):
""" Determine if browser is on the page. """ """ Determine if browser is on the page. """
message = self.q(css='BODY').text[0] message = self.q(css='BODY').text[0]
......
...@@ -10,13 +10,6 @@ class MoveModalView(PageObject): ...@@ -10,13 +10,6 @@ class MoveModalView(PageObject):
A base class for move xblock A base class for move xblock
""" """
def __init__(self, browser):
"""
Arguments:
browser (selenium.webdriver): The Selenium-controlled browser that this page is loaded in.
"""
super(MoveModalView, self).__init__(browser)
def is_browser_on_page(self): def is_browser_on_page(self):
return self.q(css='.modal-window.move-modal').present return self.q(css='.modal-window.move-modal').present
......
...@@ -1109,9 +1109,6 @@ class SubsectionOutlineModal(CourseOutlineModal): ...@@ -1109,9 +1109,6 @@ class SubsectionOutlineModal(CourseOutlineModal):
Subclass to handle a few special cases with subsection modals. Subclass to handle a few special cases with subsection modals.
""" """
def __init__(self, page):
super(SubsectionOutlineModal, self).__init__(page)
@property @property
def is_explicitly_locked(self): def is_explicitly_locked(self):
""" """
......
...@@ -11,13 +11,6 @@ class CrowdsourcehinterProblemPage(PageObject): ...@@ -11,13 +11,6 @@ class CrowdsourcehinterProblemPage(PageObject):
url = None url = None
def __init__(self, browser):
"""
Args:
browser (selenium.webdriver): The Selenium-controlled browser that this page is loaded in.
"""
super(CrowdsourcehinterProblemPage, self).__init__(browser)
def is_browser_on_page(self): def is_browser_on_page(self):
return len(self.browser.find_elements_by_class_name('crowdsourcehinter_block')) > 0 return len(self.browser.find_elements_by_class_name('crowdsourcehinter_block')) > 0
......
...@@ -723,12 +723,6 @@ class UniqueCourseTest(AcceptanceTest): ...@@ -723,12 +723,6 @@ class UniqueCourseTest(AcceptanceTest):
Test that provides a unique course ID. Test that provides a unique course ID.
""" """
def __init__(self, *args, **kwargs):
"""
Create a unique course ID.
"""
super(UniqueCourseTest, self).__init__(*args, **kwargs)
def setUp(self): def setUp(self):
super(UniqueCourseTest, self).setUp() super(UniqueCourseTest, self).setUp()
......
...@@ -132,12 +132,6 @@ class BookmarksTest(BookmarksTestMixin): ...@@ -132,12 +132,6 @@ class BookmarksTest(BookmarksTestMixin):
Tests to verify bookmarks functionality. Tests to verify bookmarks functionality.
""" """
def setUp(self):
"""
Initialize test setup.
"""
super(BookmarksTest, self).setUp()
def _breadcrumb(self, num_units, modified_name=None): def _breadcrumb(self, num_units, modified_name=None):
""" """
Creates breadcrumbs for the first `num_units` Creates breadcrumbs for the first `num_units`
......
...@@ -127,9 +127,6 @@ class CourseHomeA11yTest(CourseHomeBaseTest): ...@@ -127,9 +127,6 @@ class CourseHomeA11yTest(CourseHomeBaseTest):
Tests the accessibility of the course home page with course outline. Tests the accessibility of the course home page with course outline.
""" """
def setUp(self):
super(CourseHomeA11yTest, self).setUp()
def test_course_home_a11y(self): def test_course_home_a11y(self):
""" """
Test the accessibility of the course home page with course outline. Test the accessibility of the course home page with course outline.
......
...@@ -1239,9 +1239,6 @@ class EcommerceTest(BaseInstructorDashboardTest): ...@@ -1239,9 +1239,6 @@ class EcommerceTest(BaseInstructorDashboardTest):
""" """
Bok Choy tests for the "E-Commerce" tab. Bok Choy tests for the "E-Commerce" tab.
""" """
def setUp(self):
super(EcommerceTest, self).setUp()
def setup_course(self, course_number): def setup_course(self, course_number):
""" """
Sets up the course Sets up the course
......
...@@ -13,9 +13,6 @@ class VideoEditorTest(CMSVideoBaseTest): ...@@ -13,9 +13,6 @@ class VideoEditorTest(CMSVideoBaseTest):
CMS Video Editor Test Class CMS Video Editor Test Class
""" """
def setUp(self):
super(VideoEditorTest, self).setUp()
def _create_video_component(self, subtitles=False): def _create_video_component(self, subtitles=False):
""" """
Create a video component and navigate to unit page Create a video component and navigate to unit page
......
...@@ -28,9 +28,6 @@ class VideoTranscriptTest(CMSVideoBaseTest): ...@@ -28,9 +28,6 @@ class VideoTranscriptTest(CMSVideoBaseTest):
CMS Video Transcript Test Class CMS Video Transcript Test Class
""" """
def setUp(self):
super(VideoTranscriptTest, self).setUp()
def _create_video_component(self, subtitles=False, subtitle_id='3_yD_cEKoCk'): def _create_video_component(self, subtitles=False, subtitle_id='3_yD_cEKoCk'):
""" """
Create a video component and navigate to unit page Create a video component and navigate to unit page
......
...@@ -13,9 +13,6 @@ class VideoHandoutTest(CMSVideoBaseTest): ...@@ -13,9 +13,6 @@ class VideoHandoutTest(CMSVideoBaseTest):
CMS Video Handout Test Class CMS Video Handout Test Class
""" """
def setUp(self):
super(VideoHandoutTest, self).setUp()
def _create_course_unit_with_handout(self, handout_filename, save_settings=True): def _create_course_unit_with_handout(self, handout_filename, save_settings=True):
""" """
Create a course with unit and also upload handout Create a course with unit and also upload handout
......
...@@ -218,9 +218,6 @@ class VideoBaseTest(UniqueCourseTest): ...@@ -218,9 +218,6 @@ class VideoBaseTest(UniqueCourseTest):
class YouTubeVideoTest(VideoBaseTest): class YouTubeVideoTest(VideoBaseTest):
""" Test YouTube Video Player """ """ Test YouTube Video Player """
def setUp(self):
super(YouTubeVideoTest, self).setUp()
def test_youtube_video_rendering_wo_html5_sources(self): def test_youtube_video_rendering_wo_html5_sources(self):
""" """
Scenario: Video component is rendered in the LMS in Youtube mode without HTML5 sources Scenario: Video component is rendered in the LMS in Youtube mode without HTML5 sources
...@@ -944,9 +941,6 @@ class YouTubeVideoTest(VideoBaseTest): ...@@ -944,9 +941,6 @@ class YouTubeVideoTest(VideoBaseTest):
class YouTubeHtml5VideoTest(VideoBaseTest): class YouTubeHtml5VideoTest(VideoBaseTest):
""" Test YouTube HTML5 Video Player """ """ Test YouTube HTML5 Video Player """
def setUp(self):
super(YouTubeHtml5VideoTest, self).setUp()
@flaky # TODO fix this, see TNL-1642 @flaky # TODO fix this, see TNL-1642
def test_youtube_video_rendering_with_unsupported_sources(self): def test_youtube_video_rendering_with_unsupported_sources(self):
""" """
...@@ -966,9 +960,6 @@ class YouTubeHtml5VideoTest(VideoBaseTest): ...@@ -966,9 +960,6 @@ class YouTubeHtml5VideoTest(VideoBaseTest):
class Html5VideoTest(VideoBaseTest): class Html5VideoTest(VideoBaseTest):
""" Test HTML5 Video Player """ """ Test HTML5 Video Player """
def setUp(self):
super(Html5VideoTest, self).setUp()
def test_autoplay_disabled_for_video_component(self): def test_autoplay_disabled_for_video_component(self):
""" """
Scenario: Autoplay is disabled by default for a Video component Scenario: Autoplay is disabled by default for a Video component
...@@ -1154,9 +1145,6 @@ class Html5VideoTest(VideoBaseTest): ...@@ -1154,9 +1145,6 @@ class Html5VideoTest(VideoBaseTest):
class YouTubeQualityTest(VideoBaseTest): class YouTubeQualityTest(VideoBaseTest):
""" Test YouTube Video Quality Button """ """ Test YouTube Video Quality Button """
def setUp(self):
super(YouTubeQualityTest, self).setUp()
@skip_if_browser('firefox') @skip_if_browser('firefox')
def test_quality_button_visibility(self): def test_quality_button_visibility(self):
""" """
...@@ -1204,9 +1192,6 @@ class DragAndDropTest(VideoBaseTest): ...@@ -1204,9 +1192,6 @@ class DragAndDropTest(VideoBaseTest):
""" """
Tests draggability of closed captions within videos. Tests draggability of closed captions within videos.
""" """
def setUp(self):
super(DragAndDropTest, self).setUp()
def test_if_captions_are_draggable(self): def test_if_captions_are_draggable(self):
""" """
Loads transcripts so that closed-captioning is available. Loads transcripts so that closed-captioning is available.
......
...@@ -7,9 +7,6 @@ from common.test.acceptance.tests.video.test_video_module import VideoBaseTest ...@@ -7,9 +7,6 @@ from common.test.acceptance.tests.video.test_video_module import VideoBaseTest
class VideoTimesTest(VideoBaseTest): class VideoTimesTest(VideoBaseTest):
""" Test Video Player Times """ """ Test Video Player Times """
def setUp(self):
super(VideoTimesTest, self).setUp()
def test_video_start_time(self): def test_video_start_time(self):
""" """
Scenario: Start time works for Youtube video Scenario: Start time works for Youtube video
......
...@@ -630,9 +630,6 @@ class GenerateExampleCertificatesTest(TestCase): ...@@ -630,9 +630,6 @@ class GenerateExampleCertificatesTest(TestCase):
COURSE_KEY = CourseLocator(org='test', course='test', run='test') COURSE_KEY = CourseLocator(org='test', course='test', run='test')
def setUp(self):
super(GenerateExampleCertificatesTest, self).setUp()
def test_generate_example_certs(self): def test_generate_example_certs(self):
# Generate certificates for the course # Generate certificates for the course
CourseModeFactory.create(course_id=self.COURSE_KEY, mode_slug=CourseMode.HONOR) CourseModeFactory.create(course_id=self.COURSE_KEY, mode_slug=CourseMode.HONOR)
...@@ -718,9 +715,6 @@ class CertificatesBrandingTest(TestCase): ...@@ -718,9 +715,6 @@ class CertificatesBrandingTest(TestCase):
COURSE_KEY = CourseLocator(org='test', course='test', run='test') COURSE_KEY = CourseLocator(org='test', course='test', run='test')
def setUp(self):
super(CertificatesBrandingTest, self).setUp()
@set_microsite(settings.MICROSITE_CONFIGURATION['test_site']['domain_prefix']) @set_microsite(settings.MICROSITE_CONFIGURATION['test_site']['domain_prefix'])
def test_certificate_header_data(self): def test_certificate_header_data(self):
""" """
......
...@@ -257,12 +257,6 @@ class AboutWithCappedEnrollmentsTestCase(LoginEnrollmentTestCase, SharedModuleSt ...@@ -257,12 +257,6 @@ class AboutWithCappedEnrollmentsTestCase(LoginEnrollmentTestCase, SharedModuleSt
data="OOGIE BLOOGIE", display_name="overview" data="OOGIE BLOOGIE", display_name="overview"
) )
def setUp(self):
"""
Set up the tests
"""
super(AboutWithCappedEnrollmentsTestCase, self).setUp()
def test_enrollment_cap(self): def test_enrollment_cap(self):
""" """
This test will make sure that enrollment caps are enforced This test will make sure that enrollment caps are enforced
...@@ -310,9 +304,6 @@ class AboutWithInvitationOnly(SharedModuleStoreTestCase): ...@@ -310,9 +304,6 @@ class AboutWithInvitationOnly(SharedModuleStoreTestCase):
display_name="overview" display_name="overview"
) )
def setUp(self):
super(AboutWithInvitationOnly, self).setUp()
def test_invitation_only(self): def test_invitation_only(self):
""" """
Test for user not logged in, invitation only course. Test for user not logged in, invitation only course.
...@@ -360,9 +351,6 @@ class AboutTestCaseShibCourse(LoginEnrollmentTestCase, SharedModuleStoreTestCase ...@@ -360,9 +351,6 @@ class AboutTestCaseShibCourse(LoginEnrollmentTestCase, SharedModuleStoreTestCase
data="OOGIE BLOOGIE", display_name="overview" data="OOGIE BLOOGIE", display_name="overview"
) )
def setUp(self):
super(AboutTestCaseShibCourse, self).setUp()
def test_logged_in_shib_course(self): def test_logged_in_shib_course(self):
""" """
For shib courses, logged in users will see the enroll button, but get rejected once they click there For shib courses, logged in users will see the enroll button, but get rejected once they click there
......
...@@ -169,10 +169,6 @@ class TestLTIModuleListing(SharedModuleStoreTestCase): ...@@ -169,10 +169,6 @@ class TestLTIModuleListing(SharedModuleStoreTestCase):
publish_item=False, publish_item=False,
) )
def setUp(self):
"""Create course, 2 chapters, 2 sections"""
super(TestLTIModuleListing, self).setUp()
def expected_handler_url(self, handler): def expected_handler_url(self, handler):
"""convenience method to get the reversed handler urls""" """convenience method to get the reversed handler urls"""
return "https://{}{}".format(settings.SITE_NAME, reverse( return "https://{}{}".format(settings.SITE_NAME, reverse(
......
...@@ -59,9 +59,6 @@ class TestSites(SharedModuleStoreTestCase, LoginEnrollmentTestCase): ...@@ -59,9 +59,6 @@ class TestSites(SharedModuleStoreTestCase, LoginEnrollmentTestCase):
emit_signals=True, emit_signals=True,
) )
def setUp(self):
super(TestSites, self).setUp()
def setup_users(self): def setup_users(self):
# Create student accounts and activate them. # Create student accounts and activate them.
for i in range(len(self.STUDENT_INFO)): for i in range(len(self.STUDENT_INFO)):
......
...@@ -22,9 +22,6 @@ class CoursewareMiddlewareTestCase(SharedModuleStoreTestCase): ...@@ -22,9 +22,6 @@ class CoursewareMiddlewareTestCase(SharedModuleStoreTestCase):
super(CoursewareMiddlewareTestCase, cls).setUpClass() super(CoursewareMiddlewareTestCase, cls).setUpClass()
cls.course = CourseFactory.create() cls.course = CourseFactory.create()
def setUp(self):
super(CoursewareMiddlewareTestCase, self).setUp()
def test_process_404(self): def test_process_404(self):
"""A 404 should not trigger anything""" """A 404 should not trigger anything"""
request = RequestFactory().get("dummy_url") request = RequestFactory().get("dummy_url")
......
...@@ -1155,9 +1155,6 @@ class CreateThreadUnicodeTestCase( ...@@ -1155,9 +1155,6 @@ class CreateThreadUnicodeTestCase(
cls.student = UserFactory.create() cls.student = UserFactory.create()
CourseEnrollmentFactory(user=cls.student, course_id=cls.course.id) CourseEnrollmentFactory(user=cls.student, course_id=cls.course.id)
def setUp(self):
super(CreateThreadUnicodeTestCase, self).setUp()
@patch('lms.lib.comment_client.utils.requests.request', autospec=True) @patch('lms.lib.comment_client.utils.requests.request', autospec=True)
def _test_unicode_data(self, text, mock_request,): def _test_unicode_data(self, text, mock_request,):
""" """
...@@ -1200,9 +1197,6 @@ class UpdateThreadUnicodeTestCase( ...@@ -1200,9 +1197,6 @@ class UpdateThreadUnicodeTestCase(
cls.student = UserFactory.create() cls.student = UserFactory.create()
CourseEnrollmentFactory(user=cls.student, course_id=cls.course.id) CourseEnrollmentFactory(user=cls.student, course_id=cls.course.id)
def setUp(self):
super(UpdateThreadUnicodeTestCase, self).setUp()
@patch('django_comment_client.utils.get_discussion_categories_ids', return_value=["test_commentable"]) @patch('django_comment_client.utils.get_discussion_categories_ids', return_value=["test_commentable"])
@patch('lms.lib.comment_client.utils.requests.request', autospec=True) @patch('lms.lib.comment_client.utils.requests.request', autospec=True)
def _test_unicode_data(self, text, mock_request, mock_get_discussion_id_map): def _test_unicode_data(self, text, mock_request, mock_get_discussion_id_map):
...@@ -1246,9 +1240,6 @@ class CreateCommentUnicodeTestCase( ...@@ -1246,9 +1240,6 @@ class CreateCommentUnicodeTestCase(
cls.student = UserFactory.create() cls.student = UserFactory.create()
CourseEnrollmentFactory(user=cls.student, course_id=cls.course.id) CourseEnrollmentFactory(user=cls.student, course_id=cls.course.id)
def setUp(self):
super(CreateCommentUnicodeTestCase, self).setUp()
@patch('lms.lib.comment_client.utils.requests.request', autospec=True) @patch('lms.lib.comment_client.utils.requests.request', autospec=True)
def _test_unicode_data(self, text, mock_request): def _test_unicode_data(self, text, mock_request):
commentable_id = "non_team_dummy_id" commentable_id = "non_team_dummy_id"
...@@ -1297,9 +1288,6 @@ class UpdateCommentUnicodeTestCase( ...@@ -1297,9 +1288,6 @@ class UpdateCommentUnicodeTestCase(
cls.student = UserFactory.create() cls.student = UserFactory.create()
CourseEnrollmentFactory(user=cls.student, course_id=cls.course.id) CourseEnrollmentFactory(user=cls.student, course_id=cls.course.id)
def setUp(self):
super(UpdateCommentUnicodeTestCase, self).setUp()
@patch('lms.lib.comment_client.utils.requests.request', autospec=True) @patch('lms.lib.comment_client.utils.requests.request', autospec=True)
def _test_unicode_data(self, text, mock_request): def _test_unicode_data(self, text, mock_request):
self._set_mock_request_data(mock_request, { self._set_mock_request_data(mock_request, {
...@@ -1341,9 +1329,6 @@ class CreateSubCommentUnicodeTestCase( ...@@ -1341,9 +1329,6 @@ class CreateSubCommentUnicodeTestCase(
cls.student = UserFactory.create() cls.student = UserFactory.create()
CourseEnrollmentFactory(user=cls.student, course_id=cls.course.id) CourseEnrollmentFactory(user=cls.student, course_id=cls.course.id)
def setUp(self):
super(CreateSubCommentUnicodeTestCase, self).setUp()
@patch('lms.lib.comment_client.utils.requests.request', autospec=True) @patch('lms.lib.comment_client.utils.requests.request', autospec=True)
def _test_unicode_data(self, text, mock_request): def _test_unicode_data(self, text, mock_request):
""" """
...@@ -1667,9 +1652,6 @@ class ForumEventTestCase(ForumsEnableMixin, SharedModuleStoreTestCase, MockReque ...@@ -1667,9 +1652,6 @@ class ForumEventTestCase(ForumsEnableMixin, SharedModuleStoreTestCase, MockReque
cls.student.roles.add(Role.objects.get(name="Student", course_id=cls.course.id)) cls.student.roles.add(Role.objects.get(name="Student", course_id=cls.course.id))
CourseAccessRoleFactory(course_id=cls.course.id, user=cls.student, role='Wizard') CourseAccessRoleFactory(course_id=cls.course.id, user=cls.student, role='Wizard')
def setUp(self):
super(ForumEventTestCase, self).setUp()
@patch('eventtracking.tracker.emit') @patch('eventtracking.tracker.emit')
@patch('lms.lib.comment_client.utils.requests.request', autospec=True) @patch('lms.lib.comment_client.utils.requests.request', autospec=True)
def test_thread_event(self, __, mock_emit): def test_thread_event(self, __, mock_emit):
...@@ -1852,9 +1834,6 @@ class UsersEndpointTestCase(ForumsEnableMixin, SharedModuleStoreTestCase, MockRe ...@@ -1852,9 +1834,6 @@ class UsersEndpointTestCase(ForumsEnableMixin, SharedModuleStoreTestCase, MockRe
cls.other_user = UserFactory.create(username="other") cls.other_user = UserFactory.create(username="other")
CourseEnrollmentFactory(user=cls.other_user, course_id=cls.course.id) CourseEnrollmentFactory(user=cls.other_user, course_id=cls.course.id)
def setUp(self):
super(UsersEndpointTestCase, self).setUp()
def set_post_counts(self, mock_request, threads_count=1, comments_count=1): def set_post_counts(self, mock_request, threads_count=1, comments_count=1):
""" """
sets up a mock response from the comments service for getting post counts for our other_user sets up a mock response from the comments service for getting post counts for our other_user
......
...@@ -181,9 +181,6 @@ class ZeroCourseGrade(CourseGradeBase): ...@@ -181,9 +181,6 @@ class ZeroCourseGrade(CourseGradeBase):
Course Grade class for Zero-value grades when no problems were Course Grade class for Zero-value grades when no problems were
attempted in the course. attempted in the course.
""" """
def __init__(self, user, course_data):
super(ZeroCourseGrade, self).__init__(user, course_data)
def _get_subsection_grade(self, subsection): def _get_subsection_grade(self, subsection):
return ZeroSubsectionGrade(subsection, self.course_data) return ZeroSubsectionGrade(subsection, self.course_data)
......
...@@ -88,9 +88,6 @@ class BlockRecordTest(GradesModelTestCase): ...@@ -88,9 +88,6 @@ class BlockRecordTest(GradesModelTestCase):
""" """
Test the BlockRecord model. Test the BlockRecord model.
""" """
def setUp(self):
super(BlockRecordTest, self).setUp()
def test_creation(self): def test_creation(self):
""" """
Tests creation of a BlockRecord. Tests creation of a BlockRecord.
......
...@@ -733,9 +733,6 @@ class TestGetEmailParams(SharedModuleStoreTestCase): ...@@ -733,9 +733,6 @@ class TestGetEmailParams(SharedModuleStoreTestCase):
cls.course_about_url = cls.course_url + 'about' cls.course_about_url = cls.course_url + 'about'
cls.registration_url = u'https://{}/register'.format(site) cls.registration_url = u'https://{}/register'.format(site)
def setUp(self):
super(TestGetEmailParams, self).setUp()
def test_normal_params(self): def test_normal_params(self):
# For a normal site, what do we expect to get for the URLs? # For a normal site, what do we expect to get for the URLs?
# Also make sure `auto_enroll` is properly passed through. # Also make sure `auto_enroll` is properly passed through.
......
...@@ -172,12 +172,6 @@ class LtiLaunchTestRender(LtiTestMixin, RenderXBlockTestMixin, ModuleStoreTestCa ...@@ -172,12 +172,6 @@ class LtiLaunchTestRender(LtiTestMixin, RenderXBlockTestMixin, ModuleStoreTestCa
""" """
SUCCESS_ENROLLED_STAFF_MONGO_COUNT = 9 SUCCESS_ENROLLED_STAFF_MONGO_COUNT = 9
def setUp(self):
"""
Set up tests
"""
super(LtiLaunchTestRender, self).setUp()
def get_response(self, usage_key, url_encoded_params=None): def get_response(self, usage_key, url_encoded_params=None):
""" """
Overridable method to get the response from the endpoint that is being tested. Overridable method to get the response from the endpoint that is being tested.
......
...@@ -11,9 +11,6 @@ class TestMobilePlatform(TestCase): ...@@ -11,9 +11,6 @@ class TestMobilePlatform(TestCase):
""" """
Tests for platform against mobile app request Tests for platform against mobile app request
""" """
def setUp(self):
super(TestMobilePlatform, self).setUp()
@ddt.data( @ddt.data(
("edX/org.edx.mobile (0.1.5; OS Version 9.2 (Build 13C75))", "iOS", "0.1.5"), ("edX/org.edx.mobile (0.1.5; OS Version 9.2 (Build 13C75))", "iOS", "0.1.5"),
("edX/org.edx.mobile (1.01.1; OS Version 9.2 (Build 13C75))", "iOS", "1.01.1"), ("edX/org.edx.mobile (1.01.1; OS Version 9.2 (Build 13C75))", "iOS", "1.01.1"),
......
...@@ -13,9 +13,6 @@ class TestAppVersionConfigModel(TestCase): ...@@ -13,9 +13,6 @@ class TestAppVersionConfigModel(TestCase):
""" """
Tests for app version configuration model Tests for app version configuration model
""" """
def setUp(self):
super(TestAppVersionConfigModel, self).setUp()
def set_app_version_config(self): def set_app_version_config(self):
""" Creates configuration data for platform versions """ """ Creates configuration data for platform versions """
AppVersionConfig(platform="ios", version="1.1.1", expire_at=None, enabled=True).save() AppVersionConfig(platform="ios", version="1.1.1", expire_at=None, enabled=True).save()
......
...@@ -43,9 +43,6 @@ class BookmarksAPITests(BookmarkApiEventTestMixin, BookmarksTestsBase): ...@@ -43,9 +43,6 @@ class BookmarksAPITests(BookmarkApiEventTestMixin, BookmarksTestsBase):
""" """
These tests cover the parts of the API methods. These tests cover the parts of the API methods.
""" """
def setUp(self):
super(BookmarksAPITests, self).setUp()
def test_get_bookmark(self): def test_get_bookmark(self):
""" """
Verifies that get_bookmark returns data as expected. Verifies that get_bookmark returns data as expected.
......
...@@ -431,9 +431,6 @@ class XBlockCacheModelTest(ModuleStoreTestCase): ...@@ -431,9 +431,6 @@ class XBlockCacheModelTest(ModuleStoreTestCase):
[unicode(SECTION2_USAGE_KEY), 'Section 2'], [unicode(SECTION2_USAGE_KEY), 'Section 2'],
] ]
def setUp(self):
super(XBlockCacheModelTest, self).setUp()
def assert_xblock_cache_data(self, xblock_cache, data): def assert_xblock_cache_data(self, xblock_cache, data):
""" """
Assert that the XBlockCache object values match. Assert that the XBlockCache object values match.
......
...@@ -18,13 +18,6 @@ class NoneToEmptyManager(models.Manager): ...@@ -18,13 +18,6 @@ class NoneToEmptyManager(models.Manager):
A :class:`django.db.models.Manager` that has a :class:`NoneToEmptyQuerySet` A :class:`django.db.models.Manager` that has a :class:`NoneToEmptyQuerySet`
as its `QuerySet`, initialized with a set of specified `field_names`. as its `QuerySet`, initialized with a set of specified `field_names`.
""" """
def __init__(self):
"""
Args:
field_names: The list of field names to initialize the :class:`NoneToEmptyQuerySet` with.
"""
super(NoneToEmptyManager, self).__init__()
def get_queryset(self): def get_queryset(self):
""" """
Returns the result of NoneToEmptyQuerySet instead of a regular QuerySet. Returns the result of NoneToEmptyQuerySet instead of a regular QuerySet.
......
...@@ -53,9 +53,6 @@ class TestXblockUtils(SharedModuleStoreTestCase): ...@@ -53,9 +53,6 @@ class TestXblockUtils(SharedModuleStoreTestCase):
run='2015' run='2015'
) )
def setUp(self):
super(TestXblockUtils, self).setUp()
def create_fragment(self, content=None): def create_fragment(self, content=None):
""" """
Create a fragment. Create a fragment.
......
...@@ -370,12 +370,6 @@ class XBlockTestCase(XBlockStudentTestCaseMixin, ...@@ -370,12 +370,6 @@ class XBlockTestCase(XBlockStudentTestCaseMixin,
raise unittest.SkipTest('Test only valid in lms') raise unittest.SkipTest('Test only valid in lms')
super(XBlockTestCase, cls).setUpClass() super(XBlockTestCase, cls).setUpClass()
def setUp(self):
"""
Call setups of all parents
"""
super(XBlockTestCase, self).setUp()
def get_handler_url(self, handler, xblock_name=None): def get_handler_url(self, handler, xblock_name=None):
""" """
Get url for the specified xblock handler Get url for the specified xblock handler
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment