summaryrefslogtreecommitdiff
diff options
authorMichael Vogt <mvo@ubuntu.com>2017-02-17 16:21:26 +0100
committerMichael Vogt <mvo@ubuntu.com>2017-02-17 16:21:26 +0100
commitc9954d40fbb26e35bf7cb46d662454ed6d1eb05d (patch)
treea3708fe112436a43ce953b7dc15104ed687c1c20
parent9264ace401d2a62b661addec6eae18922c522847 (diff)
ensure snapstate.CanAutoRefresh is nil to avoid tests exploding on s390x and powerpchotfix-s390x-powerpc
-rw-r--r--overlord/managers_test.go1
-rw-r--r--overlord/overlord_test.go1
2 files changed, 2 insertions, 0 deletions
diff --git a/overlord/managers_test.go b/overlord/managers_test.go
index cbf85438b6..8645357a20 100644
--- a/overlord/managers_test.go
+++ b/overlord/managers_test.go
@@ -104,6 +104,7 @@ func (ms *mgrsSuite) SetUpTest(c *C) {
c.Assert(err, IsNil)
os.Setenv("SNAPPY_SQUASHFS_UNPACK_FOR_TESTS", "1")
+ snapstate.CanAutoRefresh = nil
// create a fake systemd environment
os.MkdirAll(filepath.Join(dirs.SnapServicesDir, "multi-user.target.wants"), 0755)
diff --git a/overlord/overlord_test.go b/overlord/overlord_test.go
index 1af0b6efd6..a010c02ea1 100644
--- a/overlord/overlord_test.go
+++ b/overlord/overlord_test.go
@@ -51,6 +51,7 @@ func (ovs *overlordSuite) SetUpTest(c *C) {
tmpdir := c.MkDir()
dirs.SetRootDir(tmpdir)
dirs.SnapStateFile = filepath.Join(tmpdir, "test.json")
+ snapstate.CanAutoRefresh = nil
}
func (ovs *overlordSuite) TearDownTest(c *C) {