overlord: merge overlord/boot pkg into overlord/devicestate (#2118)

No semantic changes.

overlord/devicestate/devicemgr.go

@@ -43,7 +43,6 @@ import (
 	"github.com/snapcore/snapd/logger"
 	"github.com/snapcore/snapd/overlord/assertstate"
 	"github.com/snapcore/snapd/overlord/auth"
-	"github.com/snapcore/snapd/overlord/boot"
 	"github.com/snapcore/snapd/overlord/configstate"
 	"github.com/snapcore/snapd/overlord/hookstate"
 	"github.com/snapcore/snapd/overlord/snapstate"
@@ -185,7 +184,7 @@ func (m *DeviceManager) ensureOperational() error {
 	return nil
 }
 
-var bootPopulateStateFromSeed = boot.PopulateStateFromSeed
+var PopulateStateFromSeed = PopulateStateFromSeedImpl
 
 // ensureSnaps makes sure that the snaps from seed.yaml get installed
 // with the matching assertions
@@ -217,7 +216,7 @@ func (m *DeviceManager) ensureSeedYaml() error {
 		return nil
 	}
 
-	tsAll, err := bootPopulateStateFromSeed(m.state)
+	tsAll, err := PopulateStateFromSeed(m.state)
 	if err != nil {
 		return err
 	}

overlord/devicestate/devicemgr_test.go

@@ -761,10 +761,11 @@ func (s *deviceMgrSuite) TestDeviceManagerEnsureSeedYamlAlreadySeeded(c *C) {
 	s.state.Unlock()
 
 	called := false
-	devicestate.MockBootPopulateStateFromSeed(func(*state.State) ([]*state.TaskSet, error) {
+	restore := devicestate.MockPopulateStateFromSeed(func(*state.State) ([]*state.TaskSet, error) {
 		called = true
 		return nil, nil
 	})
+	defer restore()
 
 	err := s.mgr.EnsureSeedYaml()
 	c.Assert(err, IsNil)
@@ -780,10 +781,11 @@ func (s *deviceMgrSuite) TestDeviceManagerEnsureSeedYamlChangeInFlight(c *C) {
 	s.state.Unlock()
 
 	called := false
-	devicestate.MockBootPopulateStateFromSeed(func(*state.State) ([]*state.TaskSet, error) {
+	restore := devicestate.MockPopulateStateFromSeed(func(*state.State) ([]*state.TaskSet, error) {
 		called = true
 		return nil, nil
 	})
+	defer restore()
 
 	err := s.mgr.EnsureSeedYaml()
 	c.Assert(err, IsNil)
@@ -794,10 +796,11 @@ func (s *deviceMgrSuite) TestDeviceManagerEnsureSeedYamlSkippedOnClassic(c *C) {
 	release.OnClassic = true
 
 	called := false
-	devicestate.MockBootPopulateStateFromSeed(func(*state.State) ([]*state.TaskSet, error) {
+	restore := devicestate.MockPopulateStateFromSeed(func(*state.State) ([]*state.TaskSet, error) {
 		called = true
 		return nil, nil
 	})
+	defer restore()
 
 	err := s.mgr.EnsureSeedYaml()
 	c.Assert(err, IsNil)
@@ -807,11 +810,12 @@ func (s *deviceMgrSuite) TestDeviceManagerEnsureSeedYamlSkippedOnClassic(c *C) {
 func (s *deviceMgrSuite) TestDeviceManagerEnsureSeedYamlHappy(c *C) {
 	release.OnClassic = false
 
-	devicestate.MockBootPopulateStateFromSeed(func(*state.State) (ts []*state.TaskSet, err error) {
+	restore := devicestate.MockPopulateStateFromSeed(func(*state.State) (ts []*state.TaskSet, err error) {
 		t := s.state.NewTask("test-task", "a random task")
 		ts = append(ts, state.NewTaskSet(t))
 		return ts, nil
 	})
+	defer restore()
 
 	err := s.mgr.EnsureSeedYaml()
 	c.Assert(err, IsNil)

overlord/devicestate/export_test.go

@@ -74,11 +74,11 @@ func (m *DeviceManager) EnsureSeedYaml() error {
 	return m.ensureSeedYaml()
 }
 
-func MockBootPopulateStateFromSeed(f func(*state.State) ([]*state.TaskSet, error)) (restore func()) {
-	old := bootPopulateStateFromSeed
-	bootPopulateStateFromSeed = f
+func MockPopulateStateFromSeed(f func(*state.State) ([]*state.TaskSet, error)) (restore func()) {
+	old := PopulateStateFromSeed
+	PopulateStateFromSeed = f
 	return func() {
-		bootPopulateStateFromSeed = old
+		PopulateStateFromSeed = old
 	}
 }
 
@@ -89,3 +89,5 @@ func (m *DeviceManager) EnsureBootOk() error {
 func (m *DeviceManager) SetBootOkRan(b bool) {
 	m.bootOkRan = b
 }
+
+var ImportAssertionsFromSeed = importAssertionsFromSeed

overlord/boot/firstboot.go → overlord/devicestate/firstboot.go

@@ -17,7 +17,7 @@
  *
  */
 
-package boot
+package devicestate
 
 import (
 	"fmt"
@@ -36,7 +36,7 @@ import (
 	"github.com/snapcore/snapd/snap"
 )
 
-func PopulateStateFromSeed(st *state.State) ([]*state.TaskSet, error) {
+func PopulateStateFromSeedImpl(st *state.State) ([]*state.TaskSet, error) {
 	// check that the state is empty
 	var seeded bool
 	err := st.Get("seeded", &seeded)

overlord/boot/firstboot_test.go → overlord/devicestate/firstboot_test.go

@@ -17,15 +17,14 @@
  *
  */
 
-package boot_test
+package devicestate_test
 
 import (
 	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strconv"
-	"testing"
 	"time"
 
 	. "gopkg.in/check.v1"
@@ -38,16 +37,14 @@ import (
 	"github.com/snapcore/snapd/overlord"
 	"github.com/snapcore/snapd/overlord/assertstate"
 	"github.com/snapcore/snapd/overlord/auth"
-	"github.com/snapcore/snapd/overlord/boot"
+	"github.com/snapcore/snapd/overlord/devicestate"
 	"github.com/snapcore/snapd/overlord/snapstate"
 	"github.com/snapcore/snapd/overlord/state"
 	"github.com/snapcore/snapd/snap"
 	"github.com/snapcore/snapd/snap/snaptest"
 	"github.com/snapcore/snapd/testutil"
 )
 
-func Test(t *testing.T) { TestingT(t) }
-
 type FirstBootTestSuite struct {
 	systemctl   *testutil.MockCmd
 	mockUdevAdm *testutil.MockCmd
@@ -110,7 +107,7 @@ func (s *FirstBootTestSuite) TestPopulateFromSeedErrorsOnState(c *C) {
 	defer st.Unlock()
 	st.Set("seeded", true)
 
-	_, err := boot.PopulateStateFromSeed(st)
+	_, err := devicestate.PopulateStateFromSeed(st)
 	c.Assert(err, ErrorMatches, "cannot populate state: already seeded")
 }
 
@@ -191,7 +188,7 @@ snaps:
 	st := s.overlord.State()
 	st.Lock()
 	defer st.Unlock()
-	tsAll, err := boot.PopulateStateFromSeed(st)
+	tsAll, err := devicestate.PopulateStateFromSeed(st)
 	c.Assert(err, IsNil)
 
 	// the last task of the last taskset must be mark-seeded
@@ -358,7 +355,7 @@ snaps:
 	st.Lock()
 	defer st.Unlock()
 
-	tsAll, err := boot.PopulateStateFromSeed(st)
+	tsAll, err := devicestate.PopulateStateFromSeed(st)
 	chg := st.NewChange("run-it", "run the populate from seed changes")
 	for _, ts := range tsAll {
 		chg.AddAll(ts)
@@ -453,7 +450,7 @@ func (s *FirstBootTestSuite) TestImportAssertionsFromSeedHappy(c *C) {
 	st.Lock()
 	defer st.Unlock()
 
-	err = boot.ImportAssertionsFromSeed(st)
+	err = devicestate.ImportAssertionsFromSeed(st)
 	c.Assert(err, IsNil)
 
 	// verify that the model was added
@@ -491,7 +488,7 @@ func (s *FirstBootTestSuite) TestImportAssertionsFromSeedMissingSig(c *C) {
 
 	// try import and verify that its rejects because other assertions are
 	// missing
-	err := boot.ImportAssertionsFromSeed(st)
+	err := devicestate.ImportAssertionsFromSeed(st)
 	c.Assert(err, ErrorMatches, "cannot find account-key .*: assertion not found")
 }
 
@@ -513,7 +510,7 @@ func (s *FirstBootTestSuite) TestImportAssertionsFromSeedTwoModelAsserts(c *C) {
 
 	// try import and verify that its rejects because other assertions are
 	// missing
-	err = boot.ImportAssertionsFromSeed(st)
+	err = devicestate.ImportAssertionsFromSeed(st)
 	c.Assert(err, ErrorMatches, "cannot add more than one model assertion")
 }
 
@@ -534,6 +531,6 @@ func (s *FirstBootTestSuite) TestImportAssertionsFromSeedNoModelAsserts(c *C) {
 
 	// try import and verify that its rejects because other assertions are
 	// missing
-	err := boot.ImportAssertionsFromSeed(st)
+	err := devicestate.ImportAssertionsFromSeed(st)
 	c.Assert(err, ErrorMatches, "need a model assertion")
 }