diff --git a/apps/challenges/serializers.py b/apps/challenges/serializers.py index 850c16e3c1..3ce933c427 100644 --- a/apps/challenges/serializers.py +++ b/apps/challenges/serializers.py @@ -91,7 +91,8 @@ class Meta: "uses_ec2_worker", "ec2_storage", "evaluation_module_error", - "worker_image_url" + "worker_image_url", + "worker_instance_type" ) diff --git a/tests/unit/challenges/test_views.py b/tests/unit/challenges/test_views.py index 59fd0e182e..67a5ef0af5 100644 --- a/tests/unit/challenges/test_views.py +++ b/tests/unit/challenges/test_views.py @@ -192,6 +192,7 @@ def test_get_challenge(self): "evaluation_module_error": self.challenge.evaluation_module_error, "ec2_storage": self.challenge.ec2_storage, "worker_image_url": self.challenge.worker_image_url, + "worker_instance_type": self.challenge.worker_instance_type, } ] @@ -544,6 +545,7 @@ def test_get_particular_challenge(self): "evaluation_module_error": self.challenge.evaluation_module_error, "ec2_storage": self.challenge.ec2_storage, "worker_image_url": self.challenge.worker_image_url, + "worker_instance_type": self.challenge.worker_instance_type, } response = self.client.get(self.url, {}) self.assertEqual(response.data, expected) @@ -643,6 +645,7 @@ def test_update_challenge_when_user_is_its_creator(self): "evaluation_module_error": self.challenge.evaluation_module_error, "ec2_storage": self.challenge.ec2_storage, "worker_image_url": self.challenge.worker_image_url, + "worker_instance_type": self.challenge.worker_instance_type, } response = self.client.put( self.url, {"title": new_title, "description": new_description} @@ -768,6 +771,7 @@ def test_particular_challenge_partial_update(self): "evaluation_module_error": self.challenge.evaluation_module_error, "ec2_storage": self.challenge.ec2_storage, "worker_image_url": self.challenge.worker_image_url, + "worker_instance_type": self.challenge.worker_instance_type, } response = self.client.patch(self.url, self.partial_update_data) self.assertEqual(response.data, expected) @@ -842,6 +846,7 @@ def test_particular_challenge_update(self): "evaluation_module_error": self.challenge.evaluation_module_error, "ec2_storage": self.challenge.ec2_storage, "worker_image_url": self.challenge.worker_image_url, + "worker_instance_type": self.challenge.worker_instance_type, } response = self.client.put(self.url, self.data) self.assertEqual(response.data, expected) @@ -1432,6 +1437,7 @@ def test_get_past_challenges(self): "evaluation_module_error": self.challenge3.evaluation_module_error, "ec2_storage": self.challenge3.ec2_storage, "worker_image_url": self.challenge3.worker_image_url, + "worker_instance_type": self.challenge3.worker_instance_type, } ] response = self.client.get(self.url, {}, format="json") @@ -1512,6 +1518,7 @@ def test_get_present_challenges(self): "evaluation_module_error": self.challenge2.evaluation_module_error, "ec2_storage": self.challenge.ec2_storage, "worker_image_url": self.challenge.worker_image_url, + "worker_instance_type": self.challenge.worker_instance_type, } ] response = self.client.get(self.url, {}, format="json") @@ -1592,6 +1599,7 @@ def test_get_future_challenges(self): "evaluation_module_error": self.challenge4.evaluation_module_error, "ec2_storage": self.challenge4.ec2_storage, "worker_image_url": self.challenge4.worker_image_url, + "worker_instance_type": self.challenge4.worker_instance_type, } ] response = self.client.get(self.url, {}, format="json") @@ -1672,6 +1680,7 @@ def test_get_all_challenges(self): "evaluation_module_error": self.challenge3.evaluation_module_error, "ec2_storage": self.challenge3.ec2_storage, "worker_image_url": self.challenge3.worker_image_url, + "worker_instance_type": self.challenge3.worker_instance_type, }, { "id": self.challenge3.pk, @@ -1736,6 +1745,7 @@ def test_get_all_challenges(self): "evaluation_module_error": self.challenge3.evaluation_module_error, "ec2_storage": self.challenge3.ec2_storage, "worker_image_url": self.challenge3.worker_image_url, + "worker_instance_type": self.challenge3.worker_instance_type, }, { "id": self.challenge2.pk, @@ -1800,6 +1810,7 @@ def test_get_all_challenges(self): "evaluation_module_error": self.challenge2.evaluation_module_error, "ec2_storage": self.challenge2.ec2_storage, "worker_image_url": self.challenge2.worker_image_url, + "worker_instance_type": self.challenge2.worker_instance_type, }, ] response = self.client.get(self.url, {}, format="json") @@ -1935,6 +1946,7 @@ def test_get_featured_challenges(self): "evaluation_module_error": self.challenge3.evaluation_module_error, "ec2_storage": self.challenge3.ec2_storage, "worker_image_url": self.challenge3.worker_image_url, + "worker_instance_type": self.challenge3.worker_instance_type, } ] response = self.client.get(self.url, {}, format="json") @@ -2094,6 +2106,7 @@ def test_get_challenge_by_pk_when_user_is_challenge_host(self): "evaluation_module_error": self.challenge3.evaluation_module_error, "ec2_storage": self.challenge3.ec2_storage, "worker_image_url": self.challenge3.worker_image_url, + "worker_instance_type": self.challenge3.worker_instance_type, } response = self.client.get(self.url, {}) @@ -2182,6 +2195,7 @@ def test_get_challenge_by_pk_when_user_is_participant(self): "evaluation_module_error": self.challenge4.evaluation_module_error, "ec2_storage": self.challenge4.ec2_storage, "worker_image_url": self.challenge4.worker_image_url, + "worker_instance_type": self.challenge4.worker_instance_type, } self.client.force_authenticate(user=self.user1) @@ -2330,6 +2344,7 @@ def test_get_challenge_when_host_team_is_given(self): "evaluation_module_error": self.challenge2.evaluation_module_error, "ec2_storage": self.challenge2.ec2_storage, "worker_image_url": self.challenge2.worker_image_url, + "worker_instance_type": self.challenge2.worker_instance_type, } ] @@ -2406,6 +2421,7 @@ def test_get_challenge_when_participant_team_is_given(self): "evaluation_module_error": self.challenge2.evaluation_module_error, "ec2_storage": self.challenge2.ec2_storage, "worker_image_url": self.challenge2.worker_image_url, + "worker_instance_type": self.challenge2.worker_instance_type, } ] @@ -2482,6 +2498,7 @@ def test_get_challenge_when_mode_is_participant(self): "evaluation_module_error": self.challenge2.evaluation_module_error, "ec2_storage": self.challenge2.ec2_storage, "worker_image_url": self.challenge2.worker_image_url, + "worker_instance_type": self.challenge2.worker_instance_type, } ] @@ -2556,6 +2573,7 @@ def test_get_challenge_when_mode_is_host(self): "evaluation_module_error": self.challenge.evaluation_module_error, "ec2_storage": self.challenge.ec2_storage, "worker_image_url": self.challenge.worker_image_url, + "worker_instance_type": self.challenge.worker_instance_type, }, { "id": self.challenge2.pk, @@ -2620,6 +2638,7 @@ def test_get_challenge_when_mode_is_host(self): "evaluation_module_error": self.challenge2.evaluation_module_error, "ec2_storage": self.challenge2.ec2_storage, "worker_image_url": self.challenge2.worker_image_url, + "worker_instance_type": self.challenge2.worker_instance_type, }, ] diff --git a/tests/unit/participants/test_views.py b/tests/unit/participants/test_views.py index ac3e5ed460..53e9ecdaa6 100644 --- a/tests/unit/participants/test_views.py +++ b/tests/unit/participants/test_views.py @@ -881,6 +881,7 @@ def test_get_teams_and_corresponding_challenges_for_a_participant(self): "ec2_storage": self.challenge1.ec2_storage, "evaluation_module_error": self.challenge1.evaluation_module_error, "worker_image_url": self.challenge1.worker_image_url, + "worker_instance_type": self.challenge1.worker_instance_type, }, "participant_team": { "id": self.participant_team.id, @@ -972,6 +973,7 @@ def test_get_participant_team_challenge_list(self): "ec2_storage": self.challenge1.ec2_storage, "evaluation_module_error": self.challenge1.evaluation_module_error, "worker_image_url": self.challenge1.worker_image_url, + "worker_instance_type": self.challenge1.worker_instance_type, } ]