fix: make test (shuttle-hq#858)

* fix: `make test` * fix: update api-key
ankitpatel96 · May 5, 2023 · 05472fc · 05472fc
1 parent a4bf52f
commit 05472fc
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 29 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -256,7 +256,7 @@ cargo test --package <crate-name> --all-features --test '*' -- --nocapture
 To run the end-to-end tests, from the root of the repository run:
 
 ```bash
-make test
+USE_PANAMAX=disable make test
 ```
 
 > Note: Running all the end-to-end tests may take a long time, so it is recommended to run individual tests shipped as part of each crate in the workspace first.

diff --git a/e2e/tests/integration/helpers/mod.rs b/e2e/tests/integration/helpers/mod.rs
@@ -38,27 +38,27 @@ impl TempCargoHome {
                 write!(
                     config,
                     r#"[patch.crates-io]
-shuttle-service = { path = "{}" }
-shuttle-runtime = { path = "{}" }
-
-shuttle-aws-rds = { path = "{}" }
-shuttle-persist = { path = "{}" }
-shuttle-shared-db = { path = "{}" }
-shuttle-secrets = { path = "{}" }
-shuttle-static-folder = { path = "{}" }
-
-shuttle-axum = { path = "{}" }
-shuttle-actix-web = { path = "{}" }
-shuttle-next = { path = "{}" }
-shuttle-poem = { path = "{}" }
-shuttle-poise = { path = "{}" }
-shuttle-rocket = { path = "{}" }
-shuttle-salvo = { path = "{}" }
-shuttle-serenity = { path = "{}" }
-shuttle-thruster = { path = "{}" }
-shuttle-tide = { path = "{}" }
-shuttle-tower = { path = "{}" }
-shuttle-warp = { path = "{}" }"#,
+shuttle-service = {{ path = "{}" }}
+shuttle-runtime = {{ path = "{}" }}
+
+shuttle-aws-rds = {{ path = "{}" }}
+shuttle-persist = {{ path = "{}" }}
+shuttle-shared-db = {{ path = "{}" }}
+shuttle-secrets = {{ path = "{}" }}
+shuttle-static-folder = {{ path = "{}" }}
+
+shuttle-axum = {{ path = "{}" }}
+shuttle-actix-web = {{ path = "{}" }}
+shuttle-next = {{ path = "{}" }}
+shuttle-poem = {{ path = "{}" }}
+shuttle-poise = {{ path = "{}" }}
+shuttle-rocket = {{ path = "{}" }}
+shuttle-salvo = {{ path = "{}" }}
+shuttle-serenity = {{ path = "{}" }}
+shuttle-thruster = {{ path = "{}" }}
+shuttle-tide = {{ path = "{}" }}
+shuttle-tower = {{ path = "{}" }}
+shuttle-warp = {{ path = "{}" }}"#,
                     WORKSPACE_ROOT.join("service").display(),
                     WORKSPACE_ROOT.join("runtime").display(),
                     WORKSPACE_ROOT.join("resources").join("aws-rds").display(),
@@ -181,7 +181,7 @@ CARGO_HOME: {}
         let admin_key = if let Ok(key) = env::var("SHUTTLE_API_KEY") {
             key
         } else {
-            "e2e-test-key".to_string()
+            "dh9z58jttoes3qvt".to_string()
         };
 
         _ = Command::new(DOCKER.as_os_str())
@@ -192,9 +192,9 @@ CARGO_HOME: {}
                 "--project-name",
                 "shuttle-dev",
                 "exec",
-                "gateway",
+                "auth",
                 "/usr/local/bin/service",
-                "--state=/var/lib/shuttle",
+                "--state=/var/lib/shuttle-auth",
                 "init",
                 "--name",
                 "test",
@@ -415,7 +415,7 @@ impl Services {
             let mut run = Command::new(WORKSPACE_ROOT.join("target/debug/cargo-shuttle"));
 
             if env::var("SHUTTLE_API_KEY").is_err() {
-                run.env("SHUTTLE_API_KEY", "e2e-test-key");
+                run.env("SHUTTLE_API_KEY", "dh9z58jttoes3qvt");
             }
 
             run.env("CARGO_HOME", CARGO_HOME.path());
@@ -444,7 +444,7 @@ impl Services {
         let mut run = Command::new(WORKSPACE_ROOT.join("target/debug/cargo-shuttle"));
 
         if env::var("SHUTTLE_API_KEY").is_err() {
-            run.env("SHUTTLE_API_KEY", "e2e-test-key");
+            run.env("SHUTTLE_API_KEY", "dh9z58jttoes3qvt");
         }
 
         run.env("CARGO_HOME", CARGO_HOME.path());
@@ -455,7 +455,7 @@ impl Services {
 
     /// Starts a project and deploys a service for the example in `self.example_path`
     pub fn deploy(&self) {
-        self.run_client(["project", "new"])
+        self.run_client(["project", "start"])
             .wait()
             .ensure_success("failed to run deploy");
 
@@ -484,6 +484,6 @@ impl Services {
 impl Drop for Services {
     fn drop(&mut self) {
         // Initiate project destruction on test completion
-        _ = self.run_client(["project", "rm"]).wait();
+        _ = self.run_client(["project", "stop"]).wait();
     }
 }