From 73600c1ecc88d1bdf75a3ae1b64f0fb74870f57d Mon Sep 17 00:00:00 2001 From: decfox Date: Mon, 10 Feb 2025 17:36:21 +0530 Subject: [PATCH] fix: remove unrequired tests; add new tests --- internal/engine/session_integration_test.go | 44 ++++----------------- 1 file changed, 8 insertions(+), 36 deletions(-) diff --git a/internal/engine/session_integration_test.go b/internal/engine/session_integration_test.go index 629a70a25..011334050 100644 --- a/internal/engine/session_integration_test.go +++ b/internal/engine/session_integration_test.go @@ -438,56 +438,28 @@ func TestUserAgentNoProxy(t *testing.T) { } } -func TestNewOrchestraClientMaybeLookupBackendsFailure(t *testing.T) { +func TestNewOrchestraClientProbeServicesSuccess(t *testing.T) { if testing.Short() { t.Skip("skip test in short mode") } - errMocked := errors.New("mocked error") sess := newSessionForTestingNoLookups(t) - sess.testMaybeLookupBackendsContext = func(ctx context.Context) error { - return errMocked - } - client, err := sess.newOrchestraClient(context.Background(), "https://api.dev.ooni.io") - if !errors.Is(err, errMocked) { - t.Fatal("not the error we expected", err) - } - if client != nil { - t.Fatal("expected nil client here") + _, err := sess.newOrchestraClient(context.Background(), "https://api.dev.ooni.io") + if err != nil { + t.Fatal(err) } } -func TestNewOrchestraClientMaybeLookupLocationFailure(t *testing.T) { +func TestNewOrchestraClientProbeServicesFailure(t *testing.T) { if testing.Short() { t.Skip("skip test in short mode") } - errMocked := errors.New("mocked error") sess := newSessionForTestingNoLookups(t) - sess.testMaybeLookupLocationContext = func(ctx context.Context) error { - return errMocked - } - client, err := sess.newOrchestraClient(context.Background(), "https://api.dev.ooni.io") - if !errors.Is(err, errMocked) { - t.Fatalf("not the error we expected: %+v", err) - } + client, err := sess.newOrchestraClient(context.Background(), "https://api.stage.ooni.io") if client != nil { t.Fatal("expected nil client here") } -} - -func TestNewOrchestraClientProbeServicesNewClientFailure(t *testing.T) { - if testing.Short() { - t.Skip("skip test in short mode") - } - sess := newSessionForTestingNoLookups(t) - sess.selectedProbeServiceHook = func(svc *model.OOAPIService) { - svc.Type = "antani" // should really not be supported for a long time - } - client, err := sess.newOrchestraClient(context.Background(), "https://api.dev.ooni.io") - if !errors.Is(err, probeservices.ErrUnsupportedServiceType) { - t.Fatal("not the error we expected") - } - if client != nil { - t.Fatal("expected nil client here") + if err == nil { + t.Fatal("expected non-nil error here") } }