From 26cea0e2ca3aa036d1e0fe4869f23bd6c0b564fb Mon Sep 17 00:00:00 2001 From: David Sherret Date: Wed, 20 Jul 2022 17:36:54 -0400 Subject: feat(test): add `--parallel` flag, soft deprecate `--jobs` (#15259) Co-authored-by: mrkldshv --- cli/tests/integration/test_tests.rs | 21 ++++++++++----------- .../testdata/test/short-pass-jobs-flag-warning.out | 7 +++++++ .../short-pass-jobs-flag-with-numeric-value.out | 6 ------ 3 files changed, 17 insertions(+), 17 deletions(-) create mode 100644 cli/tests/testdata/test/short-pass-jobs-flag-warning.out delete mode 100644 cli/tests/testdata/test/short-pass-jobs-flag-with-numeric-value.out (limited to 'cli/tests') diff --git a/cli/tests/integration/test_tests.rs b/cli/tests/integration/test_tests.rs index 32be3c127..3dd626909 100644 --- a/cli/tests/integration/test_tests.rs +++ b/cli/tests/integration/test_tests.rs @@ -80,30 +80,29 @@ itest!(test_with_malformed_config { output: "test/collect_with_malformed_config.out", }); -itest!(jobs_flag { - args: "test test/short-pass.ts --jobs", +itest!(parallel_flag { + args: "test test/short-pass.ts --parallel", exit_code: 0, output: "test/short-pass.out", }); -itest!(jobs_flag_with_numeric_value { - args: "test test/short-pass.ts --jobs=2", +itest!(parallel_flag_with_env_variable { + args: "test test/short-pass.ts --parallel", + envs: vec![("DENO_JOBS".to_owned(), "2".to_owned())], exit_code: 0, - output: "test/short-pass-jobs-flag-with-numeric-value.out", + output: "test/short-pass.out", }); -itest!(jobs_flag_with_env_variable { +itest!(jobs_flag { args: "test test/short-pass.ts --jobs", - envs: vec![("DENO_JOBS".to_owned(), "2".to_owned())], exit_code: 0, - output: "test/short-pass.out", + output: "test/short-pass-jobs-flag-warning.out", }); -itest!(jobs_flag_with_numeric_value_and_env_var { +itest!(jobs_flag_with_numeric_value { args: "test test/short-pass.ts --jobs=2", - envs: vec![("DENO_JOBS".to_owned(), "3".to_owned())], exit_code: 0, - output: "test/short-pass-jobs-flag-with-numeric-value.out", + output: "test/short-pass-jobs-flag-warning.out", }); itest!(load_unload { diff --git a/cli/tests/testdata/test/short-pass-jobs-flag-warning.out b/cli/tests/testdata/test/short-pass-jobs-flag-warning.out new file mode 100644 index 000000000..b70ec5ee1 --- /dev/null +++ b/cli/tests/testdata/test/short-pass-jobs-flag-warning.out @@ -0,0 +1,7 @@ +Warning: --jobs flag is deprecated. Use the --parallel flag with possibly the 'DENO_JOBS' environment variable. +Check [WILDCARD]/test/short-pass.ts +running 1 test from ./test/short-pass.ts +test ... ok ([WILDCARD]) + +ok | 1 passed | 0 failed ([WILDCARD]) + diff --git a/cli/tests/testdata/test/short-pass-jobs-flag-with-numeric-value.out b/cli/tests/testdata/test/short-pass-jobs-flag-with-numeric-value.out deleted file mode 100644 index 09b72d5fd..000000000 --- a/cli/tests/testdata/test/short-pass-jobs-flag-with-numeric-value.out +++ /dev/null @@ -1,6 +0,0 @@ -Check [WILDCARD]/test/short-pass.ts -running 1 test from ./test/short-pass.ts -test ... ok ([WILDCARD]) - -ok | 1 passed | 0 failed ([WILDCARD]) - -- cgit v1.2.3