Merge lp:~fgimenez/snappy/fix-activate-test into lp:~snappy-dev/snappy/snappy-moved-to-github

[Federico Gimenez]

activate test skipped on 15.04 and moved Suite related fixtures to Test fixtures

activate test skipped on 15.04 and moved Suite related fixtures to Test fixtures

[Leo Arias (elopio)]

lgtm.

review: Approve

=== modified file '_integration-tests/tests/activate_test.go'
--- _integration-tests/tests/activate_test.go	2015-10-09 07:49:19 +0000
+++ _integration-tests/tests/activate_test.go	2015-10-13 14:52:44 +0000
@@ -45,17 +45,21 @@
 	snapPath string
 }
 
-func (s *activateSuite) SetUpSuite(c *check.C) {
-	s.SnappySuite.SetUpSuite(c)
+func (s *activateSuite) SetUpTest(c *check.C) {
+	s.SnappySuite.SetUpTest(c)
+	if common.Release(c) == "15.04" {
+		c.Skip("activate CLI command not available on 15.04, reenable the test when present")
+	}
 	var err error
 	s.snapPath, err = build.LocalSnap(c, activateSnapName)
 	c.Assert(err, check.IsNil)
 	common.InstallSnap(c, s.snapPath)
 }
 
-func (s *activateSuite) TearDownSuite(c *check.C) {
+func (s *activateSuite) TearDownTest(c *check.C) {
 	os.Remove(s.snapPath)
 	common.RemoveSnap(c, activateSnapName)
+	s.SnappySuite.TearDownTest(c)
 }
 
 func (s *activateSuite) TestDeactivateRemovesBinary(c *check.C) {