From dbfa6dafedd3b0f67341e73039d8ad16f04c7d68 Mon Sep 17 00:00:00 2001
From: Calen Pennington <cale@edx.org>
Date: Thu, 3 Sep 2015 16:59:12 -0400
Subject: [PATCH] Resolve conflicts in merge to master

---
 lms/djangoapps/lti_provider/tasks.py          |  7 +------
 .../lti_provider/tests/test_outcomes.py       | 20 ++-----------------
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/lms/djangoapps/lti_provider/tasks.py b/lms/djangoapps/lti_provider/tasks.py
index 210422e22a..4b774950c9 100644
--- a/lms/djangoapps/lti_provider/tasks.py
+++ b/lms/djangoapps/lti_provider/tasks.py
@@ -53,12 +53,7 @@ def score_changed_handler(sender, **kwargs):  # pylint: disable=unused-argument
         )
 
 
-<<<<<<< HEAD
-@CELERY_APP.task(name='lti_provider.tasks.send_outcome')
-def send_outcome(points_possible, points_earned, user_id, course_id, usage_id):
-=======
 def increment_assignment_versions(course_key, usage_key, user_id):
->>>>>>> edx/master
     """
     Update the version numbers for all assignments that are affected by a score
     change event. Returns a list of all affected assignments.
@@ -77,7 +72,7 @@ def increment_assignment_versions(course_key, usage_key, user_id):
     return assignments
 
 
-@CELERY_APP.task
+@CELERY_APP.task(name='lti_provider.tasks.send_composite_outcome')
 def send_composite_outcome(user_id, course_id, assignment_id, version):
     """
     Calculate and transmit the score for a composite module (such as a
diff --git a/lms/djangoapps/lti_provider/tests/test_outcomes.py b/lms/djangoapps/lti_provider/tests/test_outcomes.py
index 53582f7c42..e89e366d29 100644
--- a/lms/djangoapps/lti_provider/tests/test_outcomes.py
+++ b/lms/djangoapps/lti_provider/tests/test_outcomes.py
@@ -14,25 +14,10 @@ from student.tests.factories import UserFactory
 
 from lti_provider.models import GradedAssignment, LtiConsumer, OutcomeService
 import lti_provider.outcomes as outcomes
-<<<<<<< HEAD
-import lti_provider.tasks as tasks
-=======
-from opaque_keys.edx.locator import CourseLocator, BlockUsageLocator
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import ItemFactory, CourseFactory, check_mongo_calls
 
 
-def create_score(earned, possible):
-    """
-    Create a new mock Score object with specified earned and possible values
-    """
-    score = MagicMock()
-    score.possible = possible
-    score.earned = earned
-    return score
->>>>>>> edx/master
-
-
 class StoreOutcomeParametersTest(TestCase):
     """
     Tests for the store_outcome_parameters method in outcomes.py
@@ -310,7 +295,6 @@ class XmlHandlingTest(TestCase):
         self.assertFalse(outcomes.check_replace_result_response(response))
 
 
-<<<<<<< HEAD
 class TestBodyHashClient(unittest.TestCase):
     """
     Test our custom BodyHashClient
@@ -350,7 +334,8 @@ class TestBodyHashClient(unittest.TestCase):
         ]
         for oauth_header in expected_oauth_headers:
             self.assertIn(oauth_header, prepped_req.headers['Authorization'])
-=======
+
+
 class TestAssignmentsForProblem(ModuleStoreTestCase):
     """
     Test cases for the assignments_for_problem method in outcomes.py
@@ -471,4 +456,3 @@ class TestAssignmentsForProblem(ModuleStoreTestCase):
         self.assertEqual(assignments[1].lis_result_sourcedid, 'graded_unit2')
         self.assertEqual(assignments[0].outcome_service, self.outcome_service)
         self.assertEqual(assignments[1].outcome_service, other_outcome_service)
->>>>>>> edx/master