Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix logging integration test failure on when running on GCE #3641

Merged
merged 5 commits into from
Sep 5, 2018
Merged

Fix logging integration test failure on when running on GCE #3641

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
644ceff
wip
yihanzhen Sep 4, 2018
a7ab044
wip
yihanzhen Sep 4, 2018
e766906
fix logging it
yihanzhen Sep 4, 2018
bad12d3
format
yihanzhen Sep 4, 2018
aa4d3f2
change the unit test to use truth
yihanzhen Sep 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions ...d-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package com.google.cloud.logging;

import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
Expand All @@ -36,12 +37,11 @@
import com.google.common.collect.Iterators;
import com.google.common.collect.Sets;
import com.google.logging.v2.LogName;
import com.google.logging.v2.ProjectLogName;
import java.util.Iterator;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;

import com.google.logging.v2.ProjectLogName;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
Expand Down Expand Up @@ -312,9 +312,11 @@ public void testLoggingHandler() throws InterruptedException {
assertEquals(logId, entry.getLogName());
assertEquals(ImmutableMap.of("levelName", "INFO",

This comment was marked as spam.

Sign in to view

"levelValue", String.valueOf(Level.INFO.intValue())), entry.getLabels());
assertEquals("global", entry.getResource().getType());
assertEquals(ImmutableMap.of("project_id", options.getProjectId()),
entry.getResource().getLabels());
MonitoredResource monitoredResource =
new LoggingConfig(handler.getClass().getName())
.getMonitoredResource(options.getProjectId());
assertThat(entry.getResource().getType()).isEqualTo(monitoredResource.getType());
assertThat(entry.getResource().getLabels()).containsEntry("project_id", options.getProjectId());
assertNull(entry.getHttpRequest());
assertEquals(Severity.INFO, entry.getSeverity());
assertNull(entry.getOperation());
Expand Down