fix(probeservices): replace ams-pg-test with backend-hel (#1641)

## Checklist - [x] I have read the [contribution guidelines](https://github.com/ooni/probe-cli/blob/master/CONTRIBUTING.md) - [ ] reference issue for this pull request:  - [ ] if you changed anything related to how experiments work and you need to reflect these changes in the ooni/spec repository, please link to the related ooni/spec pull request:  - [ ] if you changed code inside an experiment, make sure you bump its version number  ## Description This diff changes the `ams-pg-test.ooni.org` to `backend-hel.ooni.org` in the integration tests.
ooni · Aug 6, 2024 · 241808d · 241808d
1 parent 26a49ca
commit 241808d
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 10 deletions.
diff --git a/internal/engine/inputloader_integration_test.go b/internal/engine/inputloader_integration_test.go
@@ -23,7 +23,7 @@ func TestTargetLoaderInputOrQueryBackendWithNoInput(t *testing.T) {
 	}
 	sess, err := engine.NewSession(context.Background(), engine.SessionConfig{
 		AvailableProbeServices: []model.OOAPIService{{
-			Address: "https://ams-pg-test.ooni.org/",
+			Address: "https://backend-hel.ooni.org/",
 			Type:    "https",
 		}},
 		KVStore:         &kvstore.Memory{},
@@ -42,6 +42,8 @@ func TestTargetLoaderInputOrQueryBackendWithNoInput(t *testing.T) {
 	}
 	ctx := context.Background()
 	out, err := il.Load(ctx)
+	// TODO(decfox): it seems `backend-hel.ooni.org` returns a different response
+	// than intended which is why the test fails.
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/internal/engine/session_integration_test.go b/internal/engine/session_integration_test.go
@@ -94,7 +94,7 @@ func TestSessionTorArgsTorBinary(t *testing.T) {
 	}
 	sess, err := NewSession(context.Background(), SessionConfig{
 		AvailableProbeServices: []model.OOAPIService{{
-			Address: "https://ams-pg-test.ooni.org",
+			Address: "https://backend-hel.ooni.org",
 			Type:    "https",
 		}},
 		Logger:          model.DiscardLogger,
@@ -126,7 +126,7 @@ func TestSessionTorArgsTorBinary(t *testing.T) {
 func newSessionForTestingNoLookupsWithProxyURL(t *testing.T, URL *url.URL) *Session {
 	sess, err := NewSession(context.Background(), SessionConfig{
 		AvailableProbeServices: []model.OOAPIService{{
-			Address: "https://ams-pg-test.ooni.org",
+			Address: "https://backend-hel.ooni.org",
 			Type:    "https",
 		}},
 		Logger:          model.DiscardLogger,
@@ -179,7 +179,7 @@ func TestInitOrchestraClientMaybeRegisterError(t *testing.T) {
 	sess := newSessionForTestingNoLookups(t)
 	defer sess.Close()
 	clnt, err := probeservices.NewClient(sess, model.OOAPIService{
-		Address: "https://ams-pg-test.ooni.org/",
+		Address: "https://backend-hel.ooni.org/",
 		Type:    "https",
 	})
 	if err != nil {
@@ -204,7 +204,7 @@ func TestInitOrchestraClientMaybeLoginError(t *testing.T) {
 	sess := newSessionForTestingNoLookups(t)
 	defer sess.Close()
 	clnt, err := probeservices.NewClient(sess, model.OOAPIService{
-		Address: "https://ams-pg-test.ooni.org/",
+		Address: "https://backend-hel.ooni.org/",
 		Type:    "https",
 	})
 	if err != nil {

diff --git a/internal/experiment/webconnectivity/webconnectivity_test.go b/internal/experiment/webconnectivity/webconnectivity_test.go
@@ -225,7 +225,7 @@ func TestMeasureWithNoAvailableTestHelpers(t *testing.T) {
 func newsession(t *testing.T, lookupBackends bool) model.ExperimentSession {
 	sess, err := engine.NewSession(context.Background(), engine.SessionConfig{
 		AvailableProbeServices: []model.OOAPIService{{
-			Address: "https://ams-pg-test.ooni.org",
+			Address: "https://backend-hel.ooni.org",
 			Type:    "https",
 		}},
 		Logger:          log.Log,

diff --git a/internal/probeservices/checkin_test.go b/internal/probeservices/checkin_test.go
@@ -42,7 +42,7 @@ func TestCheckIn(t *testing.T) {
 		}
 
 		client := newclient()
-		client.BaseURL = "https://ams-pg-test.ooni.org" // use the test infra
+		client.BaseURL = "https://backend-hel.ooni.org" // use the test infra
 
 		ctx := context.Background()
 

diff --git a/internal/probeservices/probeservices_test.go b/internal/probeservices/probeservices_test.go
@@ -23,7 +23,7 @@ func newclient() *Client {
 			MockableLogger:     log.Log,
 		},
 		model.OOAPIService{
-			Address: "https://ams-pg-test.ooni.org/",
+			Address: "https://backend-hel.ooni.org/",
 			Type:    "https",
 		},
 	)

diff --git a/pkg/oonimkall/session_integration_test.go b/pkg/oonimkall/session_integration_test.go
@@ -21,7 +21,7 @@ func NewSessionForTestingWithAssetsDir(assetsDir string) (*oonimkall.Session, er
 	return oonimkall.NewSession(&oonimkall.SessionConfig{
 		AssetsDir:        assetsDir,
 		Logger:           log.Log,
-		ProbeServicesURL: "https://ams-pg-test.ooni.org/",
+		ProbeServicesURL: "https://backend-hel.ooni.org/",
 		SoftwareName:     "oonimkall-test",
 		SoftwareVersion:  "0.1.0",
 		StateDir:         "../testdata/oonimkall/state",

diff --git a/pkg/oonimkall/webconnectivity_test.go b/pkg/oonimkall/webconnectivity_test.go
@@ -156,7 +156,7 @@ func TestWebConnectivityRunnerWithNoError(t *testing.T) {
 func TestWebConnectivityRunWithCancelledContext(t *testing.T) {
 	sess, err := NewSession(&SessionConfig{
 		AssetsDir:        "../testdata/oonimkall/assets",
-		ProbeServicesURL: "https://ams-pg-test.ooni.org/",
+		ProbeServicesURL: "https://backend-hel.ooni.org/",
 		SoftwareName:     "oonimkall-test",
 		SoftwareVersion:  "0.1.0",
 		StateDir:         "../testdata/oonimkall/state",