瀏覽代碼

Adjust disruptor test retry timeouts

- Change to 250ms; up from 100ms but still lower
  than previous 1s.
- Shorter retry delay speed up the test run.
- Excessively frequent retries exhaust distruptor
  resources and cause tests to fail.
Rod Hynes 8 年之前
父節點
當前提交
0aee99c453
共有 2 個文件被更改,包括 4 次插入4 次删除
  1. 3 3
      psiphon/controller_test.go
  2. 1 1
      psiphon/remoteServerList_test.go

+ 3 - 3
psiphon/controller_test.go

@@ -506,9 +506,9 @@ func controllerRun(t *testing.T, runConfig *controllerRunConfig) {
 
 	// Override client retry throttle values to speed up automated
 	// tests and ensure tests complete within fixed deadlines.
-	applyParameters[parameters.FetchRemoteServerListRetryPeriod] = "100ms"
-	applyParameters[parameters.FetchUpgradeRetryPeriod] = "100ms"
-	applyParameters[parameters.EstablishTunnelPausePeriod] = "100ms"
+	applyParameters[parameters.FetchRemoteServerListRetryPeriod] = "250ms"
+	applyParameters[parameters.FetchUpgradeRetryPeriod] = "250ms"
+	applyParameters[parameters.EstablishTunnelPausePeriod] = "250ms"
 
 	applyParameters[parameters.LimitTunnelProtocols] = protocol.TunnelProtocols{runConfig.protocol}
 

+ 1 - 1
psiphon/remoteServerList_test.go

@@ -373,7 +373,7 @@ func testObfuscatedRemoteServerLists(t *testing.T, omitMD5Sums bool) {
         "PropagationChannelId" : "0",
         "ConnectionPoolSize" : 1,
         "EstablishTunnelPausePeriodSeconds" : 1,
-        "FetchRemoteServerListRetryPeriodMilliseconds" : 100,
+        "FetchRemoteServerListRetryPeriodMilliseconds" : 250,
 		"RemoteServerListSignaturePublicKey" : "%s",
 		"RemoteServerListUrl" : "%s",
 		"RemoteServerListDownloadFilename" : "%s",