removed duplicated lines from daemon/api_test.go's teardown

mikix · Jan 25, 2017 · d505e8a · d505e8a
1 parent fe6d588
commit d505e8a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 17 deletions.
diff --git a/client/snap_op.go b/client/snap_op.go
@@ -27,7 +27,6 @@ import (
 	"mime/multipart"
 	"os"
 	"path/filepath"
-	"strconv"
 )
 
 type SnapOptions struct {

diff --git a/daemon/api_test.go b/daemon/api_test.go
@@ -177,46 +177,40 @@ func (s *apiBaseSuite) SetUpTest(c *check.C) {
 	s.storeSigning = assertstest.NewStoreStack("can0nical", rootPrivKey, storePrivKey)
 	s.trustedRestorer = sysdb.InjectTrusted(s.storeSigning.Trusted)
 
+	assertstateRefreshSnapDeclarations = nil
 	snapstateCoreInfo = nil
 	snapstateInstall = nil
+	snapstateInstallMany = nil
 	snapstateInstallPath = nil
 	snapstateRefreshCandidates = nil
-	snapstateTryPath = nil
-	snapstateUpdate = nil
-	snapstateUpdateMany = nil
-	snapstateInstallMany = nil
 	snapstateRemoveMany = nil
 	snapstateRevert = nil
 	snapstateRevertToRevision = nil
-	assertstateRefreshSnapDeclarations = nil
+	snapstateTryPath = nil
+	snapstateUpdate = nil
+	snapstateUpdateMany = nil
 }
 
 func (s *apiBaseSuite) TearDownTest(c *check.C) {
 	s.trustedRestorer()
 	s.d = nil
 	s.restoreBackends()
-	snapstateInstall = snapstate.Install
-	snapstateCoreInfo = snapstate.CoreInfo
-	snapstateInstallPath = snapstate.InstallPath
-	assertstateRefreshSnapDeclarations = assertstate.RefreshSnapDeclarations
 	unsafeReadSnapInfo = unsafeReadSnapInfoImpl
 	ensureStateSoon = ensureStateSoonImpl
 	dirs.SetRootDir("")
 
-	// TODO: do something mockable
+	assertstateRefreshSnapDeclarations = assertstate.RefreshSnapDeclarations
 	snapstateCoreInfo = snapstate.CoreInfo
 	snapstateInstall = snapstate.Install
+	snapstateInstallMany = snapstate.InstallMany
 	snapstateInstallPath = snapstate.InstallPath
 	snapstateRefreshCandidates = snapstate.RefreshCandidates
-	snapstateTryPath = snapstate.TryPath
-	snapstateUpdate = snapstate.Update
-	snapstateUpdateMany = snapstate.UpdateMany
-	snapstateInstallMany = snapstate.InstallMany
 	snapstateRemoveMany = snapstate.RemoveMany
 	snapstateRevert = snapstate.Revert
 	snapstateRevertToRevision = snapstate.RevertToRevision
-
-	assertstateRefreshSnapDeclarations = assertstate.RefreshSnapDeclarations
+	snapstateTryPath = snapstate.TryPath
+	snapstateUpdate = snapstate.Update
+	snapstateUpdateMany = snapstate.UpdateMany
 }
 
 func (s *apiBaseSuite) daemon(c *check.C) *Daemon {