foster/deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-03-03 17:34:47 -05:00
Code Issues Packages 1 Wiki Activity

chore(test): move testing utilities to test_util crate (#6360)

Browse source
This commit is contained in:
Bartek Iwańczuk 2020-06-18 17:54:55 +02:00 • committed by GitHub
parent a2969ecd27
commit 90c5dcfe79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 435 additions and 512 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Cargo.lock generated
View file

@ -474,6 +474,7 @@ dependencies = [
"sys-info", "sys-info",
"tempfile", "tempfile",
"termcolor", "termcolor",
"test_util",
"tokio", "tokio",
"tokio-rustls", "tokio-rustls",
"tokio-tungstenite", "tokio-tungstenite",
@ -2514,6 +2515,17 @@ version = "0.0.1"
dependencies = [ dependencies = [
"deno_core", "deno_core",
"futures 0.3.5", "futures 0.3.5",
"test_util",
]
[[package]]
name = "test_util"
version = "0.1.0"
dependencies = [
"lazy_static",
"os_pipe",
"regex",
"tempfile",
] ]
[[package]] [[package]]

3
Cargo.toml
View file

@ -4,7 +4,8 @@ members = [
"core", "core",
"tools/hyper_hello", "tools/hyper_hello",
"deno_typescript", "deno_typescript",
"test_plugin" "test_plugin",
"test_util",
] ]
exclude = [ exclude = [
"std/hash/_wasm" "std/hash/_wasm"

1
cli/Cargo.toml
View file

@ -74,6 +74,7 @@ nix = "0.17.0"
os_pipe = "0.9.2" os_pipe = "0.9.2"
# Used for testing inspector. Keep in-sync with warp. # Used for testing inspector. Keep in-sync with warp.
tokio-tungstenite = { version = "0.10.1", features = ["connect"] } tokio-tungstenite = { version = "0.10.1", features = ["connect"] }
test_util = { path = "../test_util" }
[target.'cfg(unix)'.dev-dependencies] [target.'cfg(unix)'.dev-dependencies]
pty = "0.2.2" pty = "0.2.2"

30
cli/file_fetcher.rs
View file

@ -810,7 +810,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test_get_source_code_1() { async fn test_get_source_code_1() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
let (temp_dir, fetcher) = test_setup(); let (temp_dir, fetcher) = test_setup();
let fetcher_1 = fetcher.clone(); let fetcher_1 = fetcher.clone();
let fetcher_2 = fetcher.clone(); let fetcher_2 = fetcher.clone();
@ -925,7 +925,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test_get_source_code_2() { async fn test_get_source_code_2() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
let (temp_dir, fetcher) = test_setup(); let (temp_dir, fetcher) = test_setup();
let module_url = let module_url =
Url::parse("http://localhost:4545/cli/tests/subdir/mismatch_ext.ts") Url::parse("http://localhost:4545/cli/tests/subdir/mismatch_ext.ts")
@ -1010,7 +1010,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test_get_source_code_multiple_downloads_of_same_file() { async fn test_get_source_code_multiple_downloads_of_same_file() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
let (_temp_dir, fetcher) = test_setup(); let (_temp_dir, fetcher) = test_setup();
let specifier = ModuleSpecifier::resolve_url( let specifier = ModuleSpecifier::resolve_url(
"http://localhost:4545/cli/tests/subdir/mismatch_ext.ts", "http://localhost:4545/cli/tests/subdir/mismatch_ext.ts",
@ -1056,7 +1056,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test_get_source_code_3() { async fn test_get_source_code_3() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
let (_temp_dir, fetcher) = test_setup(); let (_temp_dir, fetcher) = test_setup();
let redirect_module_url = Url::parse( let redirect_module_url = Url::parse(
@ -1110,7 +1110,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test_get_source_code_4() { async fn test_get_source_code_4() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
let (_temp_dir, fetcher) = test_setup(); let (_temp_dir, fetcher) = test_setup();
let double_redirect_url = Url::parse( let double_redirect_url = Url::parse(
"http://localhost:4548/cli/tests/subdir/redirects/redirect1.js", "http://localhost:4548/cli/tests/subdir/redirects/redirect1.js",
@ -1168,7 +1168,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test_get_source_code_5() { async fn test_get_source_code_5() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
let (_temp_dir, fetcher) = test_setup(); let (_temp_dir, fetcher) = test_setup();
let double_redirect_url = Url::parse( let double_redirect_url = Url::parse(
@ -1230,7 +1230,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test_get_source_code_6() { async fn test_get_source_code_6() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
let (_temp_dir, fetcher) = test_setup(); let (_temp_dir, fetcher) = test_setup();
let double_redirect_url = Url::parse( let double_redirect_url = Url::parse(
"http://localhost:4548/cli/tests/subdir/redirects/redirect1.js", "http://localhost:4548/cli/tests/subdir/redirects/redirect1.js",
@ -1272,7 +1272,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test_get_source_code_7() { async fn test_get_source_code_7() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
let (_temp_dir, fetcher) = test_setup(); let (_temp_dir, fetcher) = test_setup();
// Testing redirect with Location set to absolute url. // Testing redirect with Location set to absolute url.
@ -1327,7 +1327,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test_get_source_no_remote() { async fn test_get_source_no_remote() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
let (_temp_dir, fetcher) = test_setup(); let (_temp_dir, fetcher) = test_setup();
let module_url = let module_url =
Url::parse("http://localhost:4545/cli/tests/002_hello.ts").unwrap(); Url::parse("http://localhost:4545/cli/tests/002_hello.ts").unwrap();
@ -1351,7 +1351,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test_get_source_cached_only() { async fn test_get_source_cached_only() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
let (_temp_dir, fetcher) = test_setup(); let (_temp_dir, fetcher) = test_setup();
let fetcher_1 = fetcher.clone(); let fetcher_1 = fetcher.clone();
let fetcher_2 = fetcher.clone(); let fetcher_2 = fetcher.clone();
@ -1402,7 +1402,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test_fetch_source_0() { async fn test_fetch_source_0() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
let (_temp_dir, fetcher) = test_setup(); let (_temp_dir, fetcher) = test_setup();
let module_url = let module_url =
Url::parse("http://127.0.0.1:4545/cli/tests/subdir/mt_video_mp2t.t3.ts") Url::parse("http://127.0.0.1:4545/cli/tests/subdir/mt_video_mp2t.t3.ts")
@ -1443,7 +1443,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test_fetch_source_2() { async fn test_fetch_source_2() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
let (_temp_dir, fetcher) = test_setup(); let (_temp_dir, fetcher) = test_setup();
let fetcher_1 = fetcher.clone(); let fetcher_1 = fetcher.clone();
let fetcher_2 = fetcher.clone(); let fetcher_2 = fetcher.clone();
@ -1815,7 +1815,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test_fetch_with_etag() { async fn test_fetch_with_etag() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
let (_temp_dir, fetcher) = test_setup(); let (_temp_dir, fetcher) = test_setup();
let module_url = let module_url =
Url::parse("http://127.0.0.1:4545/etag_script.ts").unwrap(); Url::parse("http://127.0.0.1:4545/etag_script.ts").unwrap();
@ -1949,7 +1949,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test_fetch_with_types_header() { async fn test_fetch_with_types_header() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
let (_temp_dir, fetcher) = test_setup(); let (_temp_dir, fetcher) = test_setup();
let module_url = let module_url =
Url::parse("http://127.0.0.1:4545/xTypeScriptTypes.js").unwrap(); Url::parse("http://127.0.0.1:4545/xTypeScriptTypes.js").unwrap();
@ -1975,7 +1975,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test_fetch_with_types_reference() { async fn test_fetch_with_types_reference() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
let (_temp_dir, fetcher) = test_setup(); let (_temp_dir, fetcher) = test_setup();
let module_url = let module_url =
Url::parse("http://127.0.0.1:4545/referenceTypes.js").unwrap(); Url::parse("http://127.0.0.1:4545/referenceTypes.js").unwrap();

26
cli/http_util.rs
View file

@ -248,7 +248,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test_fetch_string() { async fn test_fetch_string() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
// Relies on external http server. See tools/http_server.py // Relies on external http server. See tools/http_server.py
let url = let url =
Url::parse("http://127.0.0.1:4545/cli/tests/fixture.json").unwrap(); Url::parse("http://127.0.0.1:4545/cli/tests/fixture.json").unwrap();
@ -267,7 +267,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test_fetch_gzip() { async fn test_fetch_gzip() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
// Relies on external http server. See tools/http_server.py // Relies on external http server. See tools/http_server.py
let url = Url::parse( let url = Url::parse(
"http://127.0.0.1:4545/cli/tests/053_import_compression/gziped", "http://127.0.0.1:4545/cli/tests/053_import_compression/gziped",
@ -291,7 +291,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test_fetch_with_etag() { async fn test_fetch_with_etag() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
let url = Url::parse("http://127.0.0.1:4545/etag_script.ts").unwrap(); let url = Url::parse("http://127.0.0.1:4545/etag_script.ts").unwrap();
let client = create_http_client(None).unwrap(); let client = create_http_client(None).unwrap();
let result = fetch_once(client.clone(), &url, None).await; let result = fetch_once(client.clone(), &url, None).await;
@ -316,7 +316,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test_fetch_brotli() { async fn test_fetch_brotli() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
// Relies on external http server. See tools/http_server.py // Relies on external http server. See tools/http_server.py
let url = Url::parse( let url = Url::parse(
"http://127.0.0.1:4545/cli/tests/053_import_compression/brotli", "http://127.0.0.1:4545/cli/tests/053_import_compression/brotli",
@ -341,7 +341,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test_fetch_once_with_redirect() { async fn test_fetch_once_with_redirect() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
// Relies on external http server. See tools/http_server.py // Relies on external http server. See tools/http_server.py
let url = let url =
Url::parse("http://127.0.0.1:4546/cli/tests/fixture.json").unwrap(); Url::parse("http://127.0.0.1:4546/cli/tests/fixture.json").unwrap();
@ -398,13 +398,13 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test_fetch_with_cafile_string() { async fn test_fetch_with_cafile_string() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
// Relies on external http server. See tools/http_server.py // Relies on external http server. See tools/http_server.py
let url = let url =
Url::parse("https://localhost:5545/cli/tests/fixture.json").unwrap(); Url::parse("https://localhost:5545/cli/tests/fixture.json").unwrap();
let client = create_http_client(Some(String::from( let client = create_http_client(Some(String::from(
crate::test_util::root_path() test_util::root_path()
.join("std/http/testdata/tls/RootCA.pem") .join("std/http/testdata/tls/RootCA.pem")
.to_str() .to_str()
.unwrap(), .unwrap(),
@ -424,14 +424,14 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test_fetch_with_cafile_gzip() { async fn test_fetch_with_cafile_gzip() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
// Relies on external http server. See tools/http_server.py // Relies on external http server. See tools/http_server.py
let url = Url::parse( let url = Url::parse(
"https://localhost:5545/cli/tests/053_import_compression/gziped", "https://localhost:5545/cli/tests/053_import_compression/gziped",
) )
.unwrap(); .unwrap();
let client = create_http_client(Some(String::from( let client = create_http_client(Some(String::from(
crate::test_util::root_path() test_util::root_path()
.join("std/http/testdata/tls/RootCA.pem") .join("std/http/testdata/tls/RootCA.pem")
.to_str() .to_str()
.unwrap(), .unwrap(),
@ -454,10 +454,10 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test_fetch_with_cafile_with_etag() { async fn test_fetch_with_cafile_with_etag() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
let url = Url::parse("https://localhost:5545/etag_script.ts").unwrap(); let url = Url::parse("https://localhost:5545/etag_script.ts").unwrap();
let client = create_http_client(Some(String::from( let client = create_http_client(Some(String::from(
crate::test_util::root_path() test_util::root_path()
.join("std/http/testdata/tls/RootCA.pem") .join("std/http/testdata/tls/RootCA.pem")
.to_str() .to_str()
.unwrap(), .unwrap(),
@ -486,14 +486,14 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test_fetch_with_cafile_brotli() { async fn test_fetch_with_cafile_brotli() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
// Relies on external http server. See tools/http_server.py // Relies on external http server. See tools/http_server.py
let url = Url::parse( let url = Url::parse(
"https://localhost:5545/cli/tests/053_import_compression/brotli", "https://localhost:5545/cli/tests/053_import_compression/brotli",
) )
.unwrap(); .unwrap();
let client = create_http_client(Some(String::from( let client = create_http_client(Some(String::from(
crate::test_util::root_path() test_util::root_path()
.join("std/http/testdata/tls/RootCA.pem") .join("std/http/testdata/tls/RootCA.pem")
.to_str() .to_str()
.unwrap(), .unwrap(),

1
cli/main.rs
View file

@ -58,7 +58,6 @@ mod startup_data;
pub mod state; pub mod state;
mod swc_util; mod swc_util;
mod test_runner; mod test_runner;
pub mod test_util;
mod tokio_util; mod tokio_util;
mod tsc; mod tsc;
mod upgrade; mod upgrade;

10
cli/module_graph.rs
View file

@ -564,7 +564,7 @@ mod tests {
#[ignore] #[ignore]
#[tokio::test] #[tokio::test]
async fn source_graph_fetch() { async fn source_graph_fetch() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
let module_specifier = ModuleSpecifier::resolve_url_or_path( let module_specifier = ModuleSpecifier::resolve_url_or_path(
"http://localhost:4545/cli/tests/019_media_types.ts", "http://localhost:4545/cli/tests/019_media_types.ts",
@ -657,7 +657,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn source_graph_type_references() { async fn source_graph_type_references() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
let module_specifier = ModuleSpecifier::resolve_url_or_path( let module_specifier = ModuleSpecifier::resolve_url_or_path(
"http://localhost:4545/cli/tests/type_definitions.ts", "http://localhost:4545/cli/tests/type_definitions.ts",
@ -715,7 +715,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn source_graph_type_references2() { async fn source_graph_type_references2() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
let module_specifier = ModuleSpecifier::resolve_url_or_path( let module_specifier = ModuleSpecifier::resolve_url_or_path(
"http://localhost:4545/cli/tests/type_directives_02.ts", "http://localhost:4545/cli/tests/type_directives_02.ts",
@ -764,7 +764,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn source_graph_type_references3() { async fn source_graph_type_references3() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
let module_specifier = ModuleSpecifier::resolve_url_or_path( let module_specifier = ModuleSpecifier::resolve_url_or_path(
"http://localhost:4545/cli/tests/type_directives_01.ts", "http://localhost:4545/cli/tests/type_directives_01.ts",
@ -807,7 +807,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn source_graph_different_langs() { async fn source_graph_different_langs() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
// ModuleGraphLoader was mistakenly parsing this file as TSX // ModuleGraphLoader was mistakenly parsing this file as TSX
// https://github.com/denoland/deno/issues/5867 // https://github.com/denoland/deno/issues/5867

1
cli/test_runner.rs
View file

@ -93,7 +93,6 @@ pub fn render_test_file(
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
use crate::test_util;
#[test] #[test]
fn test_prepare_test_modules_urls() { fn test_prepare_test_modules_urls() {

87
cli/test_util.rs
View file

@ -1,87 +0,0 @@
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
#![cfg(test)]
use std::path::PathBuf;
use std::process::Child;
use std::process::Command;
use std::process::Stdio;
use std::sync::Mutex;
use std::sync::MutexGuard;
lazy_static! {
static ref GUARD: Mutex<()> = Mutex::new(());
}
pub fn root_path() -> PathBuf {
PathBuf::from(concat!(env!("CARGO_MANIFEST_DIR"), "/.."))
}
pub fn tests_path() -> PathBuf {
root_path().join("cli").join("tests")
}
pub fn target_dir() -> PathBuf {
let current_exe = std::env::current_exe().unwrap();
let target_dir = current_exe.parent().unwrap().parent().unwrap();
println!("target_dir {}", target_dir.display());
target_dir.into()
}
pub fn deno_exe_path() -> PathBuf {
// Something like /Users/rld/src/deno/target/debug/deps/deno
let mut p = target_dir().join("deno");
if cfg!(windows) {
p.set_extension("exe");
}
p
}
pub struct HttpServerGuard<'a> {
#[allow(dead_code)]
g: MutexGuard<'a, ()>,
child: Child,
}
impl<'a> Drop for HttpServerGuard<'a> {
fn drop(&mut self) {
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),
}
}
}
/// Starts tools/http_server.py when the returned guard is dropped, the server
/// will be killed.
pub fn http_server<'a>() -> HttpServerGuard<'a> {
// TODO(bartlomieju) Allow tests to use the http server in parallel.
let g = GUARD.lock().unwrap();
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 lines = BufReader::new(stdout).lines();
// Wait for "ready" on stdout. See tools/http_server.py
for maybe_line in lines {
if let Ok(line) = maybe_line {
if line.starts_with("ready") {
break;
}
} else {
panic!(maybe_line.unwrap_err());
}
}
HttpServerGuard { child, g }
}

368
cli/tests/integration_tests.rs
View file

@ -1,12 +1,12 @@
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
#[macro_use]
extern crate lazy_static;
#[cfg(unix)] #[cfg(unix)]
extern crate nix; extern crate nix;
#[cfg(unix)] #[cfg(unix)]
extern crate pty; extern crate pty;
extern crate tempfile; extern crate tempfile;
use test_util as util;
use futures::prelude::*; use futures::prelude::*;
use std::io::{BufRead, Write}; use std::io::{BufRead, Write};
use std::process::Command; use std::process::Command;
@ -2956,367 +2956,3 @@ fn exec_path() {
let expected = std::fs::canonicalize(util::deno_exe_path()).unwrap(); let expected = std::fs::canonicalize(util::deno_exe_path()).unwrap();
assert_eq!(expected, actual); assert_eq!(expected, actual);
} }
mod util {
use os_pipe::pipe;
use regex::Regex;
use std::io::Read;
use std::io::Write;
use std::path::PathBuf;
use std::process::Child;
use std::process::Command;
use std::process::Output;
use std::process::Stdio;
use std::sync::Mutex;
use std::sync::MutexGuard;
use tempfile::TempDir;
pub const PERMISSION_VARIANTS: [&str; 5] =
["read", "write", "env", "net", "run"];
pub const PERMISSION_DENIED_PATTERN: &str = "PermissionDenied";
lazy_static! {
static ref DENO_DIR: TempDir = TempDir::new().expect("tempdir fail");
// STRIP_ANSI_RE and strip_ansi_codes are lifted from the "console" crate.
// Copyright 2017 Armin Ronacher <armin.ronacher@active-4.com>. MIT License.
static ref STRIP_ANSI_RE: Regex = Regex::new(
r"[\x1b\x9b][\[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-PRZcf-nqry=><]"
).unwrap();
static ref GUARD: Mutex<()> = Mutex::new(());
}
pub fn root_path() -> PathBuf {
PathBuf::from(concat!(env!("CARGO_MANIFEST_DIR"), "/.."))
}
pub fn tests_path() -> PathBuf {
root_path().join("cli").join("tests")
}
pub fn target_dir() -> PathBuf {
let current_exe = std::env::current_exe().unwrap();
let target_dir = current_exe.parent().unwrap().parent().unwrap();
println!("target_dir {}", target_dir.display());
target_dir.into()
}
pub fn deno_exe_path() -> PathBuf {
// Something like /Users/rld/src/deno/target/debug/deps/deno
let mut p = target_dir().join("deno");
if cfg!(windows) {
p.set_extension("exe");
}
p
}
pub struct HttpServerGuard<'a> {
#[allow(dead_code)]
g: MutexGuard<'a, ()>,
child: Child,
}
impl<'a> Drop for HttpServerGuard<'a> {
fn drop(&mut self) {
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),
}
}
}
/// Starts tools/http_server.py when the returned guard is dropped, the server
/// will be killed.
pub fn http_server<'a>() -> HttpServerGuard<'a> {
// TODO(bartlomieju) Allow tests to use the http server in parallel.
let g = GUARD.lock().unwrap();
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 lines = BufReader::new(stdout).lines();
// Wait for "ready" on stdout. See tools/http_server.py
for maybe_line in lines {
if let Ok(line) = maybe_line {
if line.starts_with("ready") {
break;
}
} else {
panic!(maybe_line.unwrap_err());
}
}
HttpServerGuard { child, g }
}
/// Helper function to strip ansi codes.
pub fn strip_ansi_codes(s: &str) -> std::borrow::Cow<str> {
STRIP_ANSI_RE.replace_all(s, "")
}
pub fn run_and_collect_output(
expect_success: bool,
args: &str,
input: Option<Vec<&str>>,
envs: Option<Vec<(String, String)>>,
need_http_server: bool,
) -> (String, String) {
let mut deno_process_builder = deno_cmd();
deno_process_builder
.args(args.split_whitespace())
.current_dir(&tests_path())
.stdin(Stdio::piped())
.stdout(Stdio::piped())
.stderr(Stdio::piped());
if let Some(envs) = envs {
deno_process_builder.envs(envs);
}
let http_guard = if need_http_server {
Some(http_server())
} else {
None
};
let mut deno = deno_process_builder
.spawn()
.expect("failed to spawn script");
if let Some(lines) = input {
let stdin = deno.stdin.as_mut().expect("failed to get stdin");
stdin
.write_all(lines.join("\n").as_bytes())
.expect("failed to write to stdin");
}
let Output {
stdout,
stderr,
status,
} = deno.wait_with_output().expect("failed to wait on child");
drop(http_guard);
let stdout = String::from_utf8(stdout).unwrap();
let stderr = String::from_utf8(stderr).unwrap();
if expect_success != status.success() {
eprintln!("stdout: <<<{}>>>", stdout);
eprintln!("stderr: <<<{}>>>", stderr);
panic!("Unexpected exit code: {:?}", status.code());
}
(stdout, stderr)
}
pub fn deno_cmd() -> Command {
let e = deno_exe_path();
assert!(e.exists());
let mut c = Command::new(e);
c.env("DENO_DIR", DENO_DIR.path());
c
}
pub fn run_python_script(script: &str) {
let output = Command::new("python")
.env("DENO_DIR", DENO_DIR.path())
.current_dir(root_path())
.arg(script)
.arg(format!("--build-dir={}", target_dir().display()))
.arg(format!("--executable={}", deno_exe_path().display()))
.output()
.expect("failed to spawn script");
if !output.status.success() {
let stdout = String::from_utf8(output.stdout).unwrap();
let stderr = String::from_utf8(output.stderr).unwrap();
panic!(
"{} executed with failing error code\n{}{}",
script, stdout, stderr
);
}
}
#[derive(Debug, Default)]
pub struct CheckOutputIntegrationTest {
pub args: &'static str,
pub output: &'static str,
pub input: Option<&'static str>,
pub output_str: Option<&'static str>,
pub exit_code: i32,
pub http_server: bool,
}
impl CheckOutputIntegrationTest {
pub fn run(&self) {
let args = self.args.split_whitespace();
let root = root_path();
let deno_exe = deno_exe_path();
println!("root path {}", root.display());
println!("deno_exe path {}", deno_exe.display());
let http_server_guard = if self.http_server {
Some(http_server())
} else {
None
};
let (mut reader, writer) = pipe().unwrap();
let tests_dir = root.join("cli").join("tests");
let mut command = deno_cmd();
println!("deno_exe args {}", self.args);
println!("deno_exe tests path {:?}", &tests_dir);
command.args(args);
command.current_dir(&tests_dir);
command.stdin(Stdio::piped());
let writer_clone = writer.try_clone().unwrap();
command.stderr(writer_clone);
command.stdout(writer);
let mut process = command.spawn().expect("failed to execute process");
if let Some(input) = self.input {
let mut p_stdin = process.stdin.take().unwrap();
write!(p_stdin, "{}", input).unwrap();
}
// Very important when using pipes: This parent process is still
// holding its copies of the write ends, and we have to close them
// before we read, otherwise the read end will never report EOF. The
// Command object owns the writers now, and dropping it closes them.
drop(command);
let mut actual = String::new();
reader.read_to_string(&mut actual).unwrap();
let status = process.wait().expect("failed to finish process");
let exit_code = status.code().unwrap();
drop(http_server_guard);
actual = strip_ansi_codes(&actual).to_string();
if self.exit_code != exit_code {
println!("OUTPUT\n{}\nOUTPUT", actual);
panic!(
"bad exit code, expected: {:?}, actual: {:?}",
self.exit_code, exit_code
);
}
let expected = if let Some(s) = self.output_str {
s.to_owned()
} else {
let output_path = tests_dir.join(self.output);
println!("output path {}", output_path.display());
std::fs::read_to_string(output_path).expect("cannot read output")
};
if !wildcard_match(&expected, &actual) {
println!("OUTPUT\n{}\nOUTPUT", actual);
println!("EXPECTED\n{}\nEXPECTED", expected);
panic!("pattern match failed");
}
}
}
fn wildcard_match(pattern: &str, s: &str) -> bool {
pattern_match(pattern, s, "[WILDCARD]")
}
pub fn pattern_match(pattern: &str, s: &str, wildcard: &str) -> bool {
// Normalize line endings
let mut s = s.replace("\r\n", "\n");
let pattern = pattern.replace("\r\n", "\n");
if pattern == wildcard {
return true;
}
let parts = pattern.split(wildcard).collect::<Vec<&str>>();
if parts.len() == 1 {
return pattern == s;
}
if !s.starts_with(parts[0]) {
return false;
}
// If the first line of the pattern is just a wildcard the newline character
// needs to be pre-pended so it can safely match anything or nothing and
// continue matching.
if pattern.lines().next() == Some(wildcard) {
s.insert_str(0, "\n");
}
let mut t = s.split_at(parts[0].len());
for (i, part) in parts.iter().enumerate() {
if i == 0 {
continue;
}
dbg!(part, i);
if i == parts.len() - 1 && (*part == "" || *part == "\n") {
dbg!("exit 1 true", i);
return true;
}
if let Some(found) = t.1.find(*part) {
dbg!("found ", found);
t = t.1.split_at(found + part.len());
} else {
dbg!("exit false ", i);
return false;
}
}
dbg!("end ", t.1.len());
t.1.is_empty()
}
#[test]
fn test_wildcard_match() {
let fixtures = vec![
("foobarbaz", "foobarbaz", true),
("[WILDCARD]", "foobarbaz", true),
("foobar", "foobarbaz", false),
("foo[WILDCARD]baz", "foobarbaz", true),
("foo[WILDCARD]baz", "foobazbar", false),
("foo[WILDCARD]baz[WILDCARD]qux", "foobarbazqatqux", true),
("foo[WILDCARD]", "foobar", true),
("foo[WILDCARD]baz[WILDCARD]", "foobarbazqat", true),
// check with different line endings
("foo[WILDCARD]\nbaz[WILDCARD]\n", "foobar\nbazqat\n", true),
(
"foo[WILDCARD]\nbaz[WILDCARD]\n",
"foobar\r\nbazqat\r\n",
true,
),
(
"foo[WILDCARD]\r\nbaz[WILDCARD]\n",
"foobar\nbazqat\r\n",
true,
),
(
"foo[WILDCARD]\r\nbaz[WILDCARD]\r\n",
"foobar\nbazqat\n",
true,
),
(
"foo[WILDCARD]\r\nbaz[WILDCARD]\r\n",
"foobar\r\nbazqat\r\n",
true,
),
];
// Iterate through the fixture lists, testing each one
for (pattern, string, expected) in fixtures {
let actual = wildcard_match(pattern, string);
dbg!(pattern, string, expected);
assert_eq!(actual, expected);
}
}
}

2
cli/worker.rs
View file

@ -394,7 +394,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn execute_006_url_imports() { async fn execute_006_url_imports() {
let http_server_guard = crate::test_util::http_server(); let http_server_guard = test_util::http_server();
let p = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")) let p = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"))
.parent() .parent()
.unwrap() .unwrap()

3
test_plugin/Cargo.toml
View file

@ -11,3 +11,6 @@ crate-type = ["cdylib"]
[dependencies] [dependencies]
futures = "0.3.5" futures = "0.3.5"
deno_core = { path = "../core" } deno_core = { path = "../core" }
[dev-dependencies]
test_util = { path = "../test_util" }

23
test_plugin/tests/integration_tests.rs
View file

@ -2,29 +2,8 @@
// cd test_plugin // cd test_plugin
// ../target/debug/deno run --unstable --allow-plugin tests/test.js debug // ../target/debug/deno run --unstable --allow-plugin tests/test.js debug
use std::path::PathBuf;
use std::process::Command; use std::process::Command;
use test_util::deno_cmd;
fn target_dir() -> PathBuf {
let current_exe = std::env::current_exe().unwrap();
let target_dir = current_exe.parent().unwrap().parent().unwrap();
println!("target_dir {}", target_dir.display());
target_dir.into()
}
fn deno_exe_path() -> PathBuf {
// Something like /Users/rld/src/deno/target/debug/deps/deno
let mut p = target_dir().join("deno");
if cfg!(windows) {
p.set_extension("exe");
}
p
}
fn deno_cmd() -> Command {
assert!(deno_exe_path().exists());
Command::new(deno_exe_path())
}
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
const BUILD_VARIANT: &str = "debug"; const BUILD_VARIANT: &str = "debug";

14
test_util/Cargo.toml Normal file
View file

@ -0,0 +1,14 @@
[package]
name = "test_util"
version = "0.1.0"
authors = ["the Deno authors"]
edition = "2018"
publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
lazy_static = "1.4.0"
os_pipe = "0.9.2"
regex = "1.3.9"
tempfile = "3.1.0"

366
test_util/src/lib.rs Normal file
View file

@ -0,0 +1,366 @@
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
#[macro_use]
extern crate lazy_static;
use os_pipe::pipe;
use regex::Regex;
use std::io::Read;
use std::io::Write;
use std::path::PathBuf;
use std::process::Child;
use std::process::Command;
use std::process::Output;
use std::process::Stdio;
use std::sync::Mutex;
use std::sync::MutexGuard;
use tempfile::TempDir;
pub const PERMISSION_VARIANTS: [&str; 5] =
["read", "write", "env", "net", "run"];
pub const PERMISSION_DENIED_PATTERN: &str = "PermissionDenied";
lazy_static! {
static ref DENO_DIR: TempDir = TempDir::new().expect("tempdir fail");
// STRIP_ANSI_RE and strip_ansi_codes are lifted from the "console" crate.
// Copyright 2017 Armin Ronacher <armin.ronacher@active-4.com>. MIT License.
static ref STRIP_ANSI_RE: Regex = Regex::new(
r"[\x1b\x9b][\[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-PRZcf-nqry=><]"
).unwrap();
static ref GUARD: Mutex<()> = Mutex::new(());
}
pub fn root_path() -> PathBuf {
PathBuf::from(concat!(env!("CARGO_MANIFEST_DIR"), "/.."))
}
pub fn tests_path() -> PathBuf {
root_path().join("cli").join("tests")
}
pub fn target_dir() -> PathBuf {
let current_exe = std::env::current_exe().unwrap();
let target_dir = current_exe.parent().unwrap().parent().unwrap();
println!("target_dir {}", target_dir.display());
target_dir.into()
}
pub fn deno_exe_path() -> PathBuf {
// Something like /Users/rld/src/deno/target/debug/deps/deno
let mut p = target_dir().join("deno");
if cfg!(windows) {
p.set_extension("exe");
}
p
}
pub struct HttpServerGuard<'a> {
#[allow(dead_code)]
g: MutexGuard<'a, ()>,
child: Child,
}
impl<'a> Drop for HttpServerGuard<'a> {
fn drop(&mut self) {
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),
}
}
}
/// Starts tools/http_server.py when the returned guard is dropped, the server
/// will be killed.
pub fn http_server<'a>() -> HttpServerGuard<'a> {
// TODO(bartlomieju) Allow tests to use the http server in parallel.
let g = GUARD.lock().unwrap();
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 lines = BufReader::new(stdout).lines();
// Wait for "ready" on stdout. See tools/http_server.py
for maybe_line in lines {
if let Ok(line) = maybe_line {
if line.starts_with("ready") {
break;
}
} else {
panic!(maybe_line.unwrap_err());
}
}
HttpServerGuard { child, g }
}
/// Helper function to strip ansi codes.
pub fn strip_ansi_codes(s: &str) -> std::borrow::Cow<str> {
STRIP_ANSI_RE.replace_all(s, "")
}
pub fn run_and_collect_output(
expect_success: bool,
args: &str,
input: Option<Vec<&str>>,
envs: Option<Vec<(String, String)>>,
need_http_server: bool,
) -> (String, String) {
let mut deno_process_builder = deno_cmd();
deno_process_builder
.args(args.split_whitespace())
.current_dir(&tests_path())
.stdin(Stdio::piped())
.stdout(Stdio::piped())
.stderr(Stdio::piped());
if let Some(envs) = envs {
deno_process_builder.envs(envs);
}
let http_guard = if need_http_server {
Some(http_server())
} else {
None
};
let mut deno = deno_process_builder
.spawn()
.expect("failed to spawn script");
if let Some(lines) = input {
let stdin = deno.stdin.as_mut().expect("failed to get stdin");
stdin
.write_all(lines.join("\n").as_bytes())
.expect("failed to write to stdin");
}
let Output {
stdout,
stderr,
status,
} = deno.wait_with_output().expect("failed to wait on child");
drop(http_guard);
let stdout = String::from_utf8(stdout).unwrap();
let stderr = String::from_utf8(stderr).unwrap();
if expect_success != status.success() {
eprintln!("stdout: <<<{}>>>", stdout);
eprintln!("stderr: <<<{}>>>", stderr);
panic!("Unexpected exit code: {:?}", status.code());
}
(stdout, stderr)
}
pub fn deno_cmd() -> Command {
let e = deno_exe_path();
assert!(e.exists());
let mut c = Command::new(e);
c.env("DENO_DIR", DENO_DIR.path());
c
}
pub fn run_python_script(script: &str) {
let output = Command::new("python")
.env("DENO_DIR", DENO_DIR.path())
.current_dir(root_path())
.arg(script)
.arg(format!("--build-dir={}", target_dir().display()))
.arg(format!("--executable={}", deno_exe_path().display()))
.output()
.expect("failed to spawn script");
if !output.status.success() {
let stdout = String::from_utf8(output.stdout).unwrap();
let stderr = String::from_utf8(output.stderr).unwrap();
panic!(
"{} executed with failing error code\n{}{}",
script, stdout, stderr
);
}
}
#[derive(Debug, Default)]
pub struct CheckOutputIntegrationTest {
pub args: &'static str,
pub output: &'static str,
pub input: Option<&'static str>,
pub output_str: Option<&'static str>,
pub exit_code: i32,
pub http_server: bool,
}
impl CheckOutputIntegrationTest {
pub fn run(&self) {
let args = self.args.split_whitespace();
let root = root_path();
let deno_exe = deno_exe_path();
println!("root path {}", root.display());
println!("deno_exe path {}", deno_exe.display());
let http_server_guard = if self.http_server {
Some(http_server())
} else {
None
};
let (mut reader, writer) = pipe().unwrap();
let tests_dir = root.join("cli").join("tests");
let mut command = deno_cmd();
println!("deno_exe args {}", self.args);
println!("deno_exe tests path {:?}", &tests_dir);
command.args(args);
command.current_dir(&tests_dir);
command.stdin(Stdio::piped());
let writer_clone = writer.try_clone().unwrap();
command.stderr(writer_clone);
command.stdout(writer);
let mut process = command.spawn().expect("failed to execute process");
if let Some(input) = self.input {
let mut p_stdin = process.stdin.take().unwrap();
write!(p_stdin, "{}", input).unwrap();
}
// Very important when using pipes: This parent process is still
// holding its copies of the write ends, and we have to close them
// before we read, otherwise the read end will never report EOF. The
// Command object owns the writers now, and dropping it closes them.
drop(command);
let mut actual = String::new();
reader.read_to_string(&mut actual).unwrap();
let status = process.wait().expect("failed to finish process");
let exit_code = status.code().unwrap();
drop(http_server_guard);
actual = strip_ansi_codes(&actual).to_string();
if self.exit_code != exit_code {
println!("OUTPUT\n{}\nOUTPUT", actual);
panic!(
"bad exit code, expected: {:?}, actual: {:?}",
self.exit_code, exit_code
);
}
let expected = if let Some(s) = self.output_str {
s.to_owned()
} else {
let output_path = tests_dir.join(self.output);
println!("output path {}", output_path.display());
std::fs::read_to_string(output_path).expect("cannot read output")
};
if !wildcard_match(&expected, &actual) {
println!("OUTPUT\n{}\nOUTPUT", actual);
println!("EXPECTED\n{}\nEXPECTED", expected);
panic!("pattern match failed");
}
}
}
fn wildcard_match(pattern: &str, s: &str) -> bool {
pattern_match(pattern, s, "[WILDCARD]")
}
pub fn pattern_match(pattern: &str, s: &str, wildcard: &str) -> bool {
// Normalize line endings
let mut s = s.replace("\r\n", "\n");
let pattern = pattern.replace("\r\n", "\n");
if pattern == wildcard {
return true;
}
let parts = pattern.split(wildcard).collect::<Vec<&str>>();
if parts.len() == 1 {
return pattern == s;
}
if !s.starts_with(parts[0]) {
return false;
}
// If the first line of the pattern is just a wildcard the newline character
// needs to be pre-pended so it can safely match anything or nothing and
// continue matching.
if pattern.lines().next() == Some(wildcard) {
s.insert_str(0, "\n");
}
let mut t = s.split_at(parts[0].len());
for (i, part) in parts.iter().enumerate() {
if i == 0 {
continue;
}
dbg!(part, i);
if i == parts.len() - 1 && (*part == "" || *part == "\n") {
dbg!("exit 1 true", i);
return true;
}
if let Some(found) = t.1.find(*part) {
dbg!("found ", found);
t = t.1.split_at(found + part.len());
} else {
dbg!("exit false ", i);
return false;
}
}
dbg!("end ", t.1.len());
t.1.is_empty()
}
#[test]
fn test_wildcard_match() {
let fixtures = vec![
("foobarbaz", "foobarbaz", true),
("[WILDCARD]", "foobarbaz", true),
("foobar", "foobarbaz", false),
("foo[WILDCARD]baz", "foobarbaz", true),
("foo[WILDCARD]baz", "foobazbar", false),
("foo[WILDCARD]baz[WILDCARD]qux", "foobarbazqatqux", true),
("foo[WILDCARD]", "foobar", true),
("foo[WILDCARD]baz[WILDCARD]", "foobarbazqat", true),
// check with different line endings
("foo[WILDCARD]\nbaz[WILDCARD]\n", "foobar\nbazqat\n", true),
(
"foo[WILDCARD]\nbaz[WILDCARD]\n",
"foobar\r\nbazqat\r\n",
true,
),
(
"foo[WILDCARD]\r\nbaz[WILDCARD]\n",
"foobar\nbazqat\r\n",
true,
),
(
"foo[WILDCARD]\r\nbaz[WILDCARD]\r\n",
"foobar\nbazqat\n",
true,
),
(
"foo[WILDCARD]\r\nbaz[WILDCARD]\r\n",
"foobar\r\nbazqat\r\n",
true,
),
];
// Iterate through the fixture lists, testing each one
for (pattern, string, expected) in fixtures {
let actual = wildcard_match(pattern, string);
dbg!(pattern, string, expected);
assert_eq!(actual, expected);
}
}