fix tests

ooni · Jul 31, 2024 · 922ded0 · 922ded0
1 parent 8844976
commit 922ded0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 19 deletions.
diff --git a/internal/experiment/openvpn/openvpn_test.go b/internal/experiment/openvpn/openvpn_test.go
@@ -41,7 +41,7 @@ func TestNewExperimentMeasurer(t *testing.T) {
 	if m.ExperimentName() != "openvpn" {
 		t.Fatal("invalid ExperimentName")
 	}
-	if m.ExperimentVersion() != "0.1.4" {
+	if m.ExperimentVersion() != "0.1.5" {
 		t.Fatal("invalid ExperimentVersion")
 	}
 }

diff --git a/internal/experiment/openvpn/richerinput.go b/internal/experiment/openvpn/richerinput.go
@@ -93,7 +93,7 @@ func (tl *targetLoader) Load(ctx context.Context) ([]model.ExperimentTarget, err
 		}
 	}
 
-	tl.session.Logger().Warn("Error fetching OpenVPN targets from backend")
+	tl.loader.Logger.Warnf("Error fetching OpenVPN targets from backend")
 
 	// Otherwise, attempt to load the static inputs from CLI and files
 	inputs, err := targetloading.LoadStatic(tl.loader)
@@ -120,7 +120,7 @@ func (tl *targetLoader) Load(ctx context.Context) ([]model.ExperimentTarget, err
 }
 
 func (tl *targetLoader) loadFromDefaultEndpoints() ([]model.ExperimentTarget, error) {
-	tl.session.Logger().Info("Using default OpenVPN endpoints")
+	tl.loader.Logger.Warnf("Using default OpenVPN endpoints")
 	targets := []model.ExperimentTarget{}
 	if udp, err := defaultOONIOpenVPNTargetUDP(); err == nil {
 		targets = append(targets,

diff --git a/internal/experiment/openvpn/richerinput_test.go b/internal/experiment/openvpn/richerinput_test.go
@@ -132,22 +132,6 @@ func TestTargetLoaderLoad(t *testing.T) {
 				},
 			},
 		},
-		{
-			name: "with just options",
-			options: &Config{
-				Provider: "riseupvpn",
-			},
-			loader: &targetloading.Loader{
-				ExperimentName: "openvpn",
-				InputPolicy:    model.InputOrQueryBackend,
-				Logger:         model.DiscardLogger,
-				Session:        &mocks.Session{},
-				StaticInputs:   []string{},
-				SourceFiles:    []string{},
-			},
-			expectErr:     nil,
-			expectTargets: nil,
-		},
 	}
 
 	for _, tc := range cases {