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

Fix: server_test now works with default-on tactics

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

+ 4 - 8
psiphon/server/server_test.go

@@ -689,14 +689,10 @@ func runServer(t *testing.T, runConfig *runServerConfig) {
 	localSOCKSProxyPort := 1081
 	localHTTPProxyPort := 8081
 
-	jsonNetworkID := ""
-	if doClientTactics {
-		// Use a distinct prefix for network ID for each test run to
-		// ensure tactics from different runs don't apply; this is
-		// a workaround for the singleton datastore.
-		prefix := time.Now().String()
-		jsonNetworkID = fmt.Sprintf(`,"NetworkID" : "%s-%s"`, prefix, "NETWORK1")
-	}
+	// Use a distinct prefix for network ID for each test run to
+	// ensure tactics from different runs don't apply; this is
+	// a workaround for the singleton datastore.
+	jsonNetworkID := fmt.Sprintf(`,"NetworkID" : "%s-%s"`, time.Now().String(), "NETWORK1")
 
 	jsonLimitTLSProfiles := ""
 	if runConfig.tlsProfile != "" {