Skip to content

Commit

Permalink
[backport] fix(psiphon): increase the maximum runtime to 300s (#596) (#…
Browse files Browse the repository at this point in the history
…597)

This diff backports c527ca1.

Here's the original commit message:

- - -

See: ooni/probe#1856.

This diff will need to be backported to release/3.11.
  • Loading branch information
bassosimone authored Nov 15, 2021
1 parent de6d7f7 commit 6db2ea4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions internal/engine/experiment/psiphon/psiphon.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (

const (
testName = "psiphon"
testVersion = "0.5.0"
testVersion = "0.5.1"
)

// Config contains the experiment's configuration.
Expand Down Expand Up @@ -70,7 +70,7 @@ func (m *Measurer) Run(
ctx context.Context, sess model.ExperimentSession,
measurement *model.Measurement, callbacks model.ExperimentCallbacks,
) error {
const maxruntime = 60
const maxruntime = 300
ctx, cancel := context.WithTimeout(ctx, maxruntime*time.Second)
var (
wg sync.WaitGroup
Expand Down
2 changes: 1 addition & 1 deletion internal/engine/experiment/psiphon/psiphon_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func TestNewExperimentMeasurer(t *testing.T) {
if measurer.ExperimentName() != "psiphon" {
t.Fatal("unexpected name")
}
if measurer.ExperimentVersion() != "0.5.0" {
if measurer.ExperimentVersion() != "0.5.1" {
t.Fatal("unexpected version")
}
}
Expand Down

0 comments on commit 6db2ea4

Please sign in to comment.