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

[Leo Arias]

Translate the xkcd test to go.

[Federico Gimenez (fgimenez)]

Looks very good! A couple of comments, being the one related to s.SnappySuite.TearDownTest(c) the only important thing.

Cheers!

[Leo Arias (elopio)]

replied. Thanks for the review, a new version coming soon. Please check my reply to TearDownTest.

[Federico Gimenez (fgimenez)]

You are totally right about the anonymous struct members, I can even see this in the test output:

START: <autogenerated>:8: installAppSuite.TearDownTest
sudo snappy remove xkcd-webserver.canonical
Removing xkcd-webserver.canonical
PASS: <autogenerated>:8: installAppSuite.TearDownTest 0.370s

So please forget what I said :D

[Leo Arias (elopio)]

I removed the sleep and it failed. But the systemd service is running, the problem is that it takes some time between the service starting (i.e., the main method being run) and the port to be ready and listening. So we could poll for the port 80 to be ready, that is for http.Get("http://localhost") to return no error.
I found this nice example with the ticker http://3.bp.blogspot.com/-XzfNd-eL6zc/VVq6Im6XmpI/AAAAAAAAGvM/DuSXnY3dzUg/s1600/Screenshot%2Bfrom%2B2015-05-19%2B00%3A20%3A33.png

But, as we only need one second tops, it will tick only once. Or we could make the ticks smaller, but in this test waiting less than a second doesn't change anything.

So I left the sleep for simplicity, but reported a bug so we can remove it at some point.

[Federico Gimenez (fgimenez)]

Great, thanks! The ticker looks very good :)

Perhaps we could try to bundle the logic for making sure that the service is installed (whatever it is) in our first checker, something like IsServiceInstalled (also another for snaps?) or IsServiceRunning, we can talk later about that.

Cheers!

review: Approve

[Leo Arias (elopio)]

ok, I'm starting to miss custom checkers, so yes, lets see how to add some.

=== removed file '_integration-tests/tests/11_test_xkcd_listens'
--- _integration-tests/tests/11_test_xkcd_listens	2015-06-15 15:36:29 +0000
+++ _integration-tests/tests/11_test_xkcd_listens	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-test() {
-       # FIXME: add $SNAPPY search webserver
-       
-       sudo $SNAPPY install xkcd-webserver.canonical
-
-       # FIXME: sucks, needed because "systemctl start" does not
-       #        wait until the service is really started
-       sleep 1
-
-       T="HTTP/1.0 200 OK"
-       TEMPF=$(tempfile)
-       printf "GET / HTTP/1.0\n\n"|nc localhost 80 > $TEMPF
-       test_regexp "$T" cat $TEMPF
-       rm -f $TEMPF
-}

=== modified file '_integration-tests/tests/latest/installApp_test.go'
--- _integration-tests/tests/latest/installApp_test.go	2015-07-14 16:37:32 +0000
+++ _integration-tests/tests/latest/installApp_test.go	2015-07-14 16:37:32 +0000
@@ -20,7 +20,9 @@
 package latest
 
 import (
+	"net/http"
 	"os/exec"
+	"time"
 
 	. "../common"
 
@@ -33,14 +35,11 @@
 	SnappySuite
 }
 
-func (s *installAppSuite) TearDownTest(c *check.C) {
-	RemoveSnap(c, "hello-world")
-	// run cleanup last
-	s.SnappySuite.TearDownTest(c)
-}
-
 func (s *installAppSuite) TestInstallAppMustPrintPackageInformation(c *check.C) {
 	installOutput := InstallSnap(c, "hello-world")
+	s.AddCleanup(func() {
+		RemoveSnap(c, "hello-world")
+	})
 
 	expected := "(?ms)" +
 		"Installing hello-world\n" +
@@ -54,6 +53,9 @@
 
 func (s *installAppSuite) TestCallBinaryFromInstalledSnap(c *check.C) {
 	InstallSnap(c, "hello-world")
+	s.AddCleanup(func() {
+		RemoveSnap(c, "hello-world")
+	})
 
 	echoOutput := ExecCommand(c, "hello-world.echo")
 
@@ -62,6 +64,9 @@
 
 func (s *installAppSuite) TestCallBinaryWithPermissionDeniedMustPrintError(c *check.C) {
 	InstallSnap(c, "hello-world")
+	s.AddCleanup(func() {
+		RemoveSnap(c, "hello-world")
+	})
 
 	cmd := exec.Command("hello-world.evil")
 	echoOutput, err := cmd.CombinedOutput()
@@ -80,9 +85,27 @@
 
 func (s *installAppSuite) TestInfoMustPrintInstalledPackageInformation(c *check.C) {
 	InstallSnap(c, "hello-world")
+	s.AddCleanup(func() {
+		RemoveSnap(c, "hello-world")
+	})
 
 	infoOutput := ExecCommand(c, "snappy", "info")
 
 	expected := "(?ms).*^apps: hello-world\n"
 	c.Assert(infoOutput, check.Matches, expected)
 }
+
+func (s *installAppSuite) TestAppNetworkingServiceMustBeStarted(c *check.C) {
+	InstallSnap(c, "xkcd-webserver.canonical")
+	s.AddCleanup(func() {
+		RemoveSnap(c, "xkcd-webserver.canonical")
+	})
+
+	// FIXME: sucks, needed because "systemctl start" does not wait until the
+	// port is listening. https://bugs.launchpad.net/snappy/+bug/1474463
+	time.Sleep(1 * time.Second)
+	resp, err := http.Get("http://localhost")
+	c.Assert(err, check.IsNil)
+	c.Check(resp.Status, check.Equals, "200 OK")
+	c.Assert(resp.Proto, check.Equals, "HTTP/1.0")
+}