Merge lp:~ericsnowcurrently/fake-juju/add-action-delta-handling into lp:~landscape/fake-juju/trunk-old

[Eric Snow]

Add handling for action deltas.

Add handling for action deltas.

Testing instructions:

make test
...and run landscape's integration tests (once the txjuju fix lands).

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Success
Revno: 54
Branch: lp:~ericsnowcurrently/fake-juju/add-action-delta-handling
Jenkins: https://ci.lscape.net/job/latch-test-xenial/968/

review: Approve (test results)

[Simon Poirier (simpoir)]

+1 LGTM

review: Approve

=== modified file '2.0.0/fake-juju.go'
--- 2.0.0/fake-juju.go	2016-11-15 15:41:05 +0000
+++ 2.0.0/fake-juju.go	2016-11-16 18:50:32 +0000
@@ -754,6 +754,10 @@
 				unitId := entityId.Id
 				c.Assert(s.handleAddUnit(unitId), gc.IsNil)
 			}
+			if entityId.Kind == "action" {
+				actionId := entityId.Id
+				c.Assert(s.handleAction(actionId), gc.IsNil)
+			}
 			log.Println("Done processing delta")
 		}
 	}
@@ -799,6 +803,28 @@
 	return nil
 }
 
+func (s *FakeJujuSuite) handleAction(id string) error {
+	action, err := s.State.Action(id)
+	log.Println("Handle action", id)
+	if err != nil {
+		log.Println("Got error with get action", err)
+		return err
+	}
+	if action.Status() == state.ActionPending {
+		log.Println("Action is pending")
+		output := map[string]interface{}{"output": "action ran successfully"}
+		results := state.ActionResults{
+			Status:  state.ActionCompleted,
+			Results: output,
+		}
+		if _, err := action.Finish(results); err != nil {
+			log.Println("Err on action results", err)
+			return err
+		}
+	}
+	return nil
+}
+
 func (s *FakeJujuSuite) handleAddUnit(id string) error {
 	unit, err := s.State.Unit(id)
 	log.Println("Handle unit", id)
@@ -906,7 +932,6 @@
 	if err != nil {
 		return err
 	}
-	return nil
 	for _, unit := range units {
 		unitStatus, _ := unit.Status()
 		if unitStatus.Status != states.Active {