Skip to content
Snippets Groups Projects
Verified Commit 1b5e4160 authored by Théodore Biadala's avatar Théodore Biadala
Browse files

Issue #3487816 by catch, berdir, smustgrave, quietone: Ensure tests don't run twice

parent 3de28c0f
No related branches found
No related tags found
12 merge requests!11197Issue #3506427 by eduardo morales alberti: Remove responsive_image.ajax from hook,!11131[10.4.x-only-DO-NOT-MERGE]: Issue ##2842525 Ajax attached to Views exposed filter form does not trigger callbacks,!10786Issue #3490579 by shalini_jha, mstrelan: Add void return to all views...,!5423Draft: Resolve #3329907 "Test2",!3878Removed unused condition head title for views,!3818Issue #2140179: $entity->original gets stale between updates,!3478Issue #3337882: Deleted menus are not removed from content type config,!3154Fixes #2987987 - CSRF token validation broken on routes with optional parameters.,!2964Issue #2865710 : Dependencies from only one instance of a widget are used in display modes,!2062Issue #3246454: Add weekly granularity to views date sort,!10223132456: Fix issue where views instances are emptied before an ajax request is complete,!579Issue #2230909: Simple decimals fail to pass validation
Pipeline #350411 passed with warnings
Stage: 🪄 Lint
Stage: 🗜️ Test
Pipeline: drupal

#350436

    Pipeline: drupal

    #350427

      Pipeline: drupal

      #350414

        Show whitespace changes
        Inline Side-by-side
        core/scripts/run-tests.sh
        + 5
        − 5
        View file @ 1b5e4160
        ...@@ -946,16 +946,16 @@ function simpletest_script_get_test_list() { ...@@ -946,16 +946,16 @@ function simpletest_script_get_test_list() {
        foreach ($groups as $group => $tests) { foreach ($groups as $group => $tests) {
        $not_slow_tests = array_merge($not_slow_tests, array_keys($tests)); $not_slow_tests = array_merge($not_slow_tests, array_keys($tests));
        } }
        // Filter slow tests out of the not slow tests since they may appear in more // Filter slow tests out of the not slow tests and ensure a unique list
        // than one group. // since tests may appear in more than one group.
        $not_slow_tests = array_diff($not_slow_tests, $slow_tests); $not_slow_tests = array_unique(array_diff($not_slow_tests, $slow_tests));
        // If the tests are not being run in parallel, then ensure slow tests run // If the tests are not being run in parallel, then ensure slow tests run
        // all together first. // all together first.
        if ((int) $args['ci-parallel-node-total'] <= 1 ) { if ((int) $args['ci-parallel-node-total'] <= 1 ) {
        sort_tests_by_type_and_methods($slow_tests); sort_tests_by_type_and_methods($slow_tests);
        sort_tests_by_type_and_methods($not_slow_tests); sort_tests_by_type_and_methods($not_slow_tests);
        $test_list = array_unique(array_merge($slow_tests, $not_slow_tests)); $test_list = array_merge($slow_tests, $not_slow_tests);
        } }
        else { else {
        // Sort all tests by the number of public methods on the test class. // Sort all tests by the number of public methods on the test class.
        ...@@ -976,7 +976,7 @@ function simpletest_script_get_test_list() { ...@@ -976,7 +976,7 @@ function simpletest_script_get_test_list() {
        // And the same for the rest of the tests. // And the same for the rest of the tests.
        $binned_other_tests = place_tests_into_bins($not_slow_tests, $bin_count); $binned_other_tests = place_tests_into_bins($not_slow_tests, $bin_count);
        $other_tests_for_job = $binned_other_tests[$args['ci-parallel-node-index'] - 1]; $other_tests_for_job = $binned_other_tests[$args['ci-parallel-node-index'] - 1];
        $test_list = array_unique(array_merge($slow_tests_for_job, $other_tests_for_job)); $test_list = array_merge($slow_tests_for_job, $other_tests_for_job);
        } }
        } }
        else { else {
        ......
        0% or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Please register or to comment