Test that service configs are found in all places they should be

Service config for qubes.Service+arg should also be checked for in the
location for qubes.Service.  Add a test for that.

Author: DemiMarie

qrexec/tests/socket/agent.py

@@ -408,6 +408,10 @@ def test_exec_service_with_config(self):
         self.check_dom0(dom0)
 
     def test_wait_for_session(self):
+        self._test_wait_for_session("qubes.Service+arg")
+    def test_wait_for_session_config_in_location_sans_argument(self):
+        self._test_wait_for_session("qubes.Service")
+    def _test_wait_for_session(self, config_name):
         log = os.path.join(self.tempdir, "wait-for-session.log")
         util.make_executable_service(
             self.tempdir,
@@ -438,7 +442,7 @@ def test_wait_for_session(self):
         assert "'" not in user
         assert "\n" not in user
         with open(
-            os.path.join(self.tempdir, "rpc-config", "qubes.Service+arg"), "w"
+            os.path.join(self.tempdir, "rpc-config", config_name), "w"
         ) as f:
             f.write(f"""\