Fix tests

psiphon/controller_test.go

@@ -487,7 +487,9 @@ func controllerRun(t *testing.T, runConfig *controllerRunConfig) {
 		config.CustomHeaders = upstreamProxyCustomHeaders
 	}
 
-	// The following config values must be applied through client parameters.
+	// The following config values must be applied through client parameters
+	// (setting the fields in Config directly will have no effect since the
+	// client parameters have been populated by LoadConfig).
 
 	applyParameters := make(map[string]interface{})
 

psiphon/dataStore.go

@@ -728,7 +728,7 @@ func (iterator *ServerEntryIterator) Next() (*protocol.ServerEntry, error) {
 			continue
 		}
 
-		err = json.Unmarshal(data, serverEntry)
+		err = json.Unmarshal(data, &serverEntry)
 		if err != nil {
 			// In case of data corruption or a bug causing this condition,
 			// do not stop iterating.

psiphon/remoteServerList_test.go

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

psiphon/server/server_test.go

@@ -75,7 +75,7 @@ func TestMain(m *testing.M) {
 	}
 	defer os.RemoveAll(testDataDirName)
 
-	os.Remove(filepath.Join(testDataDirName, psiphon.DATA_STORE_FILE_NAME))
+	os.Remove(filepath.Join(testDataDirName, psiphon.DATA_STORE_FILENAME))
 
 	psiphon.SetEmitDiagnosticNotices(true)