summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cli/tests/019_media_types.ts.out2
-rw-r--r--cli/tests/022_info_flag_script.out2
-rw-r--r--cli/tests/035_cached_only_flag.out2
-rw-r--r--cli/tests/048_media_types_jsx.ts.out1
-rw-r--r--cli/tests/049_info_flag_script_jsx.out2
-rw-r--r--cli/tests/052_no_remote_flag.out2
-rw-r--r--cli/tests/integration_tests.rs30
-rw-r--r--cli/tests/lock_check_err2.json13
-rw-r--r--cli/tests/lock_check_ok2.json10
9 files changed, 29 insertions, 35 deletions
diff --git a/cli/tests/019_media_types.ts.out b/cli/tests/019_media_types.ts.out
index 7b5fdd44f..b3e94678c 100644
--- a/cli/tests/019_media_types.ts.out
+++ b/cli/tests/019_media_types.ts.out
@@ -1 +1 @@
-success true true true true true true true true
+[WILDCARD]success true true true true true true true true
diff --git a/cli/tests/022_info_flag_script.out b/cli/tests/022_info_flag_script.out
index 14580839e..d17f31d77 100644
--- a/cli/tests/022_info_flag_script.out
+++ b/cli/tests/022_info_flag_script.out
@@ -1,7 +1,7 @@
+[WILDCARD]
local: [WILDCARD]http[WILDCARD]127.0.0.1_PORT4545[WILDCARD]
type: TypeScript
compiled: [WILDCARD].js
-map: [WILDCARD].js.map
deps:
http://127.0.0.1:4545/cli/tests/019_media_types.ts
├── http://localhost:4545/cli/tests/subdir/mt_text_typescript.t1.ts
diff --git a/cli/tests/035_cached_only_flag.out b/cli/tests/035_cached_only_flag.out
index 1c63a86b0..97de547e0 100644
--- a/cli/tests/035_cached_only_flag.out
+++ b/cli/tests/035_cached_only_flag.out
@@ -1 +1 @@
-Cannot find module "http://127.0.0.1:4545/cli/tests/019_media_types.ts" in cache, --cached-only is specified
+error: Cannot find module "http://127.0.0.1:4545/cli/tests/019_media_types.ts" in cache, --cached-only is specified
diff --git a/cli/tests/048_media_types_jsx.ts.out b/cli/tests/048_media_types_jsx.ts.out
index 7b5fdd44f..266cc5741 100644
--- a/cli/tests/048_media_types_jsx.ts.out
+++ b/cli/tests/048_media_types_jsx.ts.out
@@ -1 +1,2 @@
+[WILDCARD]
success true true true true true true true true
diff --git a/cli/tests/049_info_flag_script_jsx.out b/cli/tests/049_info_flag_script_jsx.out
index 135a830ad..ff4f04f3a 100644
--- a/cli/tests/049_info_flag_script_jsx.out
+++ b/cli/tests/049_info_flag_script_jsx.out
@@ -1,7 +1,7 @@
+[WILDCARD]
local: [WILDCARD]http[WILDCARD]127.0.0.1_PORT4545[WILDCARD]
type: TypeScript
compiled: [WILDCARD]048_media_types_jsx.ts.js
-map: [WILDCARD]048_media_types_jsx.ts.js.map
deps:
http://127.0.0.1:4545/cli/tests/048_media_types_jsx.ts
├── http://localhost:4545/cli/tests/subdir/mt_text_typescript_tsx.t1.tsx
diff --git a/cli/tests/052_no_remote_flag.out b/cli/tests/052_no_remote_flag.out
index 26f020aa5..e4d11592e 100644
--- a/cli/tests/052_no_remote_flag.out
+++ b/cli/tests/052_no_remote_flag.out
@@ -1 +1 @@
-Cannot resolve module "http://127.0.0.1:4545/cli/tests/019_media_types.ts"
+error: Cannot resolve module "http://127.0.0.1:4545/cli/tests/019_media_types.ts"
diff --git a/cli/tests/integration_tests.rs b/cli/tests/integration_tests.rs
index 616849520..5772c1a5c 100644
--- a/cli/tests/integration_tests.rs
+++ b/cli/tests/integration_tests.rs
@@ -1288,8 +1288,7 @@ itest!(_018_async_catch {
output: "018_async_catch.ts.out",
});
-// TODO(ry) Re-enable flaky test https://github.com/denoland/deno/issues/4049
-itest_ignore!(_019_media_types {
+itest!(_019_media_types {
args: "run --reload 019_media_types.ts",
output: "019_media_types.ts.out",
http_server: true,
@@ -1306,8 +1305,7 @@ itest!(_021_mjs_modules {
output: "021_mjs_modules.ts.out",
});
-// TODO(ry) Re-enable flaky test https://github.com/denoland/deno/issues/4049
-itest_ignore!(_022_info_flag_script {
+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,
@@ -1434,10 +1432,9 @@ itest!(_034_onload {
output: "034_onload.out",
});
-// TODO(ry) Re-enable flaky test https://github.com/denoland/deno/issues/4049
-itest_ignore!(_035_cached_only_flag {
+itest!(_035_cached_only_flag {
args:
- "--reload --cached-only http://127.0.0.1:4545/cli/tests/019_media_types.ts",
+ "run --reload --cached-only http://127.0.0.1:4545/cli/tests/019_media_types.ts",
output: "035_cached_only_flag.out",
exit_code: 1,
http_server: true,
@@ -1499,24 +1496,21 @@ itest!(_047_jsx {
output: "047_jsx_test.jsx.out",
});
-// TODO(ry) Re-enable flaky test https://github.com/denoland/deno/issues/4049
-itest_ignore!(_048_media_types_jsx {
+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 flaky test https://github.com/denoland/deno/issues/4049
-itest_ignore!(_049_info_flag_script_jsx {
+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,
});
-// TODO(ry) Re-enable flaky test https://github.com/denoland/deno/issues/4049
-itest_ignore!(_052_no_remote_flag {
+itest!(_052_no_remote_flag {
args:
- "--reload --no-remote http://127.0.0.1:4545/cli/tests/019_media_types.ts",
+ "run --reload --no-remote http://127.0.0.1:4545/cli/tests/019_media_types.ts",
output: "052_no_remote_flag.out",
exit_code: 1,
http_server: true,
@@ -1581,9 +1575,8 @@ itest!(lock_check_ok {
http_server: true,
});
-// TODO(ry) Re-enable flaky test https://github.com/denoland/deno/issues/4049
-itest_ignore!(lock_check_ok2 {
- args: "run 019_media_types.ts --lock=lock_check_ok2.json",
+itest!(lock_check_ok2 {
+ args: "run --lock=lock_check_ok2.json 019_media_types.ts",
output: "019_media_types.ts.out",
http_server: true,
});
@@ -1602,8 +1595,7 @@ itest!(lock_check_err {
http_server: true,
});
-// TODO(ry) Re-enable flaky test https://github.com/denoland/deno/issues/4049
-itest_ignore!(lock_check_err2 {
+itest!(lock_check_err2 {
args: "run --lock=lock_check_err2.json 019_media_types.ts",
output: "lock_check_err2.out",
exit_code: 10,
diff --git a/cli/tests/lock_check_err2.json b/cli/tests/lock_check_err2.json
index 6958a72f4..b26c1f0ae 100644
--- a/cli/tests/lock_check_err2.json
+++ b/cli/tests/lock_check_err2.json
@@ -1,9 +1,10 @@
{
- "http://localhost:4545/cli/tests/subdir/mt_text_javascript.j1.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
- "http://localhost:4545/cli/tests/subdir/mt_text_typescript.t1.ts": "c320ab0a259760e5c78b9ea840af3cc29697109594a3a5b5cea47128102b3e9d",
- "http://localhost:4545/cli/tests/subdir/mt_application_x_typescript.t4.ts": "42f66736fea7365ff17d5aa9b9655e8551eb81f360dcfb6b77acdd5c9f699e82",
- "http://localhost:4545/cli/tests/subdir/mt_video_vdn.t2.ts": "54cc82ff3c3b0387df57c7bb8eda4dcd36cbbf499ea483b04ff22c5365d34744",
- "http://localhost:4545/cli/tests/subdir/mt_application_x_javascript.j4.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
"http://localhost:4545/cli/tests/subdir/mt_application_ecmascript.j2.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
- "http://localhost:4545/cli/tests/subdir/mt_video_mp2t.t3.ts": "ee0b46f757b5f78681a4eead44820c2349daef7a5903fe3c624f29dbc98772e1"
+ "http://localhost:4545/cli/tests/subdir/mt_application_x_javascript.j4.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
+ "http://localhost:4545/cli/tests/subdir/mt_application_x_typescript.t4.ts": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
+ "http://localhost:4545/cli/tests/subdir/mt_text_ecmascript.j3.js": "bad",
+ "http://localhost:4545/cli/tests/subdir/mt_text_javascript.j1.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
+ "http://localhost:4545/cli/tests/subdir/mt_text_typescript.t1.ts": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
+ "http://localhost:4545/cli/tests/subdir/mt_video_mp2t.t3.ts": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
+ "http://localhost:4545/cli/tests/subdir/mt_video_vdn.t2.ts": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18"
}
diff --git a/cli/tests/lock_check_ok2.json b/cli/tests/lock_check_ok2.json
index 78fc75a9a..38b450f86 100644
--- a/cli/tests/lock_check_ok2.json
+++ b/cli/tests/lock_check_ok2.json
@@ -1,10 +1,10 @@
{
"http://localhost:4545/cli/tests/subdir/mt_application_ecmascript.j2.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
+ "http://localhost:4545/cli/tests/subdir/mt_application_x_javascript.j4.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
+ "http://localhost:4545/cli/tests/subdir/mt_application_x_typescript.t4.ts": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
"http://localhost:4545/cli/tests/subdir/mt_text_ecmascript.j3.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
- "http://localhost:4545/cli/tests/subdir/mt_video_vdn.t2.ts": "54cc82ff3c3b0387df57c7bb8eda4dcd36cbbf499ea483b04ff22c5365d34744",
"http://localhost:4545/cli/tests/subdir/mt_text_javascript.j1.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
- "http://localhost:4545/cli/tests/subdir/mt_application_x_typescript.t4.ts": "42f66736fea7365ff17d5aa9b9655e8551eb81f360dcfb6b77acdd5c9f699e82",
- "http://localhost:4545/cli/tests/subdir/mt_video_mp2t.t3.ts": "ee0b46f757b5f78681a4eead44820c2349daef7a5903fe3c624f29dbc98772e1",
- "http://localhost:4545/cli/tests/subdir/mt_application_x_javascript.j4.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
- "http://localhost:4545/cli/tests/subdir/mt_text_typescript.t1.ts": "c320ab0a259760e5c78b9ea840af3cc29697109594a3a5b5cea47128102b3e9d"
+ "http://localhost:4545/cli/tests/subdir/mt_text_typescript.t1.ts": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
+ "http://localhost:4545/cli/tests/subdir/mt_video_mp2t.t3.ts": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
+ "http://localhost:4545/cli/tests/subdir/mt_video_vdn.t2.ts": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18"
}