Skip to content

Commit

Permalink
Filter out special gradle threads from leak control (#47713)
Browse files Browse the repository at this point in the history
This commit adds a thread filter for gradle unit tests which omits
threads gradle may create that we have no control over shutting down.
The current example of this is for project.exec which gradle pools.

closes #47417
  • Loading branch information
rjernst authored Oct 8, 2019
1 parent 4aa6a9e commit 603c3e6
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

package org.elasticsearch.gradle.test;

import com.carrotsearch.randomizedtesting.ThreadFilter;

/**
* Filter out threads controlled by gradle that may be created during unit tests.
*
* Currently this is only the pooled threads for Exec.
*/
public class GradleThreadsFilter implements ThreadFilter {

@Override
public boolean reject(Thread t) {
return t.getName().startsWith("Exec process");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,16 @@
import com.carrotsearch.randomizedtesting.JUnit4MethodProvider;
import com.carrotsearch.randomizedtesting.RandomizedRunner;
import com.carrotsearch.randomizedtesting.annotations.TestMethodProviders;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
import org.junit.runner.RunWith;

@RunWith(RandomizedRunner.class)
@TestMethodProviders({
JUnit4MethodProvider.class,
JUnit3MethodProvider.class
})
@ThreadLeakFilters(defaultFilters = true, filters = {
GradleThreadsFilter.class
})
public abstract class GradleUnitTestCase extends BaseTestCase {
}

0 comments on commit 603c3e6

Please sign in to comment.