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

[Leo Arias]

Added a test for go-webserver-example snap.

[Leo Arias (elopio)]

@Federico, if you see this before I wake up, could you please ask why is the python server started with the tcp protol and the go server started with the tcp6 protocol?

[lp:~elopio/snappy/examples6]

768. By Leo Arias on 2015-10-14

Added a space after the protocol in the regular expression.

[Federico Gimenez (fgimenez)]

Looks great, only one failing unit test [1], once it's fixed +1

Thanks!

[1] http://paste.ubuntu.com/12787160/

review: Needs Fixing

[lp:~elopio/snappy/examples6]

769. By Leo Arias on 2015-10-15

Fixed the expected regexp.

[Leo Arias (elopio)]

Fixed, thanks for the review.

[Federico Gimenez (fgimenez)]

review: Approve

=== modified file '_integration-tests/tests/examples_test.go'
--- _integration-tests/tests/examples_test.go	2015-10-14 05:18:25 +0000
+++ _integration-tests/tests/examples_test.go	2015-10-15 15:06:21 +0000
@@ -69,19 +69,19 @@
 	c.Assert(string(echoOutput), check.Matches, expected)
 }
 
-var _ = check.Suite(&webserverExampleSuite{})
+var _ = check.Suite(&pythonWebserverExampleSuite{})
 
-type webserverExampleSuite struct {
+type pythonWebserverExampleSuite struct {
 	common.SnappySuite
 }
 
-func (s *webserverExampleSuite) TestNetworkingServiceMustBeStarted(c *check.C) {
+func (s *pythonWebserverExampleSuite) TestNetworkingServiceMustBeStarted(c *check.C) {
 	baseAppName := "xkcd-webserver"
 	appName := baseAppName + ".canonical"
 	common.InstallSnap(c, appName)
 	defer common.RemoveSnap(c, appName)
 
-	err := wait.ForServerOnPort(c, 80)
+	err := wait.ForServerOnPort(c, "tcp", 80)
 	c.Assert(err, check.IsNil)
 
 	resp, err := http.Get("http://localhost")
@@ -90,6 +90,29 @@
 	c.Assert(resp.Proto, check.Equals, "HTTP/1.0")
 }
 
+var _ = check.Suite(&goWebserverExampleSuite{})
+
+type goWebserverExampleSuite struct {
+	common.SnappySuite
+}
+
+func (s *goWebserverExampleSuite) TestGetRootPathMustPrintMessage(c *check.C) {
+	appName := "go-example-webserver"
+	common.InstallSnap(c, appName)
+	defer common.RemoveSnap(c, appName)
+
+	err := wait.ForServerOnPort(c, "tcp6", 8081)
+	c.Assert(err, check.IsNil, check.Commentf("Error waiting for server: %s", err))
+
+	resp, err := http.Get("http://localhost:8081/")
+	defer resp.Body.Close()
+	c.Assert(err, check.IsNil, check.Commentf("Error getting the http resource: %s", err))
+	c.Check(resp.Status, check.Equals, "200 OK", check.Commentf("Wrong reply status"))
+	body, err := ioutil.ReadAll(resp.Body)
+	c.Assert(err, check.IsNil, check.Commentf("Error reading the reply body: %s", err))
+	c.Assert(string(body), check.Equals, "Hello World\n", check.Commentf("Wrong reply body"))
+}
+
 var _ = check.Suite(&frameworkExampleSuite{})
 
 type frameworkExampleSuite struct {

=== modified file '_integration-tests/tests/snapd_test.go'
--- _integration-tests/tests/snapd_test.go	2015-10-14 09:23:38 +0000
+++ _integration-tests/tests/snapd_test.go	2015-10-15 15:06:21 +0000
@@ -58,7 +58,7 @@
 	s.cmd.Start()
 
 	intPort, _ := strconv.Atoi(port)
-	err := wait.ForServerOnPort(c, intPort)
+	err := wait.ForServerOnPort(c, "tcp", intPort)
 	c.Assert(err, check.IsNil)
 }
 

=== modified file '_integration-tests/testutils/wait/wait.go'
--- _integration-tests/testutils/wait/wait.go	2015-09-30 11:06:40 +0000
+++ _integration-tests/testutils/wait/wait.go	2015-10-15 15:06:21 +0000
@@ -46,8 +46,9 @@
 }
 
 // ForServerOnPort uses ForCommand to check for process listening on the given port
-func ForServerOnPort(c *check.C, port int) (err error) {
-	return ForCommand(c, fmt.Sprintf(`(?msU)^.*tcp.*0\.0\.0\.0:%d .*`, port), "netstat", "-tapn")
+func ForServerOnPort(c *check.C, protocol string, port int) (err error) {
+	return ForCommand(c, fmt.Sprintf(`(?msU)^.*%s .*:%d .* LISTEN.*`, protocol, port),
+		"netstat", "-tapn")
 }
 
 // forCommand uses ForFunction to check for the execCommand output

=== modified file '_integration-tests/testutils/wait/wait_test.go'
--- _integration-tests/testutils/wait/wait_test.go	2015-09-28 10:54:40 +0000
+++ _integration-tests/testutils/wait/wait_test.go	2015-10-15 15:06:21 +0000
@@ -177,9 +177,9 @@
 		return
 	}
 
-	ForServerOnPort(c, 1234)
+	ForServerOnPort(c, "tcp", 1234)
 
-	expectedCalled := `ForCommand called with pattern '(?msU)^.*tcp.*0\.0\.0\.0:1234 .*' and cmds 'netstat -tapn'`
+	expectedCalled := `ForCommand called with pattern '(?msU)^.*tcp .*:1234 .* LISTEN.*' and cmds 'netstat -tapn'`
 	c.Assert(called, check.Equals, expectedCalled, check.Commentf("Expected call to ForCommand didn't happen"))
 }