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

[Leo Arias]

Translated the version integration test to go.

This one is a little tricky. We can't pass the version from the host to the testbed, because we accept relative versions like -1 or nothing to mean latest. So we would have to query the system-image server for the latest image, and calculate the relative version. But then we would need to know the device, which can be a lot of things and we don't take as an argument. Much too work for not much value IMO, so I settled for checking the value from the config.

[Federico Gimenez (fgimenez)]

Looks good, +1

Maybe a system-image client as you mention can become useful, we can get all the required data from snappy info, then it's just a matter of parsing a remote json.

review: Approve

=== removed file '_integration-tests/tests/02_test_versions'
--- _integration-tests/tests/02_test_versions	2015-06-15 15:36:29 +0000
+++ _integration-tests/tests/02_test_versions	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-test() {
-    T="ubuntu-core.*201?"
-    test_regexp "$T" $SNAPPY list
-
-    T="Name.*Date.*Version.*Developer"
-    test_regexp "$T" $SNAPPY list
-}
 
=== modified file '_integration-tests/tests/latest/list_test.go'
--- _integration-tests/tests/latest/list_test.go	2015-07-15 06:07:06 +0000
+++ _integration-tests/tests/latest/list_test.go	2015-07-17 00:33:41 +0000
@@ -20,18 +20,48 @@
 package latest
 
 import (
+	"fmt"
+	"os"
+
 	. "../common"
 
-	. "gopkg.in/check.v1"
+	"github.com/mvo5/goconfigparser"
+	check "gopkg.in/check.v1"
 )
 
-var _ = Suite(&listSuite{})
+var _ = check.Suite(&listSuite{})
 
 type listSuite struct {
 	SnappySuite
 }
 
-func (s *listSuite) TestListMustPrintAppVersion(c *C) {
+func getVersionFromConfig(c *check.C) string {
+	cfg := goconfigparser.New()
+	f, err := os.Open("/etc/system-image/channel.ini")
+	c.Assert(err, check.IsNil,
+		check.Commentf("Error opening the config file: %v:", err))
+	defer f.Close()
+	err = cfg.Read(f)
+	c.Assert(err, check.IsNil,
+		check.Commentf("Error parsing the config file: %v", err))
+	version, err := cfg.Get("service", "build_number")
+	c.Assert(err, check.IsNil,
+		check.Commentf("Error getting the build number: %v", err))
+	return version
+}
+
+func (s *listSuite) TestListMustPrintCoreVersion(c *check.C) {
+	listOutput := ExecCommand(c, "snappy", "list")
+
+	expected := "(?ms)" +
+		"Name +Date +Version +Developer *\n" +
+		".*" +
+		fmt.Sprintf("^ubuntu-core +.* +%s +ubuntu *\n", getVersionFromConfig(c)) +
+		".*"
+	c.Assert(listOutput, check.Matches, expected)
+}
+
+func (s *listSuite) TestListMustPrintAppVersion(c *check.C) {
 	InstallSnap(c, "hello-world")
 	s.AddCleanup(func() {
 		RemoveSnap(c, "hello-world")
@@ -41,8 +71,8 @@
 	expected := "(?ms)" +
 		"Name +Date +Version +Developer *\n" +
 		".*" +
-		"^hello-world +.* (\\d+)(\\.\\d+)* +.* +.* *\n" +
+		"^hello-world +.* +(\\d+)(\\.\\d+)* +.* +.* *\n" +
 		".*"
 
-	c.Assert(listOutput, Matches, expected)
+	c.Assert(listOutput, check.Matches, expected)
 }