From 5823724e55c95d8445db165ff792f2dae7a961be Mon Sep 17 00:00:00 2001 From: Simone Basso Date: Fri, 22 Nov 2019 09:13:04 +0000 Subject: [PATCH] Update well know OONI hosts we use 1. make sure we use the canonical `{bouncer,orchestrate}.ooni.io` for bouncer and for orchestra (it was already the case): ``` orchestra/testlists/testlists.go: DefaultBaseURL = "https://orchestrate.ooni.io" session/session.go: Address: "https://bouncer.ooni.io", ``` 2. make sure we use `ps-test.ooni.io` for everything test related: ``` bouncer/bouncer_test.go: BaseURL: "https://ps-test.ooni.io/", collector/collector_test.go: BaseURL: "https://ps-test.ooni.io/", session/session_test.go: sess.AddAvailableHTTPSBouncer("https://ps-test.ooni.io") session/session_test.go: sess.AddAvailableHTTPSCollector("https://ps-test.ooni.io") ``` Prompted by https://github.com/measurement-kit/measurement-kit/issues/1896 --- bouncer/bouncer_test.go | 2 +- collector/collector_test.go | 2 +- session/session_test.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bouncer/bouncer_test.go b/bouncer/bouncer_test.go index 4d479ac4..63033144 100644 --- a/bouncer/bouncer_test.go +++ b/bouncer/bouncer_test.go @@ -11,7 +11,7 @@ import ( func makeClient() *bouncer.Client { return &bouncer.Client{ - BaseURL: "https://bouncer.ooni.io/", + BaseURL: "https://ps-test.ooni.io/", HTTPClient: http.DefaultClient, Logger: log.Log, UserAgent: "ooniprobe-engine/0.1.0", diff --git a/collector/collector_test.go b/collector/collector_test.go index fa49b6fe..7cb57b39 100644 --- a/collector/collector_test.go +++ b/collector/collector_test.go @@ -39,7 +39,7 @@ func makeMeasurement(rt collector.ReportTemplate, ID string) model.Measurement { func makeClient() *collector.Client { return &collector.Client{ - BaseURL: "https://a.collector.ooni.io/", + BaseURL: "https://ps-test.ooni.io/", HTTPClient: http.DefaultClient, Logger: log.Log, UserAgent: "ooniprobe-engine/0.1.0", diff --git a/session/session_test.go b/session/session_test.go index 6b2d11f0..789f8676 100644 --- a/session/session_test.go +++ b/session/session_test.go @@ -29,7 +29,7 @@ func TestIntegration(t *testing.T) { Address: "http://foobar.onion", Type: "onion", }) - sess.AddAvailableHTTPSBouncer("https://bouncer.ooni.io") + sess.AddAvailableHTTPSBouncer("https://ps-test.ooni.io") if len(sess.AvailableBouncers) != 2 { t.Fatal("unexpected size of available bouncers") } @@ -38,7 +38,7 @@ func TestIntegration(t *testing.T) { Address: "http://foobar.onion", Type: "onion", }) - sess.AddAvailableHTTPSCollector("https://b.collector.ooni.io") + sess.AddAvailableHTTPSCollector("https://ps-test.ooni.io") if len(sess.AvailableCollectors) != 2 { t.Fatal("unexpected size of available collectors") }