Merge pull request #196 from texierp/v1

activeinactive: implement 'SetValidate' function

activeinactive/activeinactive.go

@@ -21,6 +21,7 @@ import (
 type Interface interface {
 	Active() (int, error)
 	SetActive(active int) error
+	SetValidate() error
 }
 
 // DefaultImpl is the default implementation for Interface
@@ -64,3 +65,18 @@ func (i *DefaultImpl) SetActive(active int) error {
 
 	return nil
 }
+
+// SetValidate validate the current update
+// by calling 'updatehub-active-validated'
+func (i *DefaultImpl) SetValidate() error {
+	log.Debug("Running 'updatehub-active-validated'")
+
+	_, err := i.Execute(fmt.Sprintf("updatehub-active-validated"))
+	if err != nil {
+		finalErr := fmt.Errorf("failed to execute 'updatehub-active-validated': %s", err)
+		log.Error(finalErr)
+		return finalErr
+	}
+
+	return nil
+}

testsmocks/activeinactivemock/activeinactive.go

@@ -23,3 +23,8 @@ func (aim *ActiveInactiveMock) SetActive(active int) error {
 	args := aim.Called(active)
 	return args.Error(0)
 }
+
+func (aim *ActiveInactiveMock) SetValidate() error {
+	args := aim.Called()
+	return args.Error(0)
+}

testsmocks/activeinactivemock/activeinactive_test.go

@@ -41,3 +41,16 @@ func TestDownloadUpdate(t *testing.T) {
 
 	aim.AssertExpectations(t)
 }
+
+func TestValidateUpdate(t *testing.T) {
+	expectedError := fmt.Errorf("some error")
+
+	aim := &ActiveInactiveMock{}
+	aim.On("SetValidate").Return(expectedError)
+
+	err := aim.SetValidate()
+
+	assert.Equal(t, expectedError, err)
+
+	aim.AssertExpectations(t)
+}

updatehub/updatehub.go

@@ -632,9 +632,10 @@ func (uh *UpdateHub) rollbackProcedure() error {
 }
 
 func (uh *UpdateHub) validateProcedure() error {
+	aii := uh.ActiveInactiveBackend
+
 	err := uh.validateCallback()
 	if err != nil {
-		aii := uh.ActiveInactiveBackend
 
 		active, activeErr := aii.Active()
 		if activeErr != nil {
@@ -643,16 +644,26 @@ func (uh *UpdateHub) validateProcedure() error {
 
 		newActive := (active - 1) * -1
 
+		// Switch the active partion
 		setActiveErr := aii.SetActive(newActive)
 		if setActiveErr != nil {
 			return setActiveErr
 		}
 
+		// Force reboot
 		uh.Rebooter.Reboot()
 
 		return err
 	}
 
+	// We can Validate the update by calling
+	// 'updatehub-active-validated', and then go
+	// back to the state machine.
+	err = aii.SetValidate()
+	if err != nil {
+		return err
+	}
+
 	return nil
 }
 

updatehub/updatehub_test.go

@@ -2035,6 +2035,8 @@ func TestStartWithSuccessfulInstallationValidation(t *testing.T) {
 	aim := &activeinactivemock.ActiveInactiveMock{}
 	aim.On("Active").Return(0, nil).Once()
 
+	aim.On("SetValidate").Return(nil)
+
 	uh, _ := newTestUpdateHub(nil, aim)
 
 	uh.Settings.ProbeASAP = true
@@ -2213,6 +2215,8 @@ func newTestUpdateHub(state State, aii activeinactive.Interface) (*UpdateHub, er
 func TestValidateProcedureWithNonExistantCallback(t *testing.T) {
 	aim := &activeinactivemock.ActiveInactiveMock{}
 
+	aim.On("SetValidate").Return(nil)
+
 	uh, err := newTestUpdateHub(nil, aim)
 	assert.NoError(t, err)
 
@@ -2234,6 +2238,8 @@ func TestValidateProcedureWithNonExistantCallback(t *testing.T) {
 func TestValidateProcedureWithCallbackSuccess(t *testing.T) {
 	aim := &activeinactivemock.ActiveInactiveMock{}
 
+	aim.On("SetValidate").Return(nil)
+
 	uh, err := newTestUpdateHub(nil, aim)
 	assert.NoError(t, err)