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

[Leo Arias]

Just some details: copyright and don't sign.

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

513. By Leo Arias on 2015-06-19

Use rolling by default.

[Federico Gimenez (fgimenez)]

Thanks! :)

review: Approve

=== modified file '_integration-tests/main.go'
--- _integration-tests/main.go	2015-06-18 02:45:11 +0000
+++ _integration-tests/main.go	2015-06-19 05:01:59 +0000
@@ -1,3 +1,22 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 package main
 
 import (
@@ -11,7 +30,7 @@
 const (
 	baseDir         = "/tmp/snappy-test"
 	debsTestBedPath = "/tmp/snappy-debs"
-	defaultRelease  = "15.04"
+	defaultRelease  = "rolling"
 	defaultChannel  = "edge"
 	defaultArch     = "amd64"
 )
@@ -39,7 +58,8 @@
 		"bzr", "bd",
 		fmt.Sprintf("--result-dir=%s", debsDir),
 		"--split",
-		rootPath)
+		rootPath,
+		"--", "-uc", "-us")
 }
 
 func createImage(release, channel string) {
 
=== modified file '_integration-tests/tests/snappy_test.go'
--- _integration-tests/tests/snappy_test.go	2015-06-18 15:44:51 +0000
+++ _integration-tests/tests/snappy_test.go	2015-06-19 05:01:59 +0000
@@ -1,3 +1,22 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 package tests
 
 import (