@@ -110,8 +110,9 @@ func getIntegrationTest(numNodes, numVotes int) func(*testing.T) {
110110 err = closeElection (m , electionID , adminID )
111111 require .NoError (t , err )
112112
113- waitForStatus (t , types .Closed , electionFac , electionID , nodes , numNodes ,
113+ err = waitForStatus (types .Closed , electionFac , electionID , nodes , numNodes ,
114114 5 * time .Second )
115+ require .NoError (t , err )
115116
116117 // ##### SHUFFLE BALLOTS #####
117118 t .Logf ("initializing shuffle" )
@@ -124,8 +125,9 @@ func getIntegrationTest(numNodes, numVotes int) func(*testing.T) {
124125 err = sActor .Shuffle (electionID )
125126 require .NoError (t , err )
126127
127- waitForStatus (t , types .ShuffledBallots , electionFac , electionID , nodes ,
128+ err = waitForStatus (types .ShuffledBallots , electionFac , electionID , nodes ,
128129 numNodes , 2 * time .Second * time .Duration (numNodes ))
130+ require .NoError (t , err )
129131
130132 // ##### SUBMIT PUBLIC SHARES #####
131133 t .Logf ("submitting public shares" )
@@ -135,8 +137,9 @@ func getIntegrationTest(numNodes, numVotes int) func(*testing.T) {
135137 err = actor .ComputePubshares ()
136138 require .NoError (t , err )
137139
138- waitForStatus (t , types .PubSharesSubmitted , electionFac , electionID , nodes ,
140+ err = waitForStatus (types .PubSharesSubmitted , electionFac , electionID , nodes ,
139141 numNodes , 6 * time .Second * time .Duration (numNodes ))
142+ require .NoError (t , err )
140143
141144 // ##### DECRYPT BALLOTS #####
142145 t .Logf ("decrypting" )
@@ -147,8 +150,9 @@ func getIntegrationTest(numNodes, numVotes int) func(*testing.T) {
147150 err = decryptBallots (m , actor , election )
148151 require .NoError (t , err )
149152
150- waitForStatus (t , types .ResultAvailable , electionFac , electionID , nodes ,
153+ err = waitForStatus (types .ResultAvailable , electionFac , electionID , nodes ,
151154 numNodes , 1500 * time .Millisecond * time .Duration (numVotes ))
155+ require .NoError (t , err )
152156
153157 t .Logf ("get vote proof" )
154158 election , err = getElection (electionFac , electionID , nodes [0 ].GetOrdering ())
@@ -576,31 +580,40 @@ func encodeID(ID string) types.ID {
576580
577581// waitForStatus polls the nodes until they all updated to the expected status
578582// for the given election. An error is raised if the timeout expires.
579- func waitForStatus (t * testing.T , status types.Status , electionFac types.ElectionFactory ,
580- electionID []byte , nodes []dVotingCosiDela , numNodes int , timeOut time.Duration ) {
581- // set up a timer to fail the test in case we never reach the status
582- timer := time .NewTimer (timeOut )
583- go func () {
584- <- timer .C
585- t .Errorf ("timed out while waiting for status %d" , status )
586- }()
583+ func waitForStatus (status types.Status , electionFac types.ElectionFactory ,
584+ electionID []byte , nodes []dVotingCosiDela , numNodes int , timeOut time.Duration ) error {
585+
586+ expiration := time .Now ().Add (timeOut )
587587
588- isOK := func () bool {
588+ isOK := func () ( bool , error ) {
589589 for _ , node := range nodes {
590590 election , err := getElection (electionFac , electionID , node .GetOrdering ())
591- require .NoError (t , err )
591+ if err != nil {
592+ return false , xerrors .Errorf ("failed to get election: %v" , err )
593+ }
592594
593595 if election .Status != status {
594- return false
596+ return false , nil
595597 }
596598 }
597599
598- return true
600+ return true , nil
599601 }
600602
601- for ! isOK () {
603+ for {
604+ if time .Now ().After (expiration ) {
605+ return xerrors .New ("status check expired" )
606+ }
607+
608+ ok , err := isOK ()
609+ if err != nil {
610+ return xerrors .Errorf ("failed to check status: %v" , err )
611+ }
612+
613+ if ok {
614+ return nil
615+ }
616+
602617 time .Sleep (time .Millisecond * 100 )
603618 }
604-
605- timer .Stop ()
606619}
0 commit comments