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

[Leo Arias]

[Leo Arias (elopio)]

@federico: if you merge yours with trunk you will see a nicer diff.
Here I'm playing with building the tests into a package, instead of compiling them as part of the script. It's a little ugly, it would be nice to get some comments from a go packager.

[Federico Gimenez (fgimenez)]

Awesome Leo, this is getting into shape :)

review: Approve

=== modified file 'cmd/snappy/cmd_install.go'
--- cmd/snappy/cmd_install.go	2015-05-19 14:09:19 +0000
+++ cmd/snappy/cmd_install.go	2015-06-13 19:17:48 +0000
@@ -34,8 +34,8 @@
 	AllowUnauthenticated bool `long:"allow-unauthenticated" description:"Install snaps even if the signature can not be verified."`
 	DisableGC            bool `long:"no-gc" description:"Do not clean up old versions of the package."`
 	Positional           struct {
-		PackageName string `positional-arg-name:"package name" description:"Set configuration for a specific installed package"`
-		ConfigFile  string `positional-arg-name:"config file" description:"The configuration for the given file"`
+		PackageName string `positional-arg-name:"package name" description:"The Package to install (name or path)"`
+		ConfigFile  string `positional-arg-name:"config file" description:"The configuration for the given install"`
 	} `positional-args:"yes"`
 }
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-06-10 19:17:06 +0000
+++ debian/changelog	2015-06-13 19:17:48 +0000
@@ -1,3 +1,11 @@
+ubuntu-snappy (1.1.2-0ubuntu1) wily; urgency=medium
+
+  * New upstream release, including the following changes:
+    - Remove compatibility for click-bin-path in generated exec-wrappers
+    - Release the readme.md after parsing it
+
+ -- Ricardo Salveti de Araujo <[e-mail]>  Thu, 11 Jun 2015 23:42:49 -0300
+
 ubuntu-snappy (1.1.1-0ubuntu1) wily; urgency=medium
 
   * New upstream release, including the following changes:
 
=== modified file 'debian/control'
--- debian/control	2015-06-02 20:46:07 +0000
+++ debian/control	2015-06-13 19:17:48 +0000
@@ -51,3 +51,9 @@
 Built-Using: ${misc:Built-Using}
 Description: Tool to interact with Ubuntu Core Snappy.
  Manage an Ubuntu system with snappy.
+
+Package: ubuntu-snappy-tests
+Architecture: any
+Depends: ubuntu-snappy-cli (= ${binary:Version}),
+         ${misc:Depends}
+Description: snappy selftests
 
=== added directory 'debian/integration-tests'
=== added file 'debian/integration-tests/control'
--- debian/integration-tests/control	1970-01-01 00:00:00 +0000
+++ debian/integration-tests/control	2015-06-13 19:17:48 +0000
@@ -0,0 +1,5 @@
+Test-Command: snappy.test
+Depends: ubuntu-snappy-tests
+
+#Test-Command: ./snappy-selftest --yes-really
+#Depends:
 
=== renamed file 'debian/tests/snappy_test.go' => 'debian/integration-tests/snappy_test.go'
--- debian/tests/snappy_test.go	2015-06-10 15:13:16 +0000
+++ debian/integration-tests/snappy_test.go	2015-06-13 19:17:48 +0000
@@ -4,7 +4,7 @@
 	"os/exec"
 	"testing"
 
-	. "launchpad.net/gocheck"
+	. "gopkg.in/check.v1"
 )
 
 // Hook up gocheck into the "go test" runner
 
=== modified file 'debian/rules'
--- debian/rules	2015-04-14 16:46:57 +0000
+++ debian/rules	2015-06-13 19:17:48 +0000
@@ -4,6 +4,7 @@
 #export DH_VERBOSE=1
 export DH_OPTIONS
 export DH_GOPKG := launchpad.net/snappy
+DH_BUILDDIR = obj-$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
 %:
 	dh $@ --buildsystem=golang --with=golang --fail-missing --with systemd
@@ -50,6 +51,11 @@
 		-pubuntu-snappy \
 		snappy-autopilot.service
 
+override_dh_auto_build:
+	dh_auto_build
+	GOPATH=$$PWD/$(DH_BUILDDIR) go test -c debian/integration-tests/snappy_test.go
+	mv snappy.test $$PWD/$(DH_BUILDDIR)/bin
+
 override_dh_auto_install:
 	dh_auto_install -O--buildsystem=golang
 	# Making the packages private
 
=== removed directory 'debian/tests'
=== removed file 'debian/tests/control'
--- debian/tests/control	2015-06-11 09:15:25 +0000
+++ debian/tests/control	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-Tests: tests.test
-Restrictions: allow-stderr 
 
=== added file 'debian/ubuntu-snappy-tests.install'
--- debian/ubuntu-snappy-tests.install	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-snappy-tests.install	2015-06-13 19:17:48 +0000
@@ -0,0 +1,1 @@
+/usr/bin/snappy.test
 
=== modified file 'partition/bootloader_uboot_test.go'
--- partition/bootloader_uboot_test.go	2015-06-09 17:43:20 +0000
+++ partition/bootloader_uboot_test.go	2015-06-13 19:17:48 +0000
@@ -204,7 +204,6 @@
 
 	// mock the hardwareYaml and the cacheDir
 	p.hardwareSpecFile = makeHardwareYaml(c, "bootloader: grub")
-	defaultCacheDir = c.MkDir()
 
 	err = bootloader.HandleAssets()
 	c.Assert(err, NotNil)
@@ -221,7 +220,6 @@
 bootloader: u-boot
 partition-layout: inplace
 `)
-	defaultCacheDir = c.MkDir()
 
 	err = bootloader.HandleAssets()
 	c.Assert(err, NotNil)
@@ -229,12 +227,12 @@
 
 func (s *PartitionTestSuite) TestHandleAssetsNoHardwareYaml(c *C) {
 	s.makeFakeUbootEnv(c)
+	defaultCacheDir = c.MkDir()
+
 	p := New()
 	bootloader, err := bootloader(p)
 	c.Assert(err, IsNil)
 
-	defaultCacheDir = c.MkDir()
-
 	c.Assert(bootloader.HandleAssets(), IsNil)
 }
 
@@ -247,7 +245,6 @@
 	p.hardwareSpecFile = makeHardwareYaml(c, `
 bootloader u-boot
 `)
-	defaultCacheDir = c.MkDir()
 
 	c.Assert(bootloader.HandleAssets(), NotNil)
 }
 
=== modified file 'policy/policy.go'
--- policy/policy.go	2015-05-15 13:33:27 +0000
+++ policy/policy.go	2015-06-13 19:17:48 +0000
@@ -60,7 +60,7 @@
 // Directories are created as needed. Errors out with any of the things that
 // could go wrong with this, including a file found by glob not being a
 // regular file.
-func iterOp(op policyOp, glob string, targetDir string, prefix string) (err error) {
+func iterOp(op policyOp, glob, targetDir, prefix string) (err error) {
 	if err = os.MkdirAll(targetDir, 0755); err != nil {
 		return fmt.Errorf("unable to make %v directory: %v", targetDir, err)
 	}
@@ -104,11 +104,11 @@
 
 // frameworkOp perform the given operation (either Install or Remove) on the
 // given package that's installed in the given path.
-func frameworkOp(op policyOp, pkgName string, instPath string) error {
+func frameworkOp(op policyOp, pkgName, instPath, rootDir string) error {
 	pol := filepath.Join(instPath, "meta", "framework-policy")
 	for _, i := range []string{"apparmor", "seccomp"} {
 		for _, j := range []string{"policygroups", "templates"} {
-			if err := iterOp(op, filepath.Join(pol, i, j, "*"), filepath.Join(SecBase, i, j), pkgName+"_"); err != nil {
+			if err := iterOp(op, filepath.Join(pol, i, j, "*"), filepath.Join(rootDir, SecBase, i, j), pkgName+"_"); err != nil {
 				return err
 			}
 		}
@@ -119,14 +119,14 @@
 
 // Install sets up the framework's policy from the given snap that's
 // installed in the given path.
-func Install(pkgName string, instPath string) error {
-	return frameworkOp(install, pkgName, instPath)
+func Install(pkgName, instPath, rootDir string) error {
+	return frameworkOp(install, pkgName, instPath, rootDir)
 }
 
 // Remove cleans up the framework's policy from the given snap that's
 // installed in the given path.
-func Remove(pkgName string, instPath string) error {
-	return frameworkOp(remove, pkgName, instPath)
+func Remove(pkgName, instPath, rootDir string) error {
+	return frameworkOp(remove, pkgName, instPath, rootDir)
 }
 
 func aaUp(old, new, dir, pfx string) map[string]bool {
 
=== modified file 'policy/policy_test.go'
--- policy/policy_test.go	2015-06-02 20:53:10 +0000
+++ policy/policy_test.go	2015-06-13 19:17:48 +0000
@@ -26,8 +26,9 @@
 	"path/filepath"
 	"testing"
 
+	"sort"
+
 	. "gopkg.in/check.v1"
-	"sort"
 )
 
 // Hook up check.v1 into the "go test" runner.
@@ -140,13 +141,14 @@
 }
 
 func (s *policySuite) TestFrameworkRoundtrip(c *C) {
+	rootDir := c.MkDir()
 	SecBase = s.dest
-	c.Check(Install("foo", s.orig), IsNil)
+	c.Check(Install("foo", s.orig, rootDir), IsNil)
 	// check the files were copied, with the packagename prepended properly
-	g, err := filepath.Glob(filepath.Join(SecBase, "*", "*", "foo_*"))
+	g, err := filepath.Glob(filepath.Join(rootDir, SecBase, "*", "*", "foo_*"))
 	c.Check(err, IsNil)
 	c.Check(g, HasLen, 4*3)
-	c.Check(Remove("foo", s.orig), IsNil)
+	c.Check(Remove("foo", s.orig, rootDir), IsNil)
 	g, err = filepath.Glob(filepath.Join(SecBase, "*", "*", "*"))
 	c.Check(err, IsNil)
 	c.Check(g, HasLen, 0)
@@ -155,7 +157,7 @@
 func (s *policySuite) TestFrameworkError(c *C) {
 	// check we get errors from the iterOp, is all
 	SecBase = s.dest
-	c.Check(frameworkOp(42, "foo", s.orig), ErrorMatches, ".*unknown operation.*")
+	c.Check(frameworkOp(42, "foo", s.orig, ""), ErrorMatches, ".*unknown operation.*")
 }
 
 func (s *policySuite) TestOpString(c *C) {
 
=== modified file 'run-functional-tests.py'
--- run-functional-tests.py	2015-06-12 08:02:18 +0000
+++ run-functional-tests.py	2015-06-13 19:17:48 +0000
@@ -45,7 +45,7 @@
     print("Building debs...")
     prepare_target_dir(DEBS_DIR)
     return subprocess.check_output([
-        'bzr-buildpackage',
+        'bzr', 'bd',
         '--result-dir={}'.format(DEBS_DIR),
         HERE,
         '--', '-uc', '-us',
@@ -65,7 +65,8 @@
         "dpkg -i {debs_dir}/*deb".format(debs_dir=DEBS_TESTBED_PATH),
         '--setup-commands',
         'sync; sleep 2; mount -o remount,ro /',
-        '--unbuilt-tree', HERE,
+        '--override-control', 'debian/integration-tests/control',
+        '--built-tree', HERE,
         '--output-dir', OUTPUT_DIR,
         "--copy={orig_debs_dir}:{target_debs_dir}".format(
             orig_debs_dir=DEBS_DIR,
@@ -77,24 +78,11 @@
         '--', '-i', IMAGE_TARGET,
     ])
 
-
-def compile_tests():
-    print("Compiling tests...")
-    return subprocess.check_output([
-        'go',
-        'test',
-        '-c',
-        '-o snappy'
-    ], cwd="{base}/debian/tests/".format(base=HERE))
-
-
 def main():
     build_debs()
 
     create_image()
 
-    compile_tests()
-
     adt_run()
 
     return 0
 
=== modified file 'snappy/build.go'
--- snappy/build.go	2015-06-03 12:06:17 +0000
+++ snappy/build.go	2015-06-13 19:17:48 +0000
@@ -101,6 +101,7 @@
 	if err != nil {
 		return "", "", err
 	}
+	defer file.Close()
 
 	scanner := bufio.NewScanner(file)
 	for scanner.Scan() {
 
=== modified file 'snappy/snapp.go'
--- snappy/snapp.go	2015-06-09 19:11:54 +0000
+++ snappy/snapp.go	2015-06-13 19:17:48 +0000
@@ -939,7 +939,7 @@
 	}
 
 	if s.Type() == pkg.TypeFramework {
-		if err := policy.Install(s.Name(), s.basedir); err != nil {
+		if err := policy.Install(s.Name(), s.basedir, globalRootDir); err != nil {
 			return err
 		}
 	}
@@ -1001,7 +1001,7 @@
 	}
 
 	if s.Type() == pkg.TypeFramework {
-		if err := policy.Remove(s.Name(), s.basedir); err != nil {
+		if err := policy.Remove(s.Name(), s.basedir, globalRootDir); err != nil {
 			return err
 		}
 	}