Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 31720200CBA for ; Mon, 3 Jul 2017 14:39:15 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 303DF160BEC; Mon, 3 Jul 2017 12:39:15 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 711C0160BE4 for ; Mon, 3 Jul 2017 14:39:14 +0200 (CEST) Received: (qmail 69341 invoked by uid 500); 3 Jul 2017 12:39:13 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 69332 invoked by uid 99); 3 Jul 2017 12:39:13 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Jul 2017 12:39:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 75272DFF8A; Mon, 3 Jul 2017 12:39:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ab@apache.org To: commits@lucene.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: lucene-solr:master: SOLR-10565 Use unique scope and domain names in this test to avoid collisions. Date: Mon, 3 Jul 2017 12:39:13 +0000 (UTC) archived-at: Mon, 03 Jul 2017 12:39:15 -0000 Repository: lucene-solr Updated Branches: refs/heads/master 706d20181 -> 5966f7566 SOLR-10565 Use unique scope and domain names in this test to avoid collisions. Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5966f756 Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5966f756 Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5966f756 Branch: refs/heads/master Commit: 5966f7566390d00643024dd3344de79695f984e0 Parents: 706d201 Author: Andrzej Bialecki Authored: Mon Jul 3 14:21:12 2017 +0200 Committer: Andrzej Bialecki Committed: Mon Jul 3 14:21:12 2017 +0200 ---------------------------------------------------------------------- .../metrics/reporters/SolrJmxReporterTest.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5966f756/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterTest.java ---------------------------------------------------------------------- diff --git a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterTest.java b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterTest.java index f9a32c0..11cdf37 100644 --- a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterTest.java +++ b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterTest.java @@ -49,6 +49,7 @@ public class SolrJmxReporterTest extends SolrTestCaseJ4 { private static final int MAX_ITERATIONS = 20; private static int jmxPort; + private static String PREFIX; private String domain; @@ -64,6 +65,7 @@ public class SolrJmxReporterTest extends SolrTestCaseJ4 { jmxPort = getNextAvailablePort(); assertFalse(jmxPort == -1); LocateRegistry.createRegistry(jmxPort); + PREFIX = getSimpleClassName() + "-"; } @Before @@ -72,7 +74,7 @@ public class SolrJmxReporterTest extends SolrTestCaseJ4 { final SolrCore core = h.getCore(); domain = core.getName(); - rootName = TestUtil.randomSimpleString(random(), 5, 10); + rootName = PREFIX + TestUtil.randomSimpleString(random(), 5, 10); coreMetricManager = core.getCoreMetricManager(); metricManager = core.getCoreContainer().getMetricManager(); @@ -95,7 +97,7 @@ public class SolrJmxReporterTest extends SolrTestCaseJ4 { private PluginInfo createReporterPluginInfo(String rootName, boolean enabled) { Random random = random(); String className = SolrJmxReporter.class.getName(); - String reporterName = TestUtil.randomSimpleString(random, 5, 10); + String reporterName = PREFIX + TestUtil.randomSimpleString(random, 5, 10); Map attrs = new HashMap<>(); attrs.put(FieldType.CLASS_NAME, className); @@ -106,7 +108,7 @@ public class SolrJmxReporterTest extends SolrTestCaseJ4 { boolean shouldOverrideDomain = random.nextBoolean(); if (shouldOverrideDomain) { - domain = TestUtil.randomSimpleString(random); + domain = PREFIX + TestUtil.randomSimpleString(random); attrs.put("domain", domain); } @@ -129,7 +131,7 @@ public class SolrJmxReporterTest extends SolrTestCaseJ4 { Random random = random(); Map registered = new HashMap<>(); - String scope = SolrMetricTestUtils.getRandomScope(random, true); + String scope = PREFIX + SolrMetricTestUtils.getRandomScope(random, true); SolrInfoBean.Category category = SolrMetricTestUtils.getRandomCategory(random, true); int iterations = TestUtil.nextInt(random, 0, MAX_ITERATIONS); @@ -150,7 +152,7 @@ public class SolrJmxReporterTest extends SolrTestCaseJ4 { public void testReloadCore() throws Exception { Random random = random(); - String scope = SolrMetricTestUtils.getRandomScope(random, true); + String scope = PREFIX + SolrMetricTestUtils.getRandomScope(random, true); SolrInfoBean.Category category = SolrMetricTestUtils.getRandomCategory(random, true); Map metrics = SolrMetricTestUtils.getRandomMetrics(random, true); SolrMetricProducer producer = SolrMetricTestUtils.getProducerOf(metricManager, category, scope, metrics); @@ -174,12 +176,12 @@ public class SolrJmxReporterTest extends SolrTestCaseJ4 { @Test public void testEnabled() throws Exception { - String root1 = TestUtil.randomSimpleString(random(), 5, 10); + String root1 = PREFIX + TestUtil.randomSimpleString(random(), 5, 10); PluginInfo pluginInfo1 = createReporterPluginInfo(root1, true); metricManager.loadReporter(coreMetricManager.getRegistryName(), coreMetricManager.getCore().getResourceLoader(), pluginInfo1, coreMetricManager.getTag()); - String root2 = TestUtil.randomSimpleString(random(), 5, 10); + String root2 = PREFIX + TestUtil.randomSimpleString(random(), 5, 10); assertFalse(root2.equals(root1)); PluginInfo pluginInfo2 = createReporterPluginInfo(root2, false); metricManager.loadReporter(coreMetricManager.getRegistryName(), coreMetricManager.getCore().getResourceLoader(), @@ -189,7 +191,7 @@ public class SolrJmxReporterTest extends SolrTestCaseJ4 { assertTrue(reporters.containsKey(pluginInfo1.name + "@" + coreMetricManager.getTag())); assertTrue(reporters.containsKey(pluginInfo2.name + "@" + coreMetricManager.getTag())); - String scope = SolrMetricTestUtils.getRandomScope(random(), true); + String scope = PREFIX + SolrMetricTestUtils.getRandomScope(random(), true); SolrInfoBean.Category category = SolrMetricTestUtils.getRandomCategory(random(), true); Map metrics = SolrMetricTestUtils.getRandomMetrics(random(), true); SolrMetricProducer producer = SolrMetricTestUtils.getProducerOf(metricManager, category, scope, metrics);