Start tests of the HTTP monitor

geodns.go

@@ -133,14 +133,13 @@ func main() {
 
 	inter := getInterfaces()
 
-	go monitor()
-
-	dirName := *flagconfig
-
 	Zones := make(Zones)
 
+	go monitor(Zones)
+
 	setupPgeodnsZone(Zones)
 
+	dirName := *flagconfig
 	go zonesReader(dirName, Zones)
 
 	for _, host := range inter {

monitor.go

@@ -149,14 +149,14 @@ func logStatus() {
 	}
 }
 
-func monitor() {
+func monitor(zones Zones) {
 	go logStatus()
 
 	if len(*flaghttp) == 0 {
 		return
 	}
 	go hub.run()
-	go httpHandler()
+	go httpHandler(zones)
 
 	lastQueryCount := expVarToInt64(qCounter)
 
@@ -251,7 +251,7 @@ func StatusServer(w http.ResponseWriter, req *http.Request) {
 	io.WriteString(w, `</body></html>`)
 }
 
-func httpHandler() {
+func httpHandler(zones Zones) {
 	http.Handle("/monitor", websocket.Handler(wsHandler))
 	http.HandleFunc("/status", StatusServer)
 	http.HandleFunc("/", MainServer)

monitor_test.go

@@ -0,0 +1,35 @@
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+	. "launchpad.net/gocheck"
+	"net/http"
+	"time"
+)
+
+type MonitorSuite struct {
+	zones Zones
+}
+
+var _ = Suite(&MonitorSuite{})
+
+func (s *MonitorSuite) SetUpSuite(c *C) {
+	s.zones = make(Zones)
+
+	fmt.Println("Starting http server")
+
+	zonesReadDir("dns", s.zones)
+	go httpHandler(s.zones)
+	time.Sleep(500 * time.Millisecond)
+}
+
+func (s *MonitorSuite) TestMonitorVersion(c *C) {
+	c.Check(true, DeepEquals, true)
+
+	res, err := http.Get("http://localhost:8053/version")
+	c.Assert(err, IsNil)
+	page, _ := ioutil.ReadAll(res.Body)
+	c.Check(string(page), Matches, ".*<title>GeoDNS [0-9].*")
+
+}