mirror of
https://github.com/denoland/deno.git
synced 2024-10-29 08:58:01 -04:00
Revert "tests: share http server between tests (#3336)"
This reverts commit dbf861f8a0
.
This commit is contained in:
parent
9ffebd68ed
commit
af448e864c
2 changed files with 47 additions and 44 deletions
|
@ -8,13 +8,11 @@ use std::path::PathBuf;
|
|||
use std::process::Child;
|
||||
use std::process::Command;
|
||||
use std::process::Stdio;
|
||||
use std::sync::atomic::AtomicUsize;
|
||||
use std::sync::atomic::Ordering;
|
||||
use std::sync::Mutex;
|
||||
use std::sync::MutexGuard;
|
||||
|
||||
lazy_static! {
|
||||
static ref SERVER: Mutex<Option<Child>> = Mutex::new(None);
|
||||
static ref SERVER_COUNT: AtomicUsize = AtomicUsize::new(0);
|
||||
static ref GUARD: Mutex<()> = Mutex::new(());
|
||||
}
|
||||
|
||||
pub fn root_path() -> PathBuf {
|
||||
|
@ -37,52 +35,45 @@ pub fn deno_exe_path() -> PathBuf {
|
|||
p
|
||||
}
|
||||
|
||||
pub struct HttpServerGuard {}
|
||||
pub struct HttpServerGuard<'a> {
|
||||
#[allow(dead_code)]
|
||||
g: MutexGuard<'a, ()>,
|
||||
child: Child,
|
||||
}
|
||||
|
||||
impl Drop for HttpServerGuard {
|
||||
impl<'a> Drop for HttpServerGuard<'a> {
|
||||
fn drop(&mut self) {
|
||||
let count = SERVER_COUNT.fetch_sub(1, Ordering::Relaxed);
|
||||
// If no more tests hold guard we can kill the server
|
||||
if count == 1 {
|
||||
kill_http_server();
|
||||
match self.child.try_wait() {
|
||||
Ok(None) => {
|
||||
self.child.kill().expect("failed to kill http_server.py");
|
||||
}
|
||||
Ok(Some(status)) => {
|
||||
panic!("http_server.py exited unexpectedly {}", status)
|
||||
}
|
||||
Err(e) => panic!("http_server.py err {}", e),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn kill_http_server() {
|
||||
let mut server_guard = SERVER.lock().unwrap();
|
||||
let mut child = server_guard
|
||||
.take()
|
||||
.expect("Trying to kill server but already killed");
|
||||
match child.try_wait() {
|
||||
Ok(None) => {
|
||||
child.kill().expect("failed to kill http_server.py");
|
||||
}
|
||||
Ok(Some(status)) => panic!("http_server.py exited unexpectedly {}", status),
|
||||
Err(e) => panic!("http_server.py err {}", e),
|
||||
};
|
||||
}
|
||||
/// Starts tools/http_server.py when the returned guard is dropped, the server
|
||||
/// will be killed.
|
||||
pub fn http_server<'a>() -> HttpServerGuard<'a> {
|
||||
// TODO(ry) Allow tests to use the http server in parallel.
|
||||
let g = GUARD.lock().unwrap();
|
||||
|
||||
pub fn http_server() -> HttpServerGuard {
|
||||
SERVER_COUNT.fetch_add(1, Ordering::Relaxed);
|
||||
{
|
||||
let mut server_guard = SERVER.lock().unwrap();
|
||||
if server_guard.is_none() {
|
||||
println!("tools/http_server.py starting...");
|
||||
let mut child = Command::new("python")
|
||||
.current_dir(root_path())
|
||||
.args(&["-u", "tools/http_server.py"])
|
||||
.stdout(Stdio::piped())
|
||||
.spawn()
|
||||
.expect("failed to execute child");
|
||||
println!("tools/http_server.py starting...");
|
||||
let mut child = Command::new("python")
|
||||
.current_dir(root_path())
|
||||
.args(&["-u", "tools/http_server.py"])
|
||||
.stdout(Stdio::piped())
|
||||
.spawn()
|
||||
.expect("failed to execute child");
|
||||
|
||||
let stdout = child.stdout.as_mut().unwrap();
|
||||
use std::io::{BufRead, BufReader};
|
||||
let mut lines = BufReader::new(stdout).lines();
|
||||
let line = lines.next().unwrap().unwrap();
|
||||
assert!(line.starts_with("ready"));
|
||||
server_guard.replace(child);
|
||||
}
|
||||
}
|
||||
HttpServerGuard {}
|
||||
let stdout = child.stdout.as_mut().unwrap();
|
||||
use std::io::{BufRead, BufReader};
|
||||
let mut lines = BufReader::new(stdout).lines();
|
||||
let line = lines.next().unwrap().unwrap();
|
||||
assert!(line.starts_with("ready"));
|
||||
|
||||
HttpServerGuard { child, g }
|
||||
}
|
||||
|
|
|
@ -156,11 +156,13 @@ itest!(_018_async_catch {
|
|||
output: "018_async_catch.ts.out",
|
||||
});
|
||||
|
||||
/* TODO(ry) Re-enable this test. It is flaky and only fails occasionally.
|
||||
itest!(_019_media_types {
|
||||
args: "run --reload 019_media_types.ts",
|
||||
output: "019_media_types.ts.out",
|
||||
http_server: true,
|
||||
});
|
||||
*/
|
||||
|
||||
itest!(_020_json_modules {
|
||||
args: "run --reload 020_json_modules.ts",
|
||||
|
@ -172,11 +174,13 @@ itest!(_021_mjs_modules {
|
|||
output: "021_mjs_modules.ts.out",
|
||||
});
|
||||
|
||||
/* TODO(ry) Re-enable this test. It is flaky and only fails occasionally.
|
||||
itest!(_022_info_flag_script {
|
||||
args: "info http://127.0.0.1:4545/cli/tests/019_media_types.ts",
|
||||
output: "022_info_flag_script.out",
|
||||
http_server: true,
|
||||
});
|
||||
*/
|
||||
|
||||
itest!(_023_no_ext_with_headers {
|
||||
args: "run --reload 023_no_ext_with_headers",
|
||||
|
@ -331,17 +335,21 @@ itest!(_047_jsx {
|
|||
output: "047_jsx_test.jsx.out",
|
||||
});
|
||||
|
||||
/* TODO(ry) Re-enable this test. It is flaky and only fails occasionally.
|
||||
itest!(_048_media_types_jsx {
|
||||
args: "run --reload 048_media_types_jsx.ts",
|
||||
output: "048_media_types_jsx.ts.out",
|
||||
http_server: true,
|
||||
});
|
||||
*/
|
||||
|
||||
/* TODO(ry) Re-enable this test. It is flaky and only fails occasionally.
|
||||
itest!(_049_info_flag_script_jsx {
|
||||
args: "info http://127.0.0.1:4545/cli/tests/048_media_types_jsx.ts",
|
||||
output: "049_info_flag_script_jsx.out",
|
||||
http_server: true,
|
||||
});
|
||||
*/
|
||||
|
||||
itest!(_050_more_jsons {
|
||||
args: "run --reload 050_more_jsons.ts",
|
||||
|
@ -354,11 +362,13 @@ itest!(lock_check_ok {
|
|||
http_server: true,
|
||||
});
|
||||
|
||||
/* TODO(ry) Re-enable this test. It is flaky and only fails occasionally.
|
||||
itest!(lock_check_ok2 {
|
||||
args: "run 019_media_types.ts --lock=lock_check_ok2.json",
|
||||
output: "019_media_types.ts.out",
|
||||
http_server: true,
|
||||
});
|
||||
*/
|
||||
|
||||
itest!(lock_check_err {
|
||||
args: "run --lock=lock_check_err.json http://127.0.0.1:4545/cli/tests/003_relative_import.ts",
|
||||
|
@ -368,6 +378,7 @@ itest!(lock_check_err {
|
|||
http_server: true,
|
||||
});
|
||||
|
||||
/* TODO(ry) Re-enable this test. It is flaky and only fails occasionally.
|
||||
itest!(lock_check_err2 {
|
||||
args: "run 019_media_types.ts --lock=lock_check_err2.json",
|
||||
output: "lock_check_err2.out",
|
||||
|
@ -375,6 +386,7 @@ itest!(lock_check_err2 {
|
|||
exit_code: 10,
|
||||
http_server: true,
|
||||
});
|
||||
*/
|
||||
|
||||
itest!(async_error {
|
||||
exit_code: 1,
|
||||
|
|
Loading…
Reference in a new issue