Use static list of keys in model

Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
Co-authored-by: Nont <9658731+nwnt@users.noreply.github.com>

Author: serathius

tests/robustness/model/describe.go

@@ -85,7 +85,15 @@ func describeEtcdState(state EtcdState) string {
 
 	descHTML = append(descHTML, fmt.Sprintf("<p style=\"margin: 0.25em 0;\">state, rev: %d, compactRev: %d</p>", state.Revision, state.CompactRevision))
 
-	if len(state.KeyValues) > 0 {
+	keys := []string{}
+	for i, v := range state.KeyValues {
+		if v == nil {
+			continue
+		}
+		keys = append(keys, state.Keys[i])
+	}
+
+	if len(keys) > 0 {
 		descHTML = append(descHTML, "keys: <ul style=\"margin: 0.25em 0;\">")
 
 		keys, values, leases := state.KeysValueLeases()
@@ -99,12 +107,13 @@ func describeEtcdState(state EtcdState) string {
 			if value.Value.Hash != 0 {
 				descHTML = append(descHTML, fmt.Sprintf("hash: %d, ", value.Value.Hash))
 			}
+			descHTML = append(descHTML, fmt.Sprintf("mod: %d, ver: %d", value.ModRevision, value.Version))
 			lease := leases[i]
 			if lease != 0 {
-				descHTML = append(descHTML, fmt.Sprintf("lease: %d, ", lease))
+				descHTML = append(descHTML, fmt.Sprintf(", lease: %d", lease))
 			}
 
-			descHTML = append(descHTML, fmt.Sprintf("mod: %d, ver: %d</li>", value.ModRevision, value.Version))
+			descHTML = append(descHTML, "</li>")
 		}
 
 		descHTML = append(descHTML, "</ul>")

tests/robustness/model/describe_test.go

@@ -18,6 +18,7 @@ import (
 	"errors"
 	"testing"
 
+	"github.com/anishathalye/porcupine"
 	"github.com/stretchr/testify/assert"
 
 	"go.etcd.io/etcd/api/v3/mvccpb"
@@ -170,8 +171,13 @@ func TestModelDescribe(t *testing.T) {
 			expectDescribe: `range("key16".."key16b", limit=2) -> [], count: 0, rev: 16`,
 		},
 	}
+	ops := []porcupine.Operation{}
 	for _, tc := range tcs {
-		assert.Equal(t, tc.expectDescribe, NonDeterministicModel.DescribeOperation(tc.req, tc.resp))
+		ops = append(ops, porcupine.Operation{Input: tc.req, Output: tc.resp})
+	}
+	model := NonDeterministicModel(ModelKeys(ops))
+	for _, tc := range tcs {
+		assert.Equal(t, tc.expectDescribe, model.DescribeOperation(tc.req, tc.resp))
 	}
 }