Adds integration testing for application config

Author: joe-at-startupmedia

Makefile

@@ -57,19 +57,25 @@ test: build
 	mkdir -p "$(TEST_DIR_DATA)" "$(TEST_DIR_LOGS)"
 	$(GO) build -o bin/app test/app/app.go
 	$(GO) build -o bin/cli test/cli/cli.go
+	cp test/test-apps.config.json "$(TEST_DIR_DATA).."
+	cp bin/app "$(TEST_DIR_DATA).."
 	$(TEST_VARS) ./bin/pmond > test.log 2>&1 &
 	sleep 3 
-	$(TEST_VARS) ./bin/cli exec $(ROOTDIR)/bin/app '{"name": "test-server"}'
-	$(TEST_VARS) ./bin/cli ls_assert 1 running
-	$(TEST_VARS) ./bin/cli exec $(ROOTDIR)/bin/app '{"name": "test-server2"}'
-	$(TEST_VARS) ./bin/cli ls_assert 2 running
-	$(TEST_VARS) ./bin/cli desc 2
+	$(TEST_VARS) ./bin/cli exec $(ROOTDIR)/bin/app '{"name": "test-server3"}'
+	$(TEST_VARS) ./bin/cli ls_assert 3 running
+	$(TEST_VARS) ./bin/cli exec $(ROOTDIR)/bin/app '{"name": "test-server4"}'
+	$(TEST_VARS) ./bin/cli ls_assert 4 running
+	$(TEST_VARS) ./bin/cli desc 4
 	$(TEST_VARS) ./bin/cli del 1
-	$(TEST_VARS) ./bin/cli ls_assert 1 running
+	$(TEST_VARS) ./bin/cli ls_assert 3 running
 	$(TEST_VARS) ./bin/cli kill
-	$(TEST_VARS) ./bin/cli ls_assert 1 stopped
+	$(TEST_VARS) ./bin/cli ls_assert 3 stopped
 	$(TEST_VARS) ./bin/cli init
-	$(TEST_VARS) ./bin/cli ls_assert 1 running
+	$(TEST_VARS) ./bin/cli ls_assert 3 running
+	$(TEST_VARS) ./bin/cli drop
+	$(TEST_VARS) ./bin/cli ls_assert 0
+	$(TEST_VARS) ./bin/cli init
+	$(TEST_VARS) ./bin/cli ls_assert 2 running
 	$(TEST_VARS) ./bin/cli drop
 	$(TEST_VARS) ./bin/cli ls_assert 0
 	pidof pmond | xargs kill -9

test/cli/cli.go

@@ -21,8 +21,10 @@ func main() {
 
 	base.OpenSender()
 
-	args := os.Args
+	execCmd(os.Args, 0)
+}
 
+func execCmd(args []string, retries int) {
 	cmdArg := args[1]
 	if cmdArg == "ls_assert" {
 		base.SendCmd("list", "")
@@ -39,8 +41,6 @@ func main() {
 		panic("must provide a command")
 	}
 
-	//time.Sleep(0 * time.Second)
-
 	newCmdResp := base.GetResponse()
 	if len(newCmdResp.GetError()) > 0 {
 		cli.Log.Fatal(newCmdResp.GetError())
@@ -61,7 +61,14 @@ func main() {
 				pStatus := args[3]
 				for _, p := range processList {
 					if p.Status != pStatus {
-						cli.Log.Fatalf("Expected process status of %d but got %d", expectedProcessLen, actualProcessLen)
+						if retries < 3 { //three retries are allowed
+							cli.Log.Infof("Expected process status of %s but got %s", pStatus, p.Status)
+							cli.Log.Warnf("retry count: %d", retries+1)
+							time.Sleep(time.Second * 5)
+							execCmd(args, retries+1)
+						} else {
+							cli.Log.Fatalf("Expected process status of %s but got %s", pStatus, p.Status)
+						}
 					}
 				}
 			}

test/test-apps.config.json

@@ -0,0 +1,16 @@
+{
+  "apps": [
+    {
+      "file": "/usr/src/pmon3/app",
+      "flags": {
+        "name": "test-server-1"
+      }
+    },
+    {
+      "file": "/usr/src/pmon3/app",
+      "flags": {
+        "name": "test-server-2"
+      }
+    }
+  ]
+}

test/test-config.yml

@@ -25,4 +25,4 @@ posix_mq_user: null
 # specify a custom group to access files in posix_mq_dir (must also provide a user)
 posix_mq_group: null
 # a JSON configuration file to specify a list of apps to start on the first initialization
-apps_config_file:
+apps_config_file: /usr/src/pmon3/test-apps.config.json