From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 21 Feb 2021 20:08:52 +0000 (+0000)
Subject: Shuffle dependecies for apitests and wdriver
X-Git-Tag: otter-0.4.0~398
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b84ce4fa5e692322175643f8c8226a7cc4dea15e;p=otter.git

Shuffle dependecies for apitests and wdriver

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/Cargo.lock.example b/Cargo.lock.example
index e6697e2a..ac9f2656 100644
--- a/Cargo.lock.example
+++ b/Cargo.lock.example
@@ -1701,7 +1701,6 @@ version = "0.0.1"
 dependencies = [
  "fehler",
  "humantime",
- "ndarray",
  "num-traits",
  "otter",
  "serde",
@@ -1756,10 +1755,9 @@ name = "otter-webdriver-tests"
 version = "0.0.1"
 dependencies = [
  "fehler",
- "humantime",
  "ndarray",
  "num-traits",
- "otter",
+ "otter-api-tests",
  "serde",
  "structopt",
  "strum",
diff --git a/apitest.rs b/apitest.rs
index 0dbe30b8..94a5ee1e 100644
--- a/apitest.rs
+++ b/apitest.rs
@@ -2,3 +2,9 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 // There is NO WARRANTY.
 
+pub mod imports {
+  pub use otter;
+  pub use otter::imports::*;
+
+  pub use humantime;
+}
diff --git a/apitest/Cargo.toml b/apitest/Cargo.toml
index 24756982..91fe1f83 100644
--- a/apitest/Cargo.toml
+++ b/apitest/Cargo.toml
@@ -14,7 +14,6 @@ edition = "2018"
 otter = { path = ".." }
 
 humantime = "2"
-ndarray = "0.14"
 
 # Repeated here because importing does not work properly
 fehler = "1"
diff --git a/wdriver.rs b/wdriver.rs
index 25ee4914..4abe4781 100644
--- a/wdriver.rs
+++ b/wdriver.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 // There is NO WARRANTY.
 
-pub use otter::imports::*;
+pub use otter_api_tests::imports::*;
 
 pub use anyhow::{anyhow, ensure, Context};
 pub use boolinator::Boolinator;
@@ -257,7 +257,7 @@ impl Substitutor for DirSubst {
 }
 
 mod cleanup_notify {
-  use otter::imports::*;
+  use otter_api_tests::imports::*;
   use anyhow::Context;
   use fehler::{throw, throws};
   use libc::_exit;
diff --git a/wdriver/Cargo.toml b/wdriver/Cargo.toml
index 7c2028f7..8850f1b5 100644
--- a/wdriver/Cargo.toml
+++ b/wdriver/Cargo.toml
@@ -11,9 +11,8 @@ version = "0.0.1"
 edition = "2018"
 
 [dependencies]
-otter = { path = ".." }
+otter-api-tests = { path = "../apitest" }
 
-humantime = "2"
 ndarray = "0.14"
 thirtyfour_sync = "0.22"
 x11rb = "0.8"