Merge 427ca18 into 1e8b482

internal/log/handlers/cli/results.go

@@ -71,8 +71,8 @@ var summarizers = map[string]func(uint64, uint64, string) []string{
 	},
 	"circumvention": func(totalCount uint64, anomalyCount uint64, ss string) []string {
 		return []string{
-			fmt.Sprintf("Detected: %v", anomalyCount > 0),
-			"",
+			fmt.Sprintf("%d tested", totalCount),
+			fmt.Sprintf("%d blocked", anomalyCount),
 			"",
 		}
 	},

nettests/psiphon.go

@@ -1,5 +1,7 @@
 package nettests
 
+import "github.com/pkg/errors"
+
 // Psiphon test implementation
 type Psiphon struct {
 }
@@ -17,14 +19,30 @@ func (h Psiphon) Run(ctl *Controller) error {
 
 // PsiphonTestKeys contains the test keys
 type PsiphonTestKeys struct {
-	IsAnomaly bool `json:"-"`
+	IsAnomaly     bool    `json:"-"`
+	BootstrapTime float64 `json:"bootstrap_time"`
+	Failure       string  `json:"failure"`
 }
 
 // GetTestKeys generates a summary for a test run
 func (h Psiphon) GetTestKeys(tk map[string]interface{}) (interface{}, error) {
-	return PsiphonTestKeys{
-		IsAnomaly: tk["failure"] != nil,
-	}, nil
+	var (
+		err error
+		ok  bool
+	)
+	testKeys := PsiphonTestKeys{IsAnomaly: false, Failure: ""}
+	if tk["failure"] != nil {
+		testKeys.IsAnomaly = true
+		testKeys.Failure, ok = tk["failure"].(string)
+		if !ok {
+			err = errors.Wrap(err, "failure key invalid")
+		}
+	}
+	testKeys.BootstrapTime, ok = tk["bootstrap_time"].(float64)
+	if !ok {
+		err = errors.Wrap(err, "bootstrap_time key invalid")
+	}
+	return testKeys, err
 }
 
 // LogSummary writes the summary to the standard output