Merge pull request #282 from nats-io/monitor_flapper

Monitor flapper

server/monitor_test.go

@@ -8,7 +8,6 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/url"
-	"runtime"
 	"strings"
 	"testing"
 	"time"
@@ -358,9 +357,11 @@ func TestConnzLastActivity(t *testing.T) {
 
 	nc := createClientConnSubscribeAndPublish(t)
 	defer nc.Close()
+	nc.Flush()
 
 	nc2 := createClientConnSubscribeAndPublish(t)
 	defer nc2.Close()
+	nc2.Flush()
 
 	pollConz := func() *Connz {
 		url := fmt.Sprintf("http://localhost:%d/", MONITOR_PORT)
@@ -432,11 +433,9 @@ func TestConnzLastActivity(t *testing.T) {
 		t.Fatalf("Un-subscribe should have triggered update to LastActivity\n")
 	}
 
-	// On Windows, looks like the precision is too low, and if we
-	// don't wait, first and last would be equal.
-	if runtime.GOOS == "windows" {
-		time.Sleep(100 * time.Millisecond)
-	}
+	// Just wait a bit to make sure that there is a difference
+	// between first and last.
+	time.Sleep(100 * time.Millisecond)
 
 	// Message delivery should trigger as well
 	nc2.Publish("foo", []byte("Hello"))