From 122f97c7edb2d4691d5a84357f9cc3b965d7ea18 Mon Sep 17 00:00:00 2001 From: Rachel Fenichel Date: Thu, 24 Sep 2020 12:33:41 -0700 Subject: [PATCH 1/2] Change order of tests to avoid timing issues --- tests/run_all_tests.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/run_all_tests.sh b/tests/run_all_tests.sh index b289bdc97..805a86a24 100755 --- a/tests/run_all_tests.sh +++ b/tests/run_all_tests.sh @@ -52,15 +52,6 @@ run_test_command () { # Lint the codebase. run_test_command "eslint" "eslint ." -# Run Mocha tests inside a browser. -run_test_command "mocha" "node tests/mocha/run_mocha_tests_in_browser.js" - -# Run Node tests. -run_test_command "node" "./node_modules/.bin/mocha tests/node --config tests/node/.mocharc.js" - -# Run generator tests inside a browser and check the results. -run_test_command "generators" "tests/scripts/run_generators.sh" - # Run the closure compiler. run_test_command "compile" "npm run build" @@ -70,6 +61,15 @@ run_test_command "compile:warnings" "npm run build:debug" # Generate TypeScript typings and ensure there are no errors. run_test_command "typings" "tests/scripts/compile_typings.sh" +# Run Mocha tests inside a browser. +run_test_command "mocha" "node tests/mocha/run_mocha_tests_in_browser.js" + +# Run Node tests. +run_test_command "node" "./node_modules/.bin/mocha tests/node --config tests/node/.mocharc.js" + +# Run generator tests inside a browser and check the results. +run_test_command "generators" "tests/scripts/run_generators.sh" + # Check the sizes of built files for unexpected growth. run_test_command "metadata" "tests/scripts/check_metadata.sh" From f840bec03700d5948138a80231c198d5d5c85424 Mon Sep 17 00:00:00 2001 From: Rachel Fenichel Date: Thu, 24 Sep 2020 12:41:47 -0700 Subject: [PATCH 2/2] Reorder more --- tests/run_all_tests.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/run_all_tests.sh b/tests/run_all_tests.sh index 805a86a24..78044ea24 100755 --- a/tests/run_all_tests.sh +++ b/tests/run_all_tests.sh @@ -61,17 +61,17 @@ run_test_command "compile:warnings" "npm run build:debug" # Generate TypeScript typings and ensure there are no errors. run_test_command "typings" "tests/scripts/compile_typings.sh" +# Check the sizes of built files for unexpected growth. +run_test_command "metadata" "tests/scripts/check_metadata.sh" + # Run Mocha tests inside a browser. run_test_command "mocha" "node tests/mocha/run_mocha_tests_in_browser.js" -# Run Node tests. -run_test_command "node" "./node_modules/.bin/mocha tests/node --config tests/node/.mocharc.js" - # Run generator tests inside a browser and check the results. run_test_command "generators" "tests/scripts/run_generators.sh" -# Check the sizes of built files for unexpected growth. -run_test_command "metadata" "tests/scripts/check_metadata.sh" +# Run Node tests. +run_test_command "node" "./node_modules/.bin/mocha tests/node --config tests/node/.mocharc.js" # # Attempt advanced compilation of a Blockly app. # run_test_command "advanced_compile" "tests/compile/compile.sh"