Commit cfd1c41b authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent a22c8d74
...@@ -44,14 +44,14 @@ import ( ...@@ -44,14 +44,14 @@ import (
// Create it with tNewCluster. // Create it with tNewCluster.
// Create nodes with .NewMaster, .NewStorage and .NewClient. // Create nodes with .NewMaster, .NewStorage and .NewClient.
// //
// NOTE about network addresses being predictable due to using pipenet/lonet for inter-networking. // NOTE network addresses are predictable due to using pipenet/lonet for inter-networking.
// //
// XXX text about events tracing // XXX text about events tracing
type tCluster struct { type tCluster struct {
*tracetest.T // original testing env this cluster was created at *tracetest.T // original testing env this cluster was created at
name string // name of the cluster name string // name of the cluster
network *virtnet.SubNetwork // nodes interoperate via netowrk network *virtnet.SubNetwork // nodes interoperate via network
gotracer *TraceCollector // for tracing go nodes XXX -> GoTracer gotracer *TraceCollector // for tracing go nodes XXX -> GoTracer
//tpy *PyTracer // for tracing py nodes //tpy *PyTracer // for tracing py nodes
...@@ -248,7 +248,7 @@ func (t *tCluster) NewMaster(name string) ITestMaster { ...@@ -248,7 +248,7 @@ func (t *tCluster) NewMaster(name string) ITestMaster {
return m return m
} }
// Master returns master node that was previouslt created via NewMaster(name). // Master returns master node that was previously created via NewMaster(name).
func (t *tCluster) Master(name string) ITestMaster { func (t *tCluster) Master(name string) ITestMaster {
tnode := t.getNode(name) tnode := t.getNode(name)
m, ok := tnode.itest.(ITestMaster) m, ok := tnode.itest.(ITestMaster)
...@@ -358,16 +358,13 @@ func (m *tMaster) Run(ctx context.Context) error { ...@@ -358,16 +358,13 @@ func (m *tMaster) Run(ctx context.Context) error {
func tNewCluster_MS(t0 *tracetest.T, name string, Sback storage.Backend) *tCluster { func tNewCluster_MS(t0 *tracetest.T, name string, Sback storage.Backend) *tCluster {
t := tNewCluster(t0, name) t := tNewCluster(t0, name)
t.NewMaster("m") t.NewMaster("m")
t.NewStorage("s", "m:1", Sback)
// NOTE all network addresses are predictable
// M starts listening // M starts listening
t.Expect("m", netlisten("m:1")) t.Expect("m", netlisten("m:1"))
t.Expect("m", δnode("m", "m:1", proto.MASTER, 1, proto.RUNNING, proto.IdTimeNone)) t.Expect("m", δnode("m", "m:1", proto.MASTER, 1, proto.RUNNING, proto.IdTimeNone))
t.Expect("m", clusterState("m", proto.ClusterRecovering)) t.Expect("m", clusterState("m", proto.ClusterRecovering))
t.NewStorage("s", "m:1", Sback)
// S starts listening // S starts listening
t.Expect("s", netlisten("s:1")) t.Expect("s", netlisten("s:1"))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment