test(logging): fix TestInstrumentationIngestion in integration env (#…

…6297)
googleapis · Jul 1, 2022 · df178f8 · df178f8
1 parent c0a0c20
commit df178f8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/logging/logging_test.go b/logging/logging_test.go
@@ -1420,7 +1420,7 @@ func TestInstrumentationWithRedirect(t *testing.T) {
 	entry := &logging.Entry{Severity: logging.Info, Payload: "test string"}
 	buffer := &strings.Builder{}
 	logger := client.Logger("test-redirect-output", logging.RedirectAsJSON(buffer))
-	onceBackup := internal.InstrumentOnce
+	onceBackup, timeBackup := internal.InstrumentOnce, logging.SetNow(testNow)
 	internal.InstrumentOnce = new(sync.Once)
 	for i := range want {
 		buffer.Reset()
@@ -1433,6 +1433,7 @@ func TestInstrumentationWithRedirect(t *testing.T) {
 			t.Errorf("got(%v), want(%v)", got, want[i])
 		}
 	}
+	logging.SetNow(timeBackup)
 	internal.InstrumentOnce = onceBackup
 }
 

diff --git a/logging/logging_unexported_test.go b/logging/logging_unexported_test.go
@@ -351,6 +351,7 @@ func TestMonitoredResource(t *testing.T) {
 }
 
 // Used by the tests in logging_test.
-func SetNow(f func() time.Time) {
-	now = f
+func SetNow(f func() time.Time) func() time.Time {
+	now, f = f, now
+	return f
 }