Make Run() execute a variable number of actions

engine.go

@@ -59,7 +59,7 @@ type cmdline struct {
 
 func init() {
 	flag.IntVar(&flags.checks, "rapid.checks", 100, "rapid: number of checks to perform")
-	flag.IntVar(&flags.steps, "rapid.steps", 100, "rapid: number of state machine steps to perform")
+	flag.IntVar(&flags.steps, "rapid.steps", 30, "rapid: average number of Run actions to execute")
 	flag.StringVar(&flags.failfile, "rapid.failfile", "", "rapid: fail file to use to reproduce test failure")
 	flag.BoolVar(&flags.nofailfile, "rapid.nofailfile", false, "rapid: do not write fail files on test failures")
 	flag.Uint64Var(&flags.seed, "rapid.seed", 0, "rapid: PRNG seed to start with (0 to use a random one)")

statemachine.go

@@ -7,7 +7,6 @@
 package rapid
 
 import (
-	"math"
 	"reflect"
 	"sort"
 	"testing"
@@ -46,10 +45,10 @@ func (t *T) Run(actions map[string]func(*T)) {
 
 	steps := flags.steps
 	if testing.Short() {
-		steps /= 5
+		steps /= 2
 	}
 
-	repeat := newRepeat(0, steps, math.MaxInt, "Run")
+	repeat := newRepeat(-1, -1, float64(steps), "Run")
 	sm := stateMachine{
 		check:      check,
 		actionKeys: SampledFrom(actionKeys),