Merge ~andersson123/autopkgtest-cloud:unit_test_duplicate_request into autopkgtest-cloud:master

[Tim Andersson]

[Brian Murray (brian-murray)]

There is a docstring which says """Valid distro request is accepted""" however, that isn't the test that is actually being run. Additionally, I think we should add a test for that case as the tests being added check if it is already queued or already running but not the opposite of both.

review: Needs Fixing

[Tim Andersson (andersson123)]

:facepalm: ugh sorry about the docstring.

Makes sense re the additional test, I'll amend.

[Tim Andersson (andersson123)]

I've added an additional test but having a weird issue with it which I'd like to discuss in standup.

[Brian Murray (brian-murray)]

Looks great, thanks!

review: Approve

diff --git a/charms/focal/autopkgtest-web/webcontrol/request/tests/test_submit.py b/charms/focal/autopkgtest-web/webcontrol/request/tests/test_submit.py
index 8d93d43..634d72d 100644
--- a/charms/focal/autopkgtest-web/webcontrol/request/tests/test_submit.py
+++ b/charms/focal/autopkgtest-web/webcontrol/request/tests/test_submit.py
@@ -10,7 +10,11 @@ from unittest.mock import MagicMock, patch
 
 import request.submit
 from distro_info import UbuntuDistroInfo
-from helpers.exceptions import WebControlException
+from helpers.exceptions import (
+    RequestInQueue,
+    RequestRunning,
+    WebControlException,
+)
 
 
 class SubmitTestBase(TestCase):
@@ -438,6 +442,46 @@ class DistroRequestValidationTests(SubmitTestBase):
         )
         self.assertEqual(mock_urlopen.call_count, 6)
 
+    @patch("request.submit.Submit.is_test_in_queue")
+    def test_already_queued(self, mock_is_test_in_queue):
+        """Test request is rejected if already queued"""
+
+        is_test_in_queue_cm = MagicMock()
+        is_test_in_queue_cm.__enter__.return_value = is_test_in_queue_cm
+        is_test_in_queue_cm.is_test_in_queue.side_effect = RequestInQueue(
+            "testy", "blue", "C51", "ab/1.2"
+        )
+        mock_is_test_in_queue.return_value = is_test_in_queue_cm
+
+        with self.assertRaises(WebControlException) as cme:
+            self.submit.validate_distro_request(
+                "testy", "C51", "blue", ["ab/1.2"], "joe"
+            )
+        self.assertEqual(
+            "Test already queued:\nrelease: testy\npkg: blue\narch: C51\ntriggers: ab/1.2",
+            str(cme.exception),
+        )
+
+    @patch("request.submit.Submit.is_test_running")
+    def test_already_running(self, mock_is_test_running):
+        """Test request is rejected if already running"""
+
+        is_test_running_cm = MagicMock()
+        is_test_running_cm.__enter__.return_value = is_test_running_cm
+        is_test_running_cm.is_test_running.side_effect = RequestRunning(
+            "testy", "blue", "C51", "ab/1.2"
+        )
+        mock_is_test_running.return_value = is_test_running_cm
+
+        with self.assertRaises(WebControlException) as cme:
+            self.submit.validate_distro_request(
+                "testy", "C51", "blue", ["ab/1.2"], "joe"
+            )
+        self.assertEqual(
+            "Test already running:\nrelease: testy\npkg: blue\narch: C51\ntriggers: ab/1.2",
+            str(cme.exception),
+        )
+
 
 class GitRequestValidationTests(SubmitTestBase):
     """Test verification of git branch test requests"""