Skip to content

Commit

Permalink
Merge branch 'issue/2553' of github.com:ooni/probe-cli into issue/2553
Browse files Browse the repository at this point in the history
  • Loading branch information
bassosimone committed Oct 11, 2023
2 parents 931ccec + 4a37501 commit 54b5191
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion internal/registry/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ func NewFactory(name string, kvStore model.KeyValueStore, logger model.Logger) (
// Note: check-in flags expire after 24h.
//
// TODO(https://github.com/ooni/probe/issues/2554): we need to restructure
// of we run experiments to make sure check-in flags are always fresh.
// how we run experiments to make sure check-in flags are always fresh.
if factory.enabledByDefault {
return factory, nil // enabled by default
}
Expand Down
8 changes: 4 additions & 4 deletions internal/registry/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@ func TestNewFactory(t *testing.T) {
t.Log("experimentName:", tc.experimentName)

// get experiment expectations -- note that here we must canonicalize the
// experiment name otherwise we won't find it into the map
// experiment name otherwise we won't find it into the map when testing non-canonical names
expectations := expectationsMap[CanonicalizeExperimentName(tc.experimentName)]
if expectations == nil {
t.Fatal("no expectations for", tc.experimentName)
Expand Down Expand Up @@ -678,12 +678,12 @@ func TestNewFactory(t *testing.T) {
t.Fatal(tc.experimentName, ": expected", expectations.inputPolicy, "got", v)
}

// make sure the interrupted value is the expected one
// make sure the interruptible value is the expected one
if v := factory.Interruptible(); v != expectations.interruptible {
t.Fatal(tc.experimentName, ": expected", expectations.interruptible, "got", v)
}

// make sure we can creare the measurer
// make sure we can create the measurer
measurer := factory.NewExperimentMeasurer()
if measurer == nil {
t.Fatal("expected non-nil measurer, got nil")
Expand Down Expand Up @@ -724,7 +724,7 @@ func TestNewFactory(t *testing.T) {
t.Fatal("expected interruptible to be false")
}

// make sure we can creare the measurer
// make sure we can create the measurer
measurer := factory.NewExperimentMeasurer()
if measurer == nil {
t.Fatal("expected non-nil measurer, got nil")
Expand Down
2 changes: 1 addition & 1 deletion internal/version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
package version

// Version is the ooniprobe version.
const Version = "3.19.0-alpha"
const Version = "3.20.0-alpha"

0 comments on commit 54b5191

Please sign in to comment.