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
8de4bcaf
Commit
8de4bcaf
authored
Jun 27, 2014
by
Nimisha Asthagiri
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix modulestore merge conflict with heartbeat.
parent
6b50517b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 additions
and
7 deletions
+1
-7
common/djangoapps/heartbeat/tests/test_heartbeat.py
+0
-6
common/lib/xmodule/xmodule/modulestore/mixed.py
+1
-1
No files found.
common/djangoapps/heartbeat/tests/test_heartbeat.py
View file @
8de4bcaf
...
...
@@ -6,14 +6,8 @@ from django.core.urlresolvers import reverse
import
json
from
django.db.utils
import
DatabaseError
import
mock
from
django.test.utils
import
override_settings
from
django.conf
import
settings
from
django.test.testcases
import
TestCase
from
xmodule.modulestore.tests.django_utils
import
draft_mongo_store_config
TEST_MODULESTORE
=
draft_mongo_store_config
(
settings
.
TEST_ROOT
/
"data"
)
@override_settings
(
MODULESTORE
=
TEST_MODULESTORE
)
class
HeartbeatTestCase
(
TestCase
):
"""
Test the heartbeat
...
...
common/lib/xmodule/xmodule/modulestore/mixed.py
View file @
8de4bcaf
...
...
@@ -400,7 +400,7 @@ class MixedModuleStore(ModuleStoreWriteBase):
return
dict
(
itertools
.
chain
.
from_iterable
(
store
.
heartbeat
()
.
iteritems
()
for
store
in
self
.
modulestores
.
itervalues
()
for
store
in
self
.
modulestores
)
)
...
...
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