remove circular dependency between oxide and oxide-httpmock (#948)

oxidecomputer · Dec 18, 2024 · 4f3e008 · 4f3e008
1 parent f0011ca
commit 4f3e008
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,7 @@
 [workspace]
 members = [
 	"cli",
+	"integration-tests",
 	"sdk",
 	"sdk-httpmock",
 	"test-common",

diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "integration-tests"
+version = "0.0.0"
+edition = "2021"
+publish = false
+
+[dev-dependencies]
+httpmock = { workspace = true }
+oxide = { workspace = true }
+oxide-httpmock = { workspace = true }
+tempfile = { workspace = true }
+test-common = { workspace = true }
+tokio = { workspace = true }
+rand = { workspace = true, features = ["small_rng"] }
+uuid = { workspace = true }
diff --git a/integration-tests/src/lib.rs b/integration-tests/src/lib.rs
@@ -0,0 +1,8 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+// Copyright 2024 Oxide Computer Company
+
+//! This crate exists only for stand-alone integration tests that act as SDK
+//! consumers.
diff --git a/sdk/tests/test_extra.rs → integration-tests/tests/test_extras.rs b/sdk/tests/test_extra.rs → integration-tests/tests/test_extras.rs
diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
@@ -27,8 +27,6 @@ toml_edit = { workspace = true }
 uuid = { workspace = true }
 
 [dev-dependencies]
-httpmock = { workspace = true }
-oxide-httpmock = { workspace = true }
 tempfile = { workspace = true }
 test-common = { workspace = true }
 tokio = { workspace = true }