Merge branch 'stable-2.14'

* stable-2.14:
  Prevents 2x stop() calls during IntegrationTest
  Add missing documentation of assignee related search operators
  Rename StartStopDeamonIT to StartStopDaemonIT
  Add integration test to check for thread leaks in sandboxed Daemon tests
  Fix intopic predicate with regex

Change-Id: Icea87f9bed4711ee2744e5d2a0127b50297df046
This commit is contained in:
David Pursehouse
2017-04-05 16:42:13 +09:00
5 changed files with 57 additions and 3 deletions

View File

@@ -0,0 +1,38 @@
// Copyright (C) 2017 The Android Open Source Project
//
// Licensed 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 com.google.gerrit.acceptance.pgm;
import static com.google.common.truth.Truth.assertThat;
import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.Sandboxed;
import java.lang.management.ManagementFactory;
import java.lang.management.ThreadMXBean;
import org.junit.Test;
import org.junit.runner.Description;
@Sandboxed
public class StartStopDaemonIT extends AbstractDaemonTest {
Description suiteDescription = Description.createSuiteDescription(StartStopDaemonIT.class);
@Test
public void sandboxedDaemonDoesNotLeakThreads() throws Exception {
ThreadMXBean thbean = ManagementFactory.getThreadMXBean();
int startThreads = thbean.getThreadCount();
beforeTest(suiteDescription);
afterTest();
assertThat(Thread.activeCount()).isLessThan(startThreads);
}
}