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

[Leo Arias]

Skip the ubuntu fan tests in 15.04.

I didn't use the release value from Cfg because when we pass an ip to the test, that value is not accurate.

[lp:~elopio/snappy/skip_fan]

716. By Leo Arias on 2015-09-24

Fmt.

[Federico Gimenez (fgimenez)]

Nicely done, thanks!

review: Approve

=== modified file '_integration-tests/tests/ubuntuFan_test.go'
--- _integration-tests/tests/ubuntuFan_test.go	2015-09-10 10:15:43 +0000
+++ _integration-tests/tests/ubuntuFan_test.go	2015-09-24 21:06:13 +0000
@@ -45,6 +45,10 @@
 }
 
 func (s *fanTestSuite) SetUpTest(c *check.C) {
+	if common.Release(c) == "15.04" {
+		c.Skip("Ubuntu Fan not available in 15.04")
+	}
+
 	s.SnappySuite.SetUpTest(c)
 	var err error
 	s.subjectIP, err = getIPAddr(c)

=== modified file '_integration-tests/testutils/common/common.go'
--- _integration-tests/testutils/common/common.go	2015-09-03 10:46:21 +0000
+++ _integration-tests/testutils/common/common.go	2015-09-24 21:06:13 +0000
@@ -29,7 +29,7 @@
 	"strconv"
 	"strings"
 
-	check "gopkg.in/check.v1"
+	"gopkg.in/check.v1"
 
 	"launchpad.net/snappy/_integration-tests/testutils/config"
 )

=== added file '_integration-tests/testutils/common/info.go'
--- _integration-tests/testutils/common/info.go	1970-01-01 00:00:00 +0000
+++ _integration-tests/testutils/common/info.go	2015-09-24 21:06:13 +0000
@@ -0,0 +1,46 @@
+// -*- 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 common
+
+import (
+	"bufio"
+	"strings"
+
+	"gopkg.in/check.v1"
+)
+
+// dependency aliasing
+var execCommand = ExecCommand
+
+// Release returns the release of the current snappy image
+func Release(c *check.C) string {
+	info := execCommand(c, "snappy", "info")
+	reader := strings.NewReader(info)
+	scanner := bufio.NewScanner(reader)
+	for scanner.Scan() {
+		if strings.HasPrefix(scanner.Text(), "release: ") {
+			releaseInfo := strings.TrimPrefix(scanner.Text(), "release: ")
+			return strings.Split(releaseInfo, "/")[1]
+		}
+	}
+	c.Error("Release information not found")
+	c.FailNow()
+	return ""
+}

=== added file '_integration-tests/testutils/common/info_test.go'
--- _integration-tests/testutils/common/info_test.go	1970-01-01 00:00:00 +0000
+++ _integration-tests/testutils/common/info_test.go	2015-09-24 21:06:13 +0000
@@ -0,0 +1,58 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2014-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 common
+
+import "gopkg.in/check.v1"
+
+type infoTestSuite struct {
+	execReturnValue string
+	backExecCommand func(*check.C, ...string) string
+}
+
+var _ = check.Suite(&infoTestSuite{})
+
+func (s *infoTestSuite) SetUpSuite(c *check.C) {
+	s.backExecCommand = execCommand
+	execCommand = s.fakeExecCommand
+}
+
+func (s *infoTestSuite) TearDownSuite(c *check.C) {
+	execCommand = s.backExecCommand
+}
+
+func (s *infoTestSuite) fakeExecCommand(c *check.C, args ...string) (output string) {
+	return s.execReturnValue
+}
+
+var releaseTests = []struct {
+	infoOutput      string
+	expectedRelease string
+}{
+	{"someInfo1: someValue1\nrelease: ubuntu-core/15.04/edge\nsomeInfo2: someValue2", "15.04"},
+	{"someInfo1: someValue1\nrelease: ubuntu-core/rolling/alpha\nsomeInfo2: someValue2", "rolling"},
+}
+
+func (s *infoTestSuite) TestRelease(c *check.C) {
+	for _, t := range releaseTests {
+		s.execReturnValue = t.infoOutput
+		release := Release(c)
+		c.Assert(release, check.Equals, t.expectedRelease, check.Commentf("Wrong release"))
+	}
+}