fix: fix test failures

Author: UsamaSadiq

pylintrc

@@ -275,7 +275,7 @@ disable =
 	unspecified-encoding,
 	unused-wildcard-import,
 	use-maxsplit-arg,
-	
+
 	logging-fstring-interpolation,
 
 [REPORTS]

setup.cfg

@@ -3,7 +3,7 @@ multi_line_output = 3
 line_length = 120
 
 [pycodestyle]
-exclude = ./.*,./docs/source/conf.py
+exclude = ./.*,./docs/source/conf.py,migrations
 max-line-length = 120
 
 [tool:pytest]

submissions/admin.py

@@ -171,7 +171,7 @@ class ExternalGraderDetailAdmin(admin.ModelAdmin):
         'id',
         'submission_info',
         'queue_name',
-        'queue_key', 
+        'queue_key',
         'status_badge',
         'num_failures',
         'status_time',
@@ -188,7 +188,7 @@ class ExternalGraderDetailAdmin(admin.ModelAdmin):
 
     search_fields = [
         'queue_name',
-        'queue_key' ,
+        'queue_key',
         'pullkey',
         'grader_file_name',
         'grader_reply',

submissions/api.py

@@ -50,7 +50,7 @@
 TOP_SUBMISSIONS_CACHE_TIMEOUT = 300
 
 
-def create_external_grader_detail(student_item_dict,
+def create_external_grader_detail(student_item_dict,  # pylint: disable=too-many-positional-arguments
                                   answer,
                                   queue_name: str,
                                   queue_key,

submissions/tests/test_api.py

@@ -879,7 +879,7 @@ def test_get_or_create_student_item_race_condition__item_not_created(self):
                     api._get_or_create_student_item(STUDENT_ITEM)  # pylint: disable=protected-access
 
     def test_create_external_grader_detail(self):
-        external_grader_detail_data = {'queue_name': 'test_queue'}
+        external_grader_detail_data = {'queue_name': 'test_queue', 'queue_key': 'test_key'}
         external_grader_detail = api.create_external_grader_detail(STUDENT_ITEM, ANSWER_ONE,
                                                                    **external_grader_detail_data)
 
@@ -890,11 +890,11 @@ def test_create_external_grader_detail(self):
         self.assertEqual(external_grader_detail.queue_name, 'test_queue')
 
     def test_create_multiple_external_grader_detail(self):
-        external_grader_detail_data1 = {'queue_name': 'test_queue'}
+        external_grader_detail_data1 = {'queue_name': 'test_queue', 'queue_key': 'test_key'}
         external_grader_detail1 = api.create_external_grader_detail(STUDENT_ITEM, ANSWER_ONE,
                                                                     **external_grader_detail_data1)
 
-        external_grader_detail_data2 = {'queue_name': 'test_queue'}
+        external_grader_detail_data2 = {'queue_name': 'test_queue', 'queue_key': 'test_key'}
         external_grader_detail2 = api.create_external_grader_detail(SECOND_STUDENT_ITEM, ANSWER_ONE,
                                                                     **external_grader_detail_data2)
 
@@ -917,13 +917,18 @@ def test_create_external_grader_detail_directly_database_error(self):
             mock_create.side_effect = DatabaseError("Database connection failed")
 
             with self.assertRaises(api.SubmissionInternalError):
-                api.create_external_grader_detail(STUDENT_ITEM, ANSWER_ONE, queue_name="test_queue")
+                api.create_external_grader_detail(
+                    STUDENT_ITEM, ANSWER_ONE, queue_name="test_queue", queue_key="test_key"
+                )
 
     def test_create_multiple_submission_external_grader_details(self):
-        external_grader_detail1 = api.create_external_grader_detail(STUDENT_ITEM, ANSWER_ONE, queue_name="shared_queue")
+        external_grader_detail1 = api.create_external_grader_detail(
+            STUDENT_ITEM, ANSWER_ONE, queue_name="shared_queue", queue_key="test_key"
+        )
 
-        external_grader_detail2 = api.create_external_grader_detail(SECOND_STUDENT_ITEM, ANSWER_TWO,
-                                                                    queue_name="shared_queue")
+        external_grader_detail2 = api.create_external_grader_detail(
+            SECOND_STUDENT_ITEM, ANSWER_TWO, queue_name="shared_queue", queue_key="test_key"
+        )
 
         submission1 = Submission.objects.get(uuid=external_grader_detail1.submission.uuid)
         self.assertEqual(external_grader_detail1.queue_name, 'shared_queue')
@@ -950,6 +955,7 @@ def __init__(self, file_content):
 
         event_data = {
             'queue_name': 'test_queue',
+            'queue_key': 'test_key',
             'files': {'test.txt': test_file}
         }
 
@@ -978,6 +984,7 @@ def __init__(self, filename, content):
 
         external_grader_detail = {
             'queue_name': 'test_queue',
+            'queue_key': 'test_key',
             'files': test_files
         }
         external_grader_detail = api.create_external_grader_detail(STUDENT_ITEM, ANSWER_ONE, **external_grader_detail)
@@ -988,7 +995,9 @@ def __init__(self, filename, content):
 
     def test_create_external_grader_detail_without_files(self):
         """Test creating a queue record without any files still works."""
-        external_grader_instance = api.create_external_grader_detail(STUDENT_ITEM, ANSWER_ONE, queue_name="test_queue")
+        external_grader_instance = api.create_external_grader_detail(
+            STUDENT_ITEM, ANSWER_ONE, queue_name="test_queue", queue_key="test_key"
+        )
         self.assertEqual(external_grader_instance.queue_name, 'test_queue')
         self.assertEqual(external_grader_instance.files.count(), 0)
 
@@ -1008,6 +1017,7 @@ def setUp(self):
         }
         self.answer = "test answer"
         self.queue_name = "test_queue"
+        self.queue_key = "test_key"
 
     def test_create_external_grader_with_files(self):
         """Test processing files within create_external_grader_detail."""
@@ -1024,6 +1034,7 @@ def __init__(self):
             student_item_dict=self.student_item_dict,
             answer=self.answer,
             queue_name=self.queue_name,
+            queue_key=self.queue_key,
             files=files_dict
         )
 
@@ -1046,6 +1057,7 @@ def __init__(self):
             student_item_dict=self.student_item_dict,
             answer=self.answer,
             queue_name=self.queue_name,
+            queue_key=self.queue_key,
             files={"test.txt": FileObjWithFileAttr()}
         )
 
@@ -1076,6 +1088,7 @@ def __init__(self):
             student_item_dict=self.student_item_dict,
             answer=self.answer,
             queue_name=self.queue_name,
+            queue_key=self.queue_key,
             files=files_dict
         )
 
@@ -1105,6 +1118,7 @@ def __init__(self):
             student_item_dict=self.student_item_dict,
             answer=self.answer,
             queue_name=self.queue_name,
+            queue_key=self.queue_key,
             files=files_dict
         )
 

submissions/views/xqueue.py

@@ -283,7 +283,8 @@ def put_result(self, request):
 
         try:
             log.info(
-                "Attempting to record score for submission %(submission_id)s (course=%(course_id)s, item=%(item_id)s, user=%(user_id)s)",
+                "Attempting to record score for submission %(submission_id)s "
+                "(course=%(course_id)s, item=%(item_id)s, user=%(user_id)s)",
                 submission_context
             )
             set_score(
@@ -314,13 +315,16 @@ def put_result(self, request):
                 )
             )
             log.info(
-                "External grader score event emitted for submission %(submission_id)s (course=%(course_id)s, item=%(item_id)s, user=%(user_id)s, queue=%(queue_name)s, queue_key=%(queue_key)s)",
+                "External grader score event emitted for submission %(submission_id)s "
+                "(course=%(course_id)s, item=%(item_id)s, user=%(user_id)s, "
+                "queue=%(queue_name)s, queue_key=%(queue_key)s)",
                 submission_context
             )
 
         except Exception:
             log.exception(
-                "Error recording score for submission %(submission_id)s (course=%(course_id)s, item=%(item_id)s, user=%(user_id)s, queue=%(queue_name)s)",
+                "Error recording score for submission %(submission_id)s "
+                "(course=%(course_id)s, item=%(item_id)s, user=%(user_id)s, queue=%(queue_name)s)",
                 submission_context
             )
             # Keep track of how many times we've failed to set_score a grade for this submission