Merge lp:~elopio/snappy/serve_daemon_test into lp:~snappy-dev/snappy/snappy-moved-to-github

[Leo Arias]

[Leo Arias (elopio)]

Seems not worth it. It's easier to test the daemon on the snappy system:
https://code.launchpad.net/~fgimenez/snappy/snapd_integration_test/+merge/270515

review: Disapprove

Unmerged revisions

651. By Leo Arias on 2015-09-09

Playing with the daemon.

=== modified file 'cmd/snapd/main.go'
--- cmd/snapd/main.go	2015-09-09 06:34:47 +0000
+++ cmd/snapd/main.go	2015-09-09 06:34:47 +0000
@@ -36,7 +36,18 @@
 	}
 }
 
+// XXX what are the alternatives here? use real systemd to run the binary? --elopio- 2015-09-09
+func fixListenPid() {
+	if os.Getenv("FIX_LISTEN_PID") != "" {
+		// HACK: real systemd would set LISTEN_PID before exec'ing but
+		// this is too difficult in golang for the purpose of a test.
+		// Do not do this in real code.
+		os.Setenv("LISTEN_PID", fmt.Sprintf("%d", os.Getpid()))
+	}
+}
+
 func main() {
+	fixListenPid()
 	if err := run(); err != nil {
 		fmt.Fprintf(os.Stderr, "error: %v\n", err)
 		os.Exit(1)

=== added file 'cmd/snapd/main_test.go'
--- cmd/snapd/main_test.go	1970-01-01 00:00:00 +0000
+++ cmd/snapd/main_test.go	2015-09-09 06:34:47 +0000
@@ -0,0 +1,50 @@
+package main
+
+import (
+	"io/ioutil"
+	"net"
+	"net/http"
+	"os"
+	"os/exec"
+	"syscall"
+	"testing"
+
+	"gopkg.in/check.v1"
+)
+
+// Hook up check.v1 into the "go test" runner
+func Test(t *testing.T) { check.TestingT(t) }
+
+type snapdSuite struct{}
+
+var _ = check.Suite(&snapdSuite{})
+
+func (s *snapdSuite) Test(c *check.C) {
+	cmd := exec.Command("go", "run", "main.go")
+
+	// TODO get a random port. Not yet because this is useful to know if the server is being killed.
+	// --elopio - 2015-09-09
+	listener, err := net.Listen("tcp", ":9999")
+	c.Assert(err, check.IsNil)
+
+	tcpListener := listener.(*net.TCPListener)
+	f, err := tcpListener.File()
+	c.Assert(err, check.IsNil)
+	cmd.ExtraFiles = []*os.File{f}
+
+	cmd.Env = os.Environ()
+	cmd.Env = append(cmd.Env, "LISTEN_FDS=1", "FIX_LISTEN_PID=1")
+
+	cmd.Start()
+	// FIXME this is not killing the server. How do we get the pid? Close the listener? Close the file?
+	// --elopio - 2015-09-09
+	defer cmd.Process.Signal(syscall.SIGTERM)
+
+	resp, err := http.Get("http://127.0.0.1:9999")
+	defer resp.Body.Close()
+	c.Assert(err, check.IsNil)
+	body, err := ioutil.ReadAll(resp.Body)
+	c.Assert(err, check.IsNil)
+	expected := `{"metadata":["/1.0"],"status":"OK","status_code":200,"type":"sync"}`
+	c.Assert(string(body), check.Equals, expected)
+}