Merge 14ac72e into cd770bb

ooni · Jul 23, 2020 · d2a4638 · d2a4638
2 parents cd770bb + 14ac72e
commit d2a4638
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 16 deletions.
diff --git a/go.mod b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/fatih/color v1.9.0
 	github.com/getsentry/raven-go v0.0.0-20190419175539-919484f041ea
 	github.com/mattn/go-colorable v0.1.7
-	github.com/ooni/probe-engine v0.15.1-0.20200721181038-57a29da91d2e
+	github.com/ooni/probe-engine v0.15.1
 	github.com/pkg/errors v0.9.1
 	github.com/rubenv/sql-migrate v0.0.0-20200616145509-8d140a17f351
 	gopkg.in/AlecAivazis/survey.v1 v1.8.8

diff --git a/go.sum b/go.sum
@@ -358,8 +358,8 @@ github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa
 github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/ooni/probe-engine v0.15.1-0.20200721181038-57a29da91d2e h1:7oO3J4AqWGJkX4sq/IY3lGXsBm2JqPREwPM8PyUpbuU=
-github.com/ooni/probe-engine v0.15.1-0.20200721181038-57a29da91d2e/go.mod h1:Gnn57oU1Sc1hUQamTPkjCO4pxWMJjl3rEVYY1LV1A6E=
+github.com/ooni/probe-engine v0.15.1 h1:bA4fZJBX6kG1TrSNfJXlZWM9X7abUn8K1M9xv8brYro=
+github.com/ooni/probe-engine v0.15.1/go.mod h1:Gnn57oU1Sc1hUQamTPkjCO4pxWMJjl3rEVYY1LV1A6E=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
 github.com/openconfig/gnmi v0.0.0-20190823184014-89b2bf29312c/go.mod h1:t+O9It+LKzfOAhKTT5O0ehDix+MTqbtT0T9t+7zzOvc=
 github.com/openconfig/reference v0.0.0-20190727015836-8dfd928c9696/go.mod h1:ym2A+zigScwkSEb/cVQB0/ZMpU3rqiH6X7WRRsxgOGw=

diff --git a/nettests/facebook_messenger.go b/nettests/facebook_messenger.go
@@ -12,9 +12,6 @@ func (h FacebookMessenger) Run(ctl *Controller) error {
 	if err != nil {
 		return err
 	}
-	if err := builder.SetOptionString("LogLevel", "INFO"); err != nil {
-		return err
-	}
 	return ctl.Run(builder, []string{""})
 }
 

diff --git a/nettests/http_header_field_manipulation.go b/nettests/http_header_field_manipulation.go
@@ -16,9 +16,6 @@ func (h HTTPHeaderFieldManipulation) Run(ctl *Controller) error {
 	if err != nil {
 		return err
 	}
-	if err := builder.SetOptionString("LogLevel", "INFO"); err != nil {
-		return err
-	}
 	return ctl.Run(builder, []string{""})
 }
 

diff --git a/nettests/http_invalid_request_line.go b/nettests/http_invalid_request_line.go
@@ -16,9 +16,6 @@ func (h HTTPInvalidRequestLine) Run(ctl *Controller) error {
 	if err != nil {
 		return err
 	}
-	if err := builder.SetOptionString("LogLevel", "INFO"); err != nil {
-		return err
-	}
 	return ctl.Run(builder, []string{""})
 }
 

diff --git a/nettests/whatsapp.go b/nettests/whatsapp.go
@@ -12,9 +12,6 @@ func (h WhatsApp) Run(ctl *Controller) error {
 	if err != nil {
 		return err
 	}
-	if err := builder.SetOptionString("LogLevel", "INFO"); err != nil {
-		return err
-	}
 	return ctl.Run(builder, []string{""})
 }
 

diff --git a/version/version.go b/version/version.go
@@ -3,7 +3,7 @@ package version
 
 const (
 	// Version is the software version
-	Version = "3.0.4"
+	Version = "3.0.5"
 
 	// UserAgent is the OONI user-agent header
 	UserAgent = "ooniprobe-desktop/" + Version