Ensure a distinct client platform value for tests using an external config

psiphon/controller_test.go

@@ -45,6 +45,8 @@ import (
 	"github.com/elazarl/goproxy/ext/auth"
 )
 
+const testClientPlatform = "test_github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon"
+
 func TestMain(m *testing.M) {
 	flag.Parse()
 
@@ -512,6 +514,7 @@ func controllerRun(t *testing.T, runConfig *controllerRunConfig) {
 
 	var modifyConfig map[string]interface{}
 	json.Unmarshal(configJSON, &modifyConfig)
+
 	modifyConfig["DataRootDirectory"] = testDataDirName
 
 	if runConfig.protocol != "" {
@@ -555,6 +558,10 @@ func controllerRun(t *testing.T, runConfig *controllerRunConfig) {
 		t.Fatalf("error processing configuration file: %s", err)
 	}
 
+	if config.ClientPlatform == "" {
+		config.ClientPlatform = testClientPlatform
+	}
+
 	if runConfig.clientIsLatestVersion {
 		config.ClientVersion = "999999999"
 	}

psiphon/feedback_test.go

@@ -55,10 +55,15 @@ func TestFeedbackUpload(t *testing.T) {
 		t.Fatalf("error loading configuration file: %s", err)
 	}
 
+	if config.ClientPlatform == "" {
+		config.ClientPlatform = testClientPlatform
+	}
+
 	testDataDirName, err := ioutil.TempDir("", "psiphon-feedback-test")
 	if err != nil {
 		t.Fatalf("TempDir failed: %s", err)
 	}
+
 	config.DataRootDirectory = testDataDirName
 
 	err = config.Commit(true)

psiphon/tactics_test.go

@@ -45,6 +45,7 @@ func TestStandAloneGetTactics(t *testing.T) {
 
 	var modifyConfig map[string]interface{}
 	json.Unmarshal(configJSON, &modifyConfig)
+
 	modifyConfig["DataRootDirectory"] = testDataDirName
 
 	configJSON, _ = json.Marshal(modifyConfig)
@@ -54,6 +55,10 @@ func TestStandAloneGetTactics(t *testing.T) {
 		t.Fatalf("error processing configuration file: %s", err)
 	}
 
+	if config.ClientPlatform == "" {
+		config.ClientPlatform = testClientPlatform
+	}
+
 	err = config.Commit(false)
 	if err != nil {
 		t.Fatalf("error committing configuration file: %s", err)