c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(psiphon): increase the maximum runtime to 300s (#596)

Browse Source 
See: https://github.com/ooni/probe/issues/1856.

This diff will need to be backported to release/3.11.
This commit is contained in:
Simone Basso 2021-11-15 12:43:19 +01:00 committed by GitHub
parent 5a481b395a
commit c527ca1f61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/engine/experiment/psiphon/psiphon.go
View File

@ -16,7 +16,7 @@ import (
const ( const (
testName = "psiphon" testName = "psiphon"
testVersion = "0.5.0" testVersion = "0.5.1"
) )
// Config contains the experiment's configuration. // Config contains the experiment's configuration.
@ -70,7 +70,7 @@ func (m *Measurer) Run(
ctx context.Context, sess model.ExperimentSession, ctx context.Context, sess model.ExperimentSession,
measurement *model.Measurement, callbacks model.ExperimentCallbacks, measurement *model.Measurement, callbacks model.ExperimentCallbacks,
) error { ) error {
const maxruntime = 60 const maxruntime = 300
ctx, cancel := context.WithTimeout(ctx, maxruntime*time.Second) ctx, cancel := context.WithTimeout(ctx, maxruntime*time.Second)
var ( var (
wg sync.WaitGroup wg sync.WaitGroup

2
internal/engine/experiment/psiphon/psiphon_test.go
View File

@ -23,7 +23,7 @@ func TestNewExperimentMeasurer(t *testing.T) {
if measurer.ExperimentName() != "psiphon" { if measurer.ExperimentName() != "psiphon" {
t.Fatal("unexpected name") t.Fatal("unexpected name")
} }
if measurer.ExperimentVersion() != "0.5.0" { if measurer.ExperimentVersion() != "0.5.1" {
t.Fatal("unexpected version") t.Fatal("unexpected version")
} }
} }