Various improvements to test env

Author: slinkydeveloper

justfile

@@ -64,7 +64,7 @@ print-target:
     @echo {{ _resolved_target }}
 
 test: (_target-installed target)
-    cargo nextest run {{ _target-option }} --all-features
+    cargo nextest run {{ _target-option }} --all-features --workspace
 
 doctest:
     cargo test --doc

test-env/src/lib.rs

@@ -1,7 +1,4 @@
-use restate_sdk::{
-    errors::HandlerError,
-    prelude::{Endpoint, HttpServer},
-};
+use restate_sdk::prelude::{Endpoint, HttpServer};
 use serde::{Deserialize, Serialize};
 use std::time::Duration;
 use testcontainers::{
@@ -16,7 +13,7 @@ use tokio::{
 };
 use tracing::{error, info, warn};
 
-// addapted from from restate-admin-rest-model crate version 1.1.6
+// From restate-admin-rest-model
 #[derive(Serialize, Deserialize, Debug)]
 pub struct RegisterDeploymentRequestHttp {
     uri: String,
@@ -115,9 +112,8 @@ impl TestContainer {
     pub async fn start(mut self, endpoint: Endpoint) -> Result<TestContainer, anyhow::Error> {
         self.serve_endpoint(endpoint).await?;
         self.start_container().await?;
-        let registered = self.register_endpoint().await;
-        if registered.is_err() {
-            return Err(anyhow::anyhow!("Failed to register endpoint"));
+        if let Err(e) = self.register_endpoint().await {
+            return Err(anyhow::anyhow!("Failed to register endpoint: {e}"));
         }
 
         Ok(self)
@@ -254,7 +250,7 @@ impl TestContainer {
         Ok(())
     }
 
-    async fn register_endpoint(&mut self) -> Result<(), HandlerError> {
+    async fn register_endpoint(&mut self) -> Result<(), anyhow::Error> {
         info!(
             "registering endpoint server: {}",
             self.endpoint_server_url.as_ref().unwrap()
@@ -277,7 +273,7 @@ impl TestContainer {
             use_http_11: false,
             force: false,
             dry_run: false,
-        }; //, additional_headers: (), use_http_11: (), force: (), dry_run: () }
+        };
 
         let register_admin_url = format!("http://{}:{}/deployments", host, admin_port);
 

test-env/tests/test_container.rs

@@ -3,7 +3,6 @@ use restate_sdk::prelude::*;
 use restate_sdk_test_env::TestContainer;
 use tracing::info;
 
-// Should compile
 #[restate_sdk::service]
 trait MyService {
     async fn my_handler() -> HandlerResult<String>;
@@ -40,12 +39,12 @@ async fn test_container() {
 
     let endpoint = Endpoint::builder().bind(MyServiceImpl.serve()).build();
 
-    // simple test container intialization with default configuration
+    // simple test container initialization with default configuration
     //let test_container = TestContainer::default().start(endpoint).await.unwrap();
 
     // custom test container initialization with builder
     let test_container = TestContainer::builder()
-        // optional passthrough logging from the resstate server testcontainer
+        // optional passthrough logging from the restate server testcontainers
         // prints container logs to tracing::info level
         .with_container_logging()
         .with_container(
@@ -69,6 +68,8 @@ async fn test_container() {
         .await
         .unwrap();
 
+    dbg!(format!("{}/MyService/my_handler", ingress_url));
+
     assert_eq!(response.status(), StatusCode::OK);
 
     info!(