Reinit OsPluginTest if testCpuUtilisation fails

stagemonitor · Apr 5, 2015 · 4785764 · 4785764
1 parent 87620e1
commit 4785764
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/stagemonitor-core/src/main/java/org/stagemonitor/core/Stagemonitor.java b/stagemonitor-core/src/main/java/org/stagemonitor/core/Stagemonitor.java
@@ -176,6 +176,7 @@ public static void reset() {
 		started = false;
 		disabled = false;
 		measurementSession = new MeasurementSession(null, null, null);
+		SharedMetricRegistries.clear();
 		reloadConfiguration();
 	}
 

diff --git a/stagemonitor-os/src/test/java/org/stagemonitor/os/OsPluginTest.java b/stagemonitor-os/src/test/java/org/stagemonitor/os/OsPluginTest.java
@@ -27,7 +27,7 @@
 @RunWith(ConditionalTravisTestRunner.class)
 public class OsPluginTest {
 
-	private final MetricRegistry metricRegistry = new MetricRegistry();
+	private MetricRegistry metricRegistry;
 	private static Sigar sigar;
 
 	static {
@@ -40,6 +40,7 @@ public class OsPluginTest {
 
 	@Before
 	public void setUp() throws Exception {
+		metricRegistry = new MetricRegistry();
 		OsPlugin osPlugin = new OsPlugin(sigar);
 		final Configuration configuration = mock(Configuration.class);
 		when(configuration.getConfig(CorePlugin.class)).thenReturn(mock(CorePlugin.class));
@@ -50,6 +51,7 @@ public void setUp() throws Exception {
 	public void testCpuUtilisation() throws Exception {
 		double cpu = Double.NaN;
 		for (int i = 0; i < 5 && Double.isNaN(cpu); i++) {
+			setUp();
 			cpu = getDoubleGauge("os.cpu.usage.sys") +
 					getDoubleGauge("os.cpu.usage.user") +
 					getDoubleGauge("os.cpu.usage.idle") +