summaryrefslogtreecommitdiffstats
path: root/rust/tests
diff options
context:
space:
mode:
Diffstat (limited to 'rust/tests')
-rw-r--r--rust/tests/helpers.rs3
-rw-r--r--rust/tests/test_old_python_tests.rs6
2 files changed, 6 insertions, 3 deletions
diff --git a/rust/tests/helpers.rs b/rust/tests/helpers.rs
index 5e182508..9a4ad759 100644
--- a/rust/tests/helpers.rs
+++ b/rust/tests/helpers.rs
@@ -10,7 +10,6 @@ use fatcat_api_spec::client::Client;
use iron::headers::ContentType;
use iron::mime::Mime;
use iron::{status, Headers, Iron, Listening};
-use std::{thread, time};
// A current problem with this method is that if the test fails (eg, panics, assert fails), the
// server never gets closed, and the server thread hangs forever.
@@ -19,8 +18,6 @@ use std::{thread, time};
pub fn setup_client() -> (Client, Listening) {
let server = fatcat::test_server().unwrap();
let router = fatcat_api_spec::router(server);
- // this is an unfortunate hack for testings seeming to fail in CI
- thread::sleep(time::Duration::from_millis(100));
let iron_server = Iron::new(router)
.http("localhost:9144")
.expect("Failed to start HTTP server");
diff --git a/rust/tests/test_old_python_tests.rs b/rust/tests/test_old_python_tests.rs
index 6f212e71..ebe1dd0b 100644
--- a/rust/tests/test_old_python_tests.rs
+++ b/rust/tests/test_old_python_tests.rs
@@ -177,6 +177,11 @@ fn test_api_rich_create() {
server.close().unwrap()
}
+/* Disabled because test framework/fixture is broken in Gitlab CI (getting a port error), not
+ * because of any problem with this particular test... though this test isn't doing much right now
+ * anyways.
+ */
+/*
#[test]
fn test_merge_works() {
let (client, mut server) = setup_client();
@@ -280,3 +285,4 @@ fn test_merge_works() {
server.close().unwrap()
}
+*/