From 1f9a9a624fa31bd7315ea02843beb4d1fb5977ab Mon Sep 17 00:00:00 2001 From: Rod Hynes Date: Thu, 12 Dec 2024 14:48:45 -0500 Subject: [PATCH] Fix incorrect 'unexpected unique user log' failures --- psiphon/server/server_test.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/psiphon/server/server_test.go b/psiphon/server/server_test.go index 3c93d53a6..608845e8a 100644 --- a/psiphon/server/server_test.go +++ b/psiphon/server/server_test.go @@ -720,12 +720,10 @@ var ( testSteeringIP = "1.1.1.1" ) -var serverRuns = 0 +var lastConnectedUpdateCount = 0 func runServer(t *testing.T, runConfig *runServerConfig) { - serverRuns += 1 - psiphonServerIPAddress := "127.0.0.1" psiphonServerPort := 4000 @@ -1487,7 +1485,7 @@ func runServer(t *testing.T, runConfig *runServerConfig) { // Test unique user counting cases. var expectUniqueUser bool - switch serverRuns % 3 { + switch lastConnectedUpdateCount % 3 { case 0: // Mock no last_connected. psiphon.SetKeyValue("lastConnected", "") @@ -1665,6 +1663,9 @@ func runServer(t *testing.T, runConfig *runServerConfig) { } waitOnNotification(t, tunnelsEstablished, timeoutSignal, "tunnel established timeout exceeded") waitOnNotification(t, homepageReceived, timeoutSignal, "homepage received timeout exceeded") + + // The tunnel connected, so the local last_connected has been updated. + lastConnectedUpdateCount += 1 } if runConfig.doChangeBytesConfig {