Fix monitor test (GoogleCloudPlatform#2669)

munkhuushmgl · web-flow · commit 8be0357ebceb · 2020-04-15T15:46:44.000-07:00
* Fixed flaky tests

* reverted back

* added condition for disable/enable testing
diff --git a/monitoring/v3/src/test/java/com/example/AlertIT.java b/monitoring/v3/src/test/java/com/example/AlertIT.java
@@ -96,8 +96,22 @@ public void testReplaceChannels() throws IOException {
   @Test
   public void testDisableEnablePolicies() throws IOException {
     AlertSample.main(new String[] {"enable", "-d", "display_name='test-policy'"});
-    assertTrue(bout.toString().contains("enabled"));
-    AlertSample.main(new String[] {"disable", "-d", "display_name='test-policy'"});
-    assertTrue(bout.toString().contains("disabled"));
+    
+    // check the current state of policy to make sure
+    // not to enable the policy that is already enabled.
+    boolean isEnabled = bout.toString().contains("already");
+    if (isEnabled) {
+      AlertSample.main(new String[] {"disable", "-d", "display_name='test-policy'"});
+      assertTrue(bout.toString().contains("disabled"));
+
+      AlertSample.main(new String[] {"enable", "-d", "display_name='test-policy'"});
+      assertTrue(bout.toString().contains("enabled"));
+    } else {
+      AlertSample.main(new String[] {"enable", "-d", "display_name='test-policy'"});
+      assertTrue(bout.toString().contains("enabled"));
+
+      AlertSample.main(new String[] {"disable", "-d", "display_name='test-policy'"});
+      assertTrue(bout.toString().contains("disabled"));
+    }
   }
 }
