@@ -17,12 +17,10 @@ package concurrency_test
17
17
import (
18
18
"context"
19
19
"log"
20
+ "strings"
20
21
"testing"
21
-
22
22
"time"
23
23
24
- "strings"
25
-
26
24
"go.etcd.io/etcd/clientv3"
27
25
"go.etcd.io/etcd/clientv3/concurrency"
28
26
)
@@ -36,25 +34,27 @@ func TestResumeElection(t *testing.T) {
36
34
}
37
35
defer cli .Close ()
38
36
39
- s , err := concurrency .NewSession (cli )
37
+ var s * concurrency.Session
38
+ s , err = concurrency .NewSession (cli )
40
39
if err != nil {
41
40
log .Fatal (err )
42
41
}
43
42
defer s .Close ()
44
43
45
44
e := concurrency .NewElection (s , prefix )
46
45
47
- // Entire test should never take more than 10 seconds
46
+ // entire test should never take more than 10 seconds
48
47
ctx , cancel := context .WithTimeout (context .Background (), time .Second * 10 )
49
48
defer cancel ()
50
49
51
- // Become leader
52
- if err : = e .Campaign (ctx , "candidate1" ); err != nil {
50
+ // become leader
51
+ if err = e .Campaign (ctx , "candidate1" ); err != nil {
53
52
t .Fatalf ("Campaign() returned non nil err: %s" , err )
54
53
}
55
54
56
- // Get the leadership details of the current election
57
- leader , err := e .Leader (ctx )
55
+ // get the leadership details of the current election
56
+ var leader * clientv3.GetResponse
57
+ leader , err = e .Leader (ctx )
58
58
if err != nil {
59
59
t .Fatalf ("Leader() returned non nil err: %s" , err )
60
60
}
@@ -83,34 +83,34 @@ func TestResumeElection(t *testing.T) {
83
83
}
84
84
}()
85
85
86
- // Wait until observe goroutine is running
86
+ // wait until observe goroutine is running
87
87
<- respChan
88
88
89
- // Put some random data to generate a change event, this put should be
89
+ // put some random data to generate a change event, this put should be
90
90
// ignored by Observe() because it is not under the election prefix.
91
91
_ , err = cli .Put (ctx , "foo" , "bar" )
92
92
if err != nil {
93
93
t .Fatalf ("Put('foo') returned non nil err: %s" , err )
94
94
}
95
95
96
- // Resign as leader
96
+ // resign as leader
97
97
if err := e .Resign (ctx ); err != nil {
98
98
t .Fatalf ("Resign() returned non nil err: %s" , err )
99
99
}
100
100
101
- // Elect a different candidate
101
+ // elect a different candidate
102
102
if err := e .Campaign (ctx , "candidate2" ); err != nil {
103
103
t .Fatalf ("Campaign() returned non nil err: %s" , err )
104
104
}
105
105
106
- // Wait for observed leader change
106
+ // wait for observed leader change
107
107
resp := <- respChan
108
108
109
109
kv := resp .Kvs [0 ]
110
110
if ! strings .HasPrefix (string (kv .Key ), prefix ) {
111
- t .Errorf ("expected observed election to have prefix '%s' got '%s' " , prefix , string (kv .Key ))
111
+ t .Errorf ("expected observed election to have prefix '%s' got %q " , prefix , string (kv .Key ))
112
112
}
113
113
if string (kv .Value ) != "candidate2" {
114
- t .Errorf ("expected new leader to be 'candidate1' got '%s' " , string (kv .Value ))
114
+ t .Errorf ("expected new leader to be 'candidate1' got %q " , string (kv .Value ))
115
115
}
116
116
}
0 commit comments