Re-enable tests disabled by refactoring (#161)

snapcore · Feb 17, 2017 · 4f076d2 · 4f076d2
1 parent e21f399
commit 4f076d2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/snappy/app/converge_test.go b/snappy/app/converge_test.go
@@ -20,6 +20,7 @@ package snappy
 import (
 	"errors"
 	"os"
+	"testing"
 	"time"
 
 	"github.com/snapcore/snapd/client"
@@ -30,6 +31,8 @@ import (
 	"github.com/snapcore/snapweb/statetracker"
 )
 
+func Test(t *testing.T) { TestingT(t) }
+
 type GetSnapSuite struct {
 	h Handler
 	c *FakeSnapdClient

diff --git a/statetracker/statetracker.go b/statetracker/statetracker.go
@@ -97,7 +97,7 @@ func (s *StateTracker) State(c snapdclient.SnapdClient, snap *client.Snap) *Snap
 	if changing, changeID := s.IsTrackedForRunningOperation(snap); changing && c != nil {
 		change, err := c.Change(changeID)
 
-		if err == nil {
+		if change != nil && err == nil {
 			for _, task := range change.Tasks {
 				if uint64(task.Progress.Done) > 1 {
 					cstate.LocalSize = uint64(task.Progress.Done)