Просмотр исходного кода

Fix: clear all client datastore state between test runs

Rod Hynes 4 месяцев назад
Родитель
Сommit
a1e2a0d21e
1 измененных файлов с 8 добавлено и 4 удалено
  1. 8 4
      psiphon/server/server_test.go

+ 8 - 4
psiphon/server/server_test.go

@@ -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)