Merge lp:~elopio/snappy/go-tests3 into lp:~fgimenez/snappy/go-functional-tests

[Leo Arias]

Final cleanup of the hello world tests.

[lp:~elopio/snappy/go-tests3]

502. By Leo Arias on 2015-06-16

Update the run checks.

503. By Leo Arias on 2015-06-16

Added the info test.

504. By Leo Arias on 2015-06-16

Removed the unnecessary comments.

505. By Leo Arias on 2015-06-16

Install snap.

506. By Leo Arias on 2015-06-16

Added the missing return.

507. By Leo Arias on 2015-06-16

Added the missing type.

508. By Leo Arias on 2015-06-16

Missing argument.

509. By Leo Arias on 2015-06-16

Match only one app installed.

510. By Leo Arias on 2015-06-16

disable autopilot.

511. By Leo Arias on 2015-06-16

Use the multiline flag.

[Federico Gimenez (fgimenez)]

Great Leo, thanks! :)

review: Approve

=== modified file '_integration-tests/snappy-selftest'
--- _integration-tests/snappy-selftest	2015-06-15 15:36:29 +0000
+++ _integration-tests/snappy-selftest	2015-06-16 06:55:19 +0000
@@ -21,6 +21,7 @@
 
 # prepare the environment
 if [ -z "$ADT_REBOOT_MARK" ]; then
+    sudo systemctl stop snappy-autopilot.timer
     sudo snappy remove "$framework" 2>&1 || true
     sudo snappy remove hello-world 2>&1 || true
     sudo snappy remove xkcd-webserver 2>&1 || true

=== removed file '_integration-tests/tests/04_test_install_hello'
--- _integration-tests/tests/04_test_install_hello	2015-06-15 15:36:29 +0000
+++ _integration-tests/tests/04_test_install_hello	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-test() {
-       T="hello-world[[:space:]]+[0-9]{4}-[0-9]{2}-[0-9]{2}[[:space:]]+[0-9]+(\.[0-9]+)+[[:space:]]+canonical"
-       test_regexp "$T" sudo $SNAPPY install hello-world
-       
-       T="Hello World!"
-       test_equal "$T" hello-world.echo
-}

=== modified file '_integration-tests/tests/10_test_info_has_stuff'
--- _integration-tests/tests/10_test_info_has_stuff	2015-06-15 15:36:29 +0000
+++ _integration-tests/tests/10_test_info_has_stuff	2015-06-16 06:55:19 +0000
@@ -1,5 +1,4 @@
 test() {
     test_regexp "^release: ubuntu-core/.*/(edge|stable)" $SNAPPY info
     test_regexp "^frameworks: $framework" $SNAPPY info
-    test_regexp "^apps:.*\<hello-world\>" $SNAPPY info
 }

=== modified file '_integration-tests/tests/snappy_test.go'
--- _integration-tests/tests/snappy_test.go	2015-06-15 15:36:29 +0000
+++ _integration-tests/tests/snappy_test.go	2015-06-16 06:55:19 +0000
@@ -14,15 +14,50 @@
 
 type InstallSuite struct{}
 
-func (s *InstallSuite) TestInstallSnapp(c *C) {
-	installCommand := exec.Command("sudo", "snappy", "install", "hello-world")
-	_, installErr := installCommand.CombinedOutput()
-
-	c.Assert(installErr, IsNil)
-
-	echoCommand := exec.Command("hello-world.echo")
-	echoOutput, echoErr := echoCommand.CombinedOutput()
-
-	c.Assert(echoErr, IsNil)
+func (s *InstallSuite) installSnap(c *C, packageName string) []byte {
+	return s.execCommand(c, "sudo", "snappy", "install", packageName)
+}
+
+func (s *InstallSuite) execCommand(c *C, cmds ...string) []byte {
+	cmd := exec.Command(cmds[0], cmds[1:len(cmds)]...)
+	output, err := cmd.CombinedOutput()
+	c.Assert(err, IsNil, Commentf("Error: %v", output))
+	return output
+}
+
+func (s *InstallSuite) SetUpSuite(c *C) {
+	s.execCommand(c, "sudo", "systemctl", "stop", "snappy-autopilot.timer")
+}
+
+func (s *InstallSuite) TearDownTest(c *C) {
+	s.execCommand(c, "sudo", "snappy", "remove", "hello-world")
+}
+
+func (s *InstallSuite) TestInstallSnapMustPrintPackageInformation(c *C) {
+	installOutput := s.installSnap(c, "hello-world")
+
+	expected := "" +
+		"Installing hello-world\n" +
+		"Name          Date       Version Developer \n" +
+		".*\n" +
+		"hello-world   .* .*  canonical \n" +
+		".*\n"
+	c.Assert(string(installOutput), Matches, expected)
+}
+
+func (s *InstallSuite) TestCallBinaryFromInstalledSnap(c *C) {
+	s.installSnap(c, "hello-world")
+
+	echoOutput := s.execCommand(c, "hello-world.echo")
+
 	c.Assert(string(echoOutput), Equals, "Hello World!\n")
 }
+
+func (s *InstallSuite) TestInfoMustPrintInstalledPackageInformation(c *C) {
+	s.installSnap(c, "hello-world")
+
+	infoOutput := s.execCommand(c, "sudo", "snappy", "info")
+
+	expected := "(?m)^apps: hello-world\n"
+	c.Assert(string(infoOutput), Matches, expected)
+}

=== modified file 'debian/integration-tests/control'
--- debian/integration-tests/control	2015-06-15 15:36:29 +0000
+++ debian/integration-tests/control	2015-06-16 06:55:19 +0000
@@ -1,4 +1,4 @@
-Test-Command: snappy.test
+Test-Command: snappy.test -gocheck.vv -test.outputdir=$ADT_ARTIFACTS
 Restrictions: allow-stderr
 Depends: ubuntu-snappy-tests
 

=== modified file 'run-checks'
--- run-checks	2015-06-09 15:35:35 +0000
+++ run-checks	2015-06-16 06:55:19 +0000
@@ -58,7 +58,7 @@
 # integration tests
 if which adt-run >/dev/null 2>&1; then
     echo "Running integration tests"
-    ./integration-tests/selftest
+    go run _integration-tests/main.go
 fi
 
 echo "All good, what could possibly go wrong"