Merge pull request #298 from tpepper/unittests

Unittests: use testutil in ciao-scheduler's testing

ciao-controller/compute_test.go

@@ -234,7 +234,7 @@ func TestDeleteServer(t *testing.T) {
 	time.Sleep(2 * time.Second)
 
 	c := client.AddCmdChan(ssntp.STATS)
-	go client.SendStats()
+	go client.SendStatsCmd()
 	_, err = client.GetCmdChanResult(c, ssntp.STATS)
 	if err != nil {
 		t.Fatal(err)
@@ -281,7 +281,7 @@ func TestServersActionStart(t *testing.T) {
 	time.Sleep(2 * time.Second)
 
 	c := client.AddCmdChan(ssntp.STATS)
-	go client.SendStats()
+	go client.SendStatsCmd()
 	_, err = client.GetCmdChanResult(c, ssntp.STATS)
 	if err != nil {
 		t.Fatal(err)
@@ -297,7 +297,7 @@ func TestServersActionStart(t *testing.T) {
 	time.Sleep(1 * time.Second)
 
 	c = client.AddCmdChan(ssntp.STATS)
-	go client.SendStats()
+	go client.SendStatsCmd()
 	_, err = client.GetCmdChanResult(c, ssntp.STATS)
 	if err != nil {
 		t.Fatal(err)
@@ -343,7 +343,7 @@ func TestServersActionStop(t *testing.T) {
 	time.Sleep(2 * time.Second)
 
 	c := client.AddCmdChan(ssntp.STATS)
-	go client.SendStats()
+	go client.SendStatsCmd()
 	_, err = client.GetCmdChanResult(c, ssntp.STATS)
 	if err != nil {
 		t.Fatal(err)
@@ -389,7 +389,7 @@ func TestServerActionStop(t *testing.T) {
 	time.Sleep(2 * time.Second)
 
 	c := client.AddCmdChan(ssntp.STATS)
-	go client.SendStats()
+	go client.SendStatsCmd()
 	_, err = client.GetCmdChanResult(c, ssntp.STATS)
 	if err != nil {
 		t.Fatal(err)
@@ -423,7 +423,7 @@ func TestServerActionStart(t *testing.T) {
 	time.Sleep(1 * time.Second)
 
 	c := client.AddCmdChan(ssntp.STATS)
-	go client.SendStats()
+	go client.SendStatsCmd()
 	_, err = client.GetCmdChanResult(c, ssntp.STATS)
 	if err != nil {
 		t.Fatal(err)
@@ -446,7 +446,7 @@ func TestServerActionStart(t *testing.T) {
 	time.Sleep(1 * time.Second)
 
 	c = client.AddCmdChan(ssntp.STATS)
-	go client.SendStats()
+	go client.SendStatsCmd()
 	_, err = client.GetCmdChanResult(c, ssntp.STATS)
 	if err != nil {
 		t.Fatal(err)

ciao-controller/controller_test.go

@@ -269,7 +269,7 @@ func TestDeleteInstance(t *testing.T) {
 
 	time.Sleep(1 * time.Second)
 
-	client.SendStats()
+	client.SendStatsCmd()
 
 	c := server.AddCmdChan(ssntp.DELETE)
 
@@ -297,7 +297,7 @@ func TestStopInstance(t *testing.T) {
 
 	time.Sleep(1 * time.Second)
 
-	client.SendStats()
+	client.SendStatsCmd()
 
 	c := server.AddCmdChan(ssntp.STOP)
 
@@ -325,7 +325,7 @@ func TestRestartInstance(t *testing.T) {
 
 	time.Sleep(1 * time.Second)
 
-	client.SendStats()
+	client.SendStatsCmd()
 
 	c := server.AddCmdChan(ssntp.STOP)
 
@@ -347,7 +347,7 @@ func TestRestartInstance(t *testing.T) {
 	// now attempt to restart
 	time.Sleep(1 * time.Second)
 
-	client.SendStats()
+	client.SendStatsCmd()
 
 	c = server.AddCmdChan(ssntp.RESTART)
 
@@ -400,7 +400,7 @@ func TestInstanceDeletedEvent(t *testing.T) {
 
 	time.Sleep(1 * time.Second)
 
-	client.SendStats()
+	client.SendStatsCmd()
 
 	time.Sleep(1 * time.Second)
 
@@ -482,7 +482,7 @@ func TestStopFailure(t *testing.T) {
 
 	time.Sleep(1 * time.Second)
 
-	client.SendStats()
+	client.SendStatsCmd()
 
 	time.Sleep(1 * time.Second)
 
@@ -534,7 +534,7 @@ func TestRestartFailure(t *testing.T) {
 
 	time.Sleep(1 * time.Second)
 
-	client.SendStats()
+	client.SendStatsCmd()
 
 	time.Sleep(1 * time.Second)
 
@@ -555,7 +555,7 @@ func TestRestartFailure(t *testing.T) {
 
 	time.Sleep(1 * time.Second)
 
-	client.SendStats()
+	client.SendStatsCmd()
 
 	time.Sleep(1 * time.Second)
 

ciao-scheduler/scheduler.go

@@ -954,6 +954,10 @@ func setSSNTPForwardRules(sched *ssntpSchedulerServer) {
 			Operand: ssntp.RestartFailure,
 			Dest:    ssntp.Controller,
 		},
+		{ // all DeleteFailure events go to all Controllers
+			Operand: ssntp.DeleteFailure,
+			Dest:    ssntp.Controller,
+		},
 		{ // all START command are processed by the Command forwarder
 			Operand:        ssntp.START,
 			CommandForward: sched,