fix: fix unit test failures

Author: UsamaSadiq

submissions/tests/test_admin.py

@@ -233,7 +233,7 @@ def test_get_readonly_fields_new_object(self):
         readonly_fields = self.admin.get_readonly_fields(request, None)
 
         # Should only include default readonly fields
-        expected_readonly = ['submission', 'pullkey', 'status_time', 'created_at']
+        expected_readonly = ['submission', 'pullkey', 'queue_key', 'status_time', 'created_at']
         self.assertEqual(readonly_fields, expected_readonly)
 
     def test_has_change_permission(self):

submissions/tests/test_viewsets.py

@@ -21,7 +21,7 @@
 from submissions.permissions import IsXQueueUser
 from submissions.tests.factories import ExternalGraderDetailFactory, SubmissionFactory
 from submissions.views.xqueue import XQueueViewSet
-
+from submissions.views.xqueue import MAX_SCORE_UPDATE_RETRIES
 User = get_user_model()
 
 
@@ -256,17 +256,21 @@ def test_put_result_set_score_failure(self):
         self.assertEqual(self.external_grader.num_failures, 1)
         self.assertEqual(self.external_grader.status, 'retry')
 
-    def test_put_result_set_score_fail_30_times(self):
+    def test_put_result_set_score_fail_multiple_times(self):
         """
-        Test put_result handling when set_score by intentionally failing 30 times.
+        Test put_result handling when set_score by intentionally failing multiple times.
         """
         self.client.login(username='testuser', password='testpass')
         response = self.client.post(self.url_status)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
-        for each in range(31):
+        for each in range(MAX_SCORE_UPDATE_RETRIES+1):
             with patch('submissions.views.xqueue.set_score') as mock_set_score:
                 mock_set_score.side_effect = Exception('Test error')  # Make it actually fail
+                # Ensure the external grader is in the right state for pulling
+                # If it's failed, we need to reset it to pending first, then to pulled
+                if self.external_grader.status == 'failed':
+                    self.external_grader.update_status('pending')
                 self.external_grader.update_status('pulled')
                 payload = {
                     'xqueue_header': json.dumps({
@@ -309,9 +313,17 @@ def test_put_result_success(self, mock_log):
             mock_set_score.return_value = True
             response = self.client.post(self.url_put_result, payload, format='json')
 
+        submission_context = {
+                'submission_id': self.submission.id,
+                'course_id': self.submission.student_item.course_id,
+                'user_id': self.submission.student_item.student_id,
+                'item_id': self.submission.student_item.item_id,
+                'queue_name': self.external_grader.queue_name,
+                'queue_key': self.external_grader.queue_key,
+            }
         mock_log.info.assert_any_call(
-            "Successfully updated submission score for submission %s",
-            self.submission.id
+            "Successfully updated submission %(submission_id)s for user %(user_id)s",
+            submission_context
         )
 
         response_data = json.loads(response.content)
@@ -470,7 +482,6 @@ def test_get_submission_value_error(self, mock_get_files):
 
         response = self.client.get(self.get_submission_url, {'queue_name': queue_name})
 
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+        self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
         self.assertEqual(response.data['return_code'], 1)
-        self.assertIn("Error processing submission", response.data['content'])
-        self.assertIn("File processing error", response.data['content'])
+        self.assertIn("Unable to serialize submission payload", response.data['content'])