summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2024-08-28 20:37:54 +0100
committerGitHub <noreply@github.com>2024-08-28 19:37:54 +0000
commit231bdc0aa0c08914735001f5e1261e1808d68190 (patch)
tree89f2e8c584d1627a842da7d09eb9d8b70cedcc8e
parent64037b1f027ac977a0f227669d367cf2e1c71791 (diff)
test: Don't run unit tests with and without `DENO_FUTURE=1` (#25273)
This is still flaky and won't be needed anyway once https://github.com/denoland/deno/pull/25213 lands.
-rw-r--r--tests/integration/js_unit_tests.rs10
-rw-r--r--tests/integration/js_unit_tests_future.rs118
-rw-r--r--tests/integration/mod.rs2
3 files changed, 0 insertions, 130 deletions
diff --git a/tests/integration/js_unit_tests.rs b/tests/integration/js_unit_tests.rs
index bc6c5bdae..cbae4a0b8 100644
--- a/tests/integration/js_unit_tests.rs
+++ b/tests/integration/js_unit_tests.rs
@@ -117,10 +117,6 @@ util::unit_test_factory!(
);
fn js_unit_test(test: String) {
- js_unit_test_inner(test, false);
-}
-
-pub fn js_unit_test_inner(test: String, future: bool) {
let _g = util::http_server();
let deno = util::deno_cmd()
@@ -133,12 +129,6 @@ pub fn js_unit_test_inner(test: String, future: bool) {
.arg("--location=http://127.0.0.1:4545/")
.arg("--no-prompt");
- let deno = if future {
- deno.env("DENO_FUTURE", "1")
- } else {
- deno
- };
-
// TODO(mmastrac): it would be better to just load a test CA for all tests
let deno = if test == "websocket_test" || test == "tls_sni_test" {
deno.arg("--unsafely-ignore-certificate-errors")
diff --git a/tests/integration/js_unit_tests_future.rs b/tests/integration/js_unit_tests_future.rs
deleted file mode 100644
index 1541ace99..000000000
--- a/tests/integration/js_unit_tests_future.rs
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
-
-use super::js_unit_tests::js_unit_test_inner;
-use test_util as util;
-
-util::unit_test_factory!(
- js_unit_test_future,
- "../tests/unit",
- "*.ts",
- [
- abort_controller_test,
- blob_test,
- body_test,
- broadcast_channel_test,
- buffer_test,
- build_test,
- cache_api_test,
- chmod_test,
- chown_test,
- command_test,
- console_test,
- copy_file_test,
- custom_event_test,
- cron_test,
- dir_test,
- dom_exception_test,
- error_stack_test,
- error_test,
- esnext_test,
- event_source_test,
- event_target_test,
- event_test,
- fetch_test,
- ffi_test,
- file_test,
- filereader_test,
- files_test,
- flock_test,
- fs_events_test,
- get_random_values_test,
- globals_test,
- headers_test,
- http_test,
- image_bitmap_test,
- image_data_test,
- internals_test,
- intl_test,
- io_test,
- jupyter_test,
- kv_test,
- kv_queue_test_no_db_close,
- kv_queue_test,
- kv_queue_undelivered_test,
- link_test,
- make_temp_test,
- message_channel_test,
- mkdir_test,
- navigator_test,
- net_test,
- network_interfaces_test,
- os_test,
- ops_test,
- path_from_url_test,
- performance_test,
- permissions_test,
- process_test,
- progressevent_test,
- promise_hooks_test,
- read_dir_test,
- read_file_test,
- read_link_test,
- read_text_file_test,
- real_path_test,
- ref_unref_test,
- remove_test,
- rename_test,
- request_test,
- resources_test,
- response_test,
- serve_test,
- signal_test,
- stat_test,
- stdio_test,
- streams_test,
- structured_clone_test,
- symbol_test,
- symlink_test,
- sync_test,
- test_util,
- testing_test,
- text_encoding_test,
- timers_test,
- tls_test,
- tls_sni_test,
- truncate_test,
- tty_color_test,
- tty_test,
- umask_test,
- url_search_params_test,
- url_test,
- urlpattern_test,
- utime_test,
- version_test,
- wasm_test,
- webcrypto_test,
- webgpu_test,
- websocket_test,
- webstorage_test,
- worker_permissions_test,
- worker_test,
- write_file_test,
- write_text_file_test,
- ]
-);
-
-fn js_unit_test_future(test: String) {
- js_unit_test_inner(test, true);
-}
diff --git a/tests/integration/mod.rs b/tests/integration/mod.rs
index cfde985d4..d35fabc02 100644
--- a/tests/integration/mod.rs
+++ b/tests/integration/mod.rs
@@ -37,8 +37,6 @@ mod inspector;
mod install;
#[path = "js_unit_tests.rs"]
mod js_unit_tests;
-#[path = "js_unit_tests_future.rs"]
-mod js_unit_tests_future;
#[path = "jsr_tests.rs"]
mod jsr;
#[path = "jupyter_tests.rs"]