Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 4 commits into from
Aug 6, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5199059
refactor: remove dnscheck loader
DecFox Aug 6, 2024
41b400e
fix: change ams-pg to backend-hel
DecFox Aug 6, 2024
98885a6
Merge branch 'master' into fix/broken-backend
DecFox Aug 6, 2024
d887234
fix: add TODO for failing test
DecFox Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion internal/engine/inputloader_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{},
Expand All @@ -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)
}
Expand Down
8 changes: 4 additions & 4 deletions internal/engine/session_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion internal/experiment/webconnectivity/webconnectivity_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion internal/probeservices/checkin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion internal/probeservices/probeservices_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/oonimkall/session_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion pkg/oonimkall/webconnectivity_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading