Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
1db84e79
Commit
1db84e79
authored
Apr 27, 2016
by
Ben Patterson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Additional shard balancing changes for unit tests.
parent
ddbd7f91
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
15 additions
and
7 deletions
+15
-7
lms/djangoapps/bulk_email/tests/test_tasks.py
+1
-1
lms/djangoapps/ccx/tests/test_field_override_performance.py
+1
-1
lms/djangoapps/course_api/tests/test_serializers.py
+0
-1
lms/djangoapps/courseware/tests/test_entrance_exam.py
+1
-1
lms/djangoapps/courseware/tests/test_group_access.py
+1
-1
lms/djangoapps/courseware/tests/test_submitting_problems.py
+1
-1
lms/djangoapps/courseware/tests/test_views.py
+1
-1
lms/djangoapps/shoppingcart/tests/test_models.py
+5
-0
lms/djangoapps/shoppingcart/tests/test_views.py
+4
-0
No files found.
lms/djangoapps/bulk_email/tests/test_tasks.py
View file @
1db84e79
...
@@ -75,7 +75,7 @@ def my_update_subtask_status(entry_id, current_task_id, new_subtask_status):
...
@@ -75,7 +75,7 @@ def my_update_subtask_status(entry_id, current_task_id, new_subtask_status):
update_subtask_status
(
entry_id
,
current_task_id
,
new_subtask_status
)
update_subtask_status
(
entry_id
,
current_task_id
,
new_subtask_status
)
@attr
(
'shard_
1
'
)
@attr
(
'shard_
3
'
)
@patch
(
'bulk_email.models.html_to_text'
,
Mock
(
return_value
=
'Mocking CourseEmail.text_message'
,
autospec
=
True
))
@patch
(
'bulk_email.models.html_to_text'
,
Mock
(
return_value
=
'Mocking CourseEmail.text_message'
,
autospec
=
True
))
class
TestBulkEmailInstructorTask
(
InstructorTaskCourseTestCase
):
class
TestBulkEmailInstructorTask
(
InstructorTaskCourseTestCase
):
"""Tests instructor task that send bulk email."""
"""Tests instructor task that send bulk email."""
...
...
lms/djangoapps/ccx/tests/test_field_override_performance.py
View file @
1db84e79
...
@@ -30,7 +30,7 @@ from ccx_keys.locator import CCXLocator
...
@@ -30,7 +30,7 @@ from ccx_keys.locator import CCXLocator
from
lms.djangoapps.ccx.tests.factories
import
CcxFactory
from
lms.djangoapps.ccx.tests.factories
import
CcxFactory
@attr
(
'shard_
1
'
)
@attr
(
'shard_
3
'
)
@mock.patch.dict
(
@mock.patch.dict
(
'django.conf.settings.FEATURES'
,
'django.conf.settings.FEATURES'
,
{
{
...
...
lms/djangoapps/course_api/tests/test_serializers.py
View file @
1db84e79
...
@@ -125,7 +125,6 @@ class TestCourseSerializer(CourseApiFactoryMixin, ModuleStoreTestCase):
...
@@ -125,7 +125,6 @@ class TestCourseSerializer(CourseApiFactoryMixin, ModuleStoreTestCase):
self
.
assertEqual
(
result
[
'pacing'
],
expected_pacing
)
self
.
assertEqual
(
result
[
'pacing'
],
expected_pacing
)
@attr
(
'shard_3'
)
class
TestCourseDetailSerializer
(
TestCourseSerializer
):
# pylint: disable=test-inherits-tests
class
TestCourseDetailSerializer
(
TestCourseSerializer
):
# pylint: disable=test-inherits-tests
"""
"""
Test CourseDetailSerializer by rerunning all the tests
Test CourseDetailSerializer by rerunning all the tests
...
...
lms/djangoapps/courseware/tests/test_entrance_exam.py
View file @
1db84e79
...
@@ -38,7 +38,7 @@ from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
...
@@ -38,7 +38,7 @@ from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from
xmodule.modulestore.tests.factories
import
CourseFactory
,
ItemFactory
from
xmodule.modulestore.tests.factories
import
CourseFactory
,
ItemFactory
@attr
(
'shard_
1
'
)
@attr
(
'shard_
2
'
)
@patch.dict
(
'django.conf.settings.FEATURES'
,
{
'ENTRANCE_EXAMS'
:
True
,
'MILESTONES_APP'
:
True
})
@patch.dict
(
'django.conf.settings.FEATURES'
,
{
'ENTRANCE_EXAMS'
:
True
,
'MILESTONES_APP'
:
True
})
class
EntranceExamTestCases
(
LoginEnrollmentTestCase
,
ModuleStoreTestCase
,
MilestonesTestCaseMixin
):
class
EntranceExamTestCases
(
LoginEnrollmentTestCase
,
ModuleStoreTestCase
,
MilestonesTestCaseMixin
):
"""
"""
...
...
lms/djangoapps/courseware/tests/test_group_access.py
View file @
1db84e79
...
@@ -51,7 +51,7 @@ def resolve_attrs(test_method):
...
@@ -51,7 +51,7 @@ def resolve_attrs(test_method):
return
_wrapper
return
_wrapper
@attr
(
'shard_
1
'
)
@attr
(
'shard_
2
'
)
@ddt.ddt
@ddt.ddt
class
GroupAccessTestCase
(
ModuleStoreTestCase
):
class
GroupAccessTestCase
(
ModuleStoreTestCase
):
"""
"""
...
...
lms/djangoapps/courseware/tests/test_submitting_problems.py
View file @
1db84e79
...
@@ -316,7 +316,7 @@ class TestSubmittingProblems(ModuleStoreTestCase, LoginEnrollmentTestCase, Probl
...
@@ -316,7 +316,7 @@ class TestSubmittingProblems(ModuleStoreTestCase, LoginEnrollmentTestCase, Probl
return
[
s
.
earned
for
s
in
hw_section
[
'scores'
]]
return
[
s
.
earned
for
s
in
hw_section
[
'scores'
]]
@attr
(
'shard_
1
'
)
@attr
(
'shard_
3
'
)
class
TestCourseGrader
(
TestSubmittingProblems
):
class
TestCourseGrader
(
TestSubmittingProblems
):
"""
"""
Suite of tests for the course grader.
Suite of tests for the course grader.
...
...
lms/djangoapps/courseware/tests/test_views.py
View file @
1db84e79
...
@@ -184,7 +184,7 @@ class TestJumpTo(ModuleStoreTestCase):
...
@@ -184,7 +184,7 @@ class TestJumpTo(ModuleStoreTestCase):
self
.
assertEqual
(
response
.
status_code
,
404
)
self
.
assertEqual
(
response
.
status_code
,
404
)
@attr
(
'shard_
1
'
)
@attr
(
'shard_
2
'
)
@ddt.ddt
@ddt.ddt
class
ViewsTestCase
(
ModuleStoreTestCase
):
class
ViewsTestCase
(
ModuleStoreTestCase
):
"""
"""
...
...
lms/djangoapps/shoppingcart/tests/test_models.py
View file @
1db84e79
...
@@ -50,6 +50,11 @@ from opaque_keys.edx.locator import CourseLocator
...
@@ -50,6 +50,11 @@ from opaque_keys.edx.locator import CourseLocator
@attr
(
'shard_3'
)
@attr
(
'shard_3'
)
@ddt.ddt
@ddt.ddt
class
OrderTest
(
ModuleStoreTestCase
):
class
OrderTest
(
ModuleStoreTestCase
):
"""
Test shopping cart orders (e.g., cart contains various items,
order is taken through various pieces of cart state, etc.)
"""
def
setUp
(
self
):
def
setUp
(
self
):
super
(
OrderTest
,
self
)
.
setUp
()
super
(
OrderTest
,
self
)
.
setUp
()
...
...
lms/djangoapps/shoppingcart/tests/test_views.py
View file @
1db84e79
...
@@ -69,6 +69,10 @@ postpay_mock = Mock()
...
@@ -69,6 +69,10 @@ postpay_mock = Mock()
@patch.dict
(
'django.conf.settings.FEATURES'
,
{
'ENABLE_PAID_COURSE_REGISTRATION'
:
True
})
@patch.dict
(
'django.conf.settings.FEATURES'
,
{
'ENABLE_PAID_COURSE_REGISTRATION'
:
True
})
@ddt.ddt
@ddt.ddt
class
ShoppingCartViewsTests
(
SharedModuleStoreTestCase
,
XssTestMixin
):
class
ShoppingCartViewsTests
(
SharedModuleStoreTestCase
,
XssTestMixin
):
"""
Test shopping cart view under various states
"""
@classmethod
@classmethod
def
setUpClass
(
cls
):
def
setUpClass
(
cls
):
super
(
ShoppingCartViewsTests
,
cls
)
.
setUpClass
()
super
(
ShoppingCartViewsTests
,
cls
)
.
setUpClass
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment