Revert "For now revert the changes to the test services to run once the integration tests"

This reverts commit ae09e68.

Author: slinkydeveloper

test-services/src/proxy.rs

@@ -46,7 +46,7 @@ pub(crate) trait Proxy {
     #[name = "call"]
     async fn call(req: Json<ProxyRequest>) -> HandlerResult<Json<Vec<u8>>>;
     #[name = "oneWayCall"]
-    async fn one_way_call(req: Json<ProxyRequest>) -> HandlerResult<()>;
+    async fn one_way_call(req: Json<ProxyRequest>) -> HandlerResult<String>;
     #[name = "manyCalls"]
     async fn many_calls(req: Json<Vec<ManyCallRequest>>) -> HandlerResult<()>;
 }
@@ -70,16 +70,19 @@ impl Proxy for ProxyImpl {
         &self,
         ctx: Context<'_>,
         Json(req): Json<ProxyRequest>,
-    ) -> HandlerResult<()> {
+    ) -> HandlerResult<String> {
         let request = ctx.request::<_, ()>(req.to_target(), req.message);
 
-        if let Some(delay_millis) = req.delay_millis {
-            request.send_after(Duration::from_millis(delay_millis));
+        let invocation_id = if let Some(delay_millis) = req.delay_millis {
+            request
+                .send_after(Duration::from_millis(delay_millis))
+                .invocation_id()
+                .await?
         } else {
-            request.send();
-        }
+            request.send().invocation_id().await?
+        };
 
-        Ok(())
+        Ok(invocation_id)
     }
 
     async fn many_calls(

test-services/src/test_utils_service.rs

@@ -62,6 +62,8 @@ pub(crate) trait TestUtilsService {
     async fn count_executed_side_effects(increments: u32) -> HandlerResult<u32>;
     #[name = "getEnvVariable"]
     async fn get_env_variable(env: String) -> HandlerResult<String>;
+    #[name = "cancelInvocation"]
+    async fn cancel_invocation(invocation_id: String) -> Result<(), TerminalError>;
     #[name = "interpretCommands"]
     async fn interpret_commands(req: Json<InterpretRequest>) -> HandlerResult<()>;
 }
@@ -155,6 +157,15 @@ impl TestUtilsService for TestUtilsServiceImpl {
         Ok(std::env::var(env).ok().unwrap_or_default())
     }
 
+    async fn cancel_invocation(
+        &self,
+        ctx: Context<'_>,
+        invocation_id: String,
+    ) -> Result<(), TerminalError> {
+        ctx.invocation_handle(invocation_id).cancel().await?;
+        Ok(())
+    }
+
     async fn interpret_commands(
         &self,
         context: Context<'_>,