|
@@ -1593,6 +1593,10 @@ func runServer(t *testing.T, runConfig *runServerConfig) {
|
|
|
}
|
|
}
|
|
|
timer.Stop()
|
|
timer.Stop()
|
|
|
|
|
|
|
|
|
|
+ // reset client datastore
|
|
|
|
|
+
|
|
|
|
|
+ _ = os.RemoveAll(filepath.Join(testDataDirName, psiphon.PsiphonDataDirectoryName))
|
|
|
|
|
+
|
|
|
// configure client
|
|
// configure client
|
|
|
|
|
|
|
|
values.SetSSHClientVersionsSpec(values.NewPickOneSpec(testSSHClientVersions))
|
|
values.SetSSHClientVersionsSpec(values.NewPickOneSpec(testSSHClientVersions))
|
|
@@ -1917,13 +1921,13 @@ func runServer(t *testing.T, runConfig *runServerConfig) {
|
|
|
time.Now().UTC().AddDate(0, 0, -1).Truncate(1*time.Hour).Format(time.RFC3339))
|
|
time.Now().UTC().AddDate(0, 0, -1).Truncate(1*time.Hour).Format(time.RFC3339))
|
|
|
expectUniqueUser = true
|
|
expectUniqueUser = true
|
|
|
case 2:
|
|
case 2:
|
|
|
- // Leave previous last_connected.
|
|
|
|
|
|
|
+ // Mock same day last_connected.
|
|
|
|
|
+ psiphon.SetKeyValue(
|
|
|
|
|
+ "lastConnected",
|
|
|
|
|
+ time.Now().UTC().Add(-1*time.Minute).Truncate(1*time.Hour).Format(time.RFC3339))
|
|
|
expectUniqueUser = false
|
|
expectUniqueUser = false
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- // Clear SLOKs from previous test runs.
|
|
|
|
|
- psiphon.DeleteSLOKs()
|
|
|
|
|
-
|
|
|
|
|
// Store prune server entry test server entries and failed tunnel records.
|
|
// Store prune server entry test server entries and failed tunnel records.
|
|
|
storePruneServerEntriesTest(
|
|
storePruneServerEntriesTest(
|
|
|
t, runConfig, testDataDirName, pruneServerEntryTestCases)
|
|
t, runConfig, testDataDirName, pruneServerEntryTestCases)
|