Allow LoggingAppender default options test to pass locally and on GCE

googleapis · Sep 11, 2018 · 90e28af · 90e28af
1 parent 709099f
commit 90e28af
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/...d-logging-logback/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java b/...d-logging-logback/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java
@@ -62,15 +62,19 @@ Logging getLogging() {
   @Before
   public void setUp() {}
 
-  private final WriteOption[] defaultWriteOptions =
-      new WriteOption[] {
-        WriteOption.logName("java.log"),
-        WriteOption.resource(
-            MonitoredResource.newBuilder("global")
-                .setLabels(
-                    new ImmutableMap.Builder<String, String>().put("project_id", projectId).build())
-                .build())
-      };
+  private final WriteOption defaultWriteOptionLogName = WriteOption.logName("java.log");
+  // For local test runs, the default option is global
+  private final WriteOption defaultWriteOptionResourceGlobal = WriteOption.resource(
+      MonitoredResource.newBuilder("global")
+          .setLabels(
+              new ImmutableMap.Builder<String, String>().put("project_id", projectId).build())
+          .build());
+  // CI runs on GCE so the default is gce_instance
+  private final WriteOption defaultWriteOptionResourceGCE = WriteOption.resource(
+      MonitoredResource.newBuilder("gce_instance")
+          .setLabels(
+              new ImmutableMap.Builder<String, String>().put("project_id", projectId).build())
+          .build());
 
   @Test
   public void testFlushLevelConfigUpdatesLoggingFlushSeverity() {
@@ -179,8 +183,8 @@ public void testDefaultWriteOptionsHasExpectedDefaults() {
     LoggingEvent loggingEvent = createLoggingEvent(Level.ERROR, timestamp.getSeconds());
     loggingAppender.doAppend(loggingEvent);
 
-    assertThat(logNameArg.getValue()).isEqualTo(defaultWriteOptions[0]);
-    assertThat(resourceArg.getValue()).isEqualTo(defaultWriteOptions[1]);
+    assertThat(logNameArg.getValue()).isEqualTo(defaultWriteOptionLogName);
+    assertThat(resourceArg.getValue()).isAnyOf(defaultWriteOptionResourceGlobal, defaultWriteOptionResourceGCE);
   }
 
   private LoggingEvent createLoggingEvent(Level level, long timestamp) {