-: fix autohosts tests on Windows

util/auto_hosts_test.go

@@ -17,38 +17,73 @@ func prepareTestDir() string {
 	return dir
 }
 
-func TestAutoHosts(t *testing.T) {
+func TestAutoHostsResolution(t *testing.T) {
 	ah := AutoHosts{}
 
 	dir := prepareTestDir()
 	defer func() { _ = os.RemoveAll(dir) }()
 
 	f, _ := ioutil.TempFile(dir, "")
-	defer os.Remove(f.Name())
+	defer func() { _ = os.Remove(f.Name()) }()
 	defer f.Close()
 
 	_, _ = f.WriteString("  127.0.0.1   host  localhost  \n")
-
 	ah.Init(f.Name())
-	ah.Start()
-	// wait until we parse the file
-	time.Sleep(50 * time.Millisecond)
 
+	// Update from the hosts file
+	ah.updateHosts()
+
+	// Existing host
 	ips := ah.Process("localhost")
-	assert.True(t, ips[0].Equal(net.ParseIP("127.0.0.1")))
-	ips = ah.Process("newhost")
-	assert.True(t, ips == nil)
+	assert.NotNil(t, ips)
+	assert.Equal(t, 1, len(ips))
+	assert.Equal(t, net.ParseIP("127.0.0.1"), ips[0])
 
+	// Unknown host
+	ips = ah.Process("newhost")
+	assert.Nil(t, ips)
+
+	// Test hosts file
 	table := ah.List()
 	ips, _ = table["host"]
-	assert.True(t, ips[0].String() == "127.0.0.1")
+	assert.NotNil(t, ips)
+	assert.Equal(t, 1, len(ips))
+	assert.Equal(t, "127.0.0.1", ips[0].String())
+}
 
+func TestAutoHostsFSNotify(t *testing.T) {
+	ah := AutoHosts{}
+
+	dir := prepareTestDir()
+	defer func() { _ = os.RemoveAll(dir) }()
+
+	f, _ := ioutil.TempFile(dir, "")
+	defer func() { _ = os.Remove(f.Name()) }()
+	defer f.Close()
+
+	// Init
+	_, _ = f.WriteString("  127.0.0.1   host  localhost  \n")
+	ah.Init(f.Name())
+	ah.updateHosts()
+
+	// Unknown host
+	ips := ah.Process("newhost")
+	assert.Nil(t, ips)
+
+	// Stat monitoring for changes
+	ah.Start()
+	defer ah.Close()
+
+	// Update file
 	_, _ = f.WriteString("127.0.0.2   newhost\n")
+	_ = f.Sync()
+
 	// wait until fsnotify has triggerred and processed the file-modification event
 	time.Sleep(50 * time.Millisecond)
 
+	// Check if we are notified about changes
 	ips = ah.Process("newhost")
-	assert.True(t, ips[0].Equal(net.ParseIP("127.0.0.2")))
-
-	ah.Close()
+	assert.NotNil(t, ips)
+	assert.Equal(t, 1, len(ips))
+	assert.Equal(t, "127.0.0.2", ips[0].String())
 }