Merge lp:~fgimenez/snappy/generalize-build-tests-across-versions into lp:~snappy-dev/snappy/snappy-moved-to-github

[Federico Gimenez]

Build message error and install command generalized to work across versions

Build message error and install command generalized to work across versions

[lp:~fgimenez/snappy/generalize-build-tests-across-versions]

616. By Federico Gimenez on 2015-07-29

merged prerequisite

617. By Federico Gimenez on 2015-07-29

merged trunk

618. By Federico Gimenez on 2015-07-29

Do not specify release and channel in config when connecting to remote testbed

619. By Federico Gimenez on 2015-07-29

merged prerequisite

[Leo Arias (elopio)]

The parse yaml change fails on rolling. So I think you should split this branch, as we should have the --allow-unauthenticated change in both trunk and 15.04, and the yaml change only on 15.04.

I will add this changes to my backport branch.

[lp:~fgimenez/snappy/generalize-build-tests-across-versions]

620. By Federico Gimenez on 2015-07-30

Fixed regex

[Federico Gimenez (fgimenez)]

Sorry, I thought I had tested it on rolling/edge, probably the kvm machine up by the time I launched the test was not the expected one.

Now it's fixed and tested on rolling/edge, 15.04/edge and 15.04/stable, please have another look at it.

Thanks!

[lp:~fgimenez/snappy/generalize-build-tests-across-versions]

621. By Federico Gimenez on 2015-07-30

merged prerequisite

622. By Federico Gimenez on 2015-07-30

merge prerequisite

[Leo Arias (elopio)]

works now, thanks.

review: Approve

=== modified file '_integration-tests/tests/build_test.go'
--- _integration-tests/tests/build_test.go	2015-07-28 04:03:52 +0000
+++ _integration-tests/tests/build_test.go	2015-07-30 16:20:53 +0000
@@ -58,7 +58,7 @@
 	// install built snap and check output
 	installOutput := InstallSnap(c, snapName)
 	defer RemoveSnap(c, basicSnapName)
-	expected = "" +
+	expected = "(?ms)" +
 		"Installing " + snapName + "\n" +
 		".*Signature check failed, but installing anyway as requested\n" +
 		"Name +Date +Version +Developer \n" +
@@ -73,7 +73,7 @@
 }
 
 func (s *buildSuite) TestBuildWrongYamlSnapOnSnappy(c *C) {
-	commonWrongTest(c, wrongYamlSnapName, "can not parse package.yaml:.*\n")
+	commonWrongTest(c, wrongYamlSnapName, "(?msi).*Can not parse.*yaml: line 2: mapping values are not allowed in this context.*")
 }
 
 func (s *buildSuite) TestBuildMissingReadmeSnapOnSnappy(c *C) {

=== modified file '_integration-tests/testutils/common/common.go'
--- _integration-tests/testutils/common/common.go	2015-07-30 16:20:53 +0000
+++ _integration-tests/testutils/common/common.go	2015-07-30 16:20:53 +0000
@@ -339,7 +339,7 @@
 
 // InstallSnap executes the required command to install the specified snap
 func InstallSnap(c *check.C, packageName string) string {
-	return ExecCommand(c, "sudo", "snappy", "install", packageName)
+	return ExecCommand(c, "sudo", "snappy", "install", packageName, "--allow-unauthenticated")
 }
 
 // RemoveSnap executes the required command to remove the specified snap