Merge pull request #31 from gustavosbarreto/master

PollState: change to update-check state after ticks are delivered

states.go

@@ -185,20 +185,20 @@ func (state *PollState) Handle(uh *UpdateHub) (State, bool) {
 	go func() {
 		ticks := state.ticksCount
 
+	polling:
 		for {
-			if ticks > 0 && ticks%int64(state.interval/uh.timeStep) == 0 {
-				nextState = NewUpdateCheckState()
-				break
-			}
-
 			ticker := time.NewTicker(uh.timeStep)
-			ticks++
 
 			defer ticker.Stop()
 
 			select {
 			case <-ticker.C:
-				continue
+				ticks++
+
+				if ticks > 0 && ticks%int64(state.interval/uh.timeStep) == 0 {
+					nextState = NewUpdateCheckState()
+					break polling
+				}
 			case <-state.cancel:
 				break
 			}

states_test.go

@@ -215,14 +215,14 @@ func TestPolling(t *testing.T) {
 		expectedElapsedTime time.Duration
 	}{
 		{
-			"Now",
+			"NextRegularPollFromNow",
 			10 * time.Second,
 			now,
-			0,
+			10 * time.Second,
 		},
 
 		{
-			"NextRegularPoll",
+			"NextRegularPollFromPast",
 			30 * time.Second,
 			now.Add(-15 * time.Second),
 			15 * time.Second,
@@ -245,7 +245,7 @@ func TestPolling(t *testing.T) {
 						C: c,
 					}
 
-					c <- time.Now().Add(elapsed * time.Second)
+					c <- now.Add(elapsed)
 
 					return ticker
 				})