Execute reload cmd when a new folder is created

Author: ddragosd

Makefile

@@ -8,7 +8,7 @@ setup:
 
 install:
 	@go version
-	export GO15VENDOREXPERIMENT=1
+#	export GO15VENDOREXPERIMENT=1
 #	GOPATH=$(GOPATH) GOBIN=$(GOBIN) go install -v ./...
 	GOPATH=$(GOPATH) GOBIN=$(GOBIN) $(GOPATH)/bin/godep go install -v ./...
 

config-supervisor_test.go

@@ -2,14 +2,20 @@ package main
 
 import (
 	"flag"
-	"github.com/adobe-apiplatform/api-gateway-config-supervisor/sync"
 	"io/ioutil"
+	"log"
 	"os"
 	"strings"
+	Sync "sync"
 	"testing"
 	"time"
+
+	"github.com/adobe-apiplatform/api-gateway-config-supervisor/sync"
+	"github.com/koyachi/go-term-ansicolor/ansicolor"
 )
 
+var once Sync.Once
+
 func TestMain(m *testing.M) {
 	flag.Parse()
 	os.Exit(m.Run())
@@ -29,6 +35,12 @@ func setup(t *testing.T) (tempdir string) {
 	// setup extra debug information
 	debugOn := true
 	debug = &debugOn
+
+	once.Do(func() {
+		log.Println(ansicolor.IntenseBlack("Starting the main() program"))
+		go main()
+	})
+
 	return tmpDir
 }
 
@@ -52,9 +64,6 @@ func TestThatReloadCommandExecutesOnFsChanges(t *testing.T) {
 	tmpDir := setup(t)
 	defer os.RemoveAll(tmpDir)
 
-	// start the utility in background
-	go main()
-
 	status = sync.GetStatusInstance()
 	if time.Since(status.LastSync).Seconds() < 2 {
 		t.Fatal("sync should not happen immediately" + time.Since(status.LastSync).String())
@@ -106,7 +115,6 @@ func TestThatReloadCommandExecutesOnFsChanges(t *testing.T) {
 
 	//reset the reload command
 	reload_cmd = "echo reload-cmd not defined"
-	reloadCmd = &reload_cmd
 }
 
 func TestThatSyncCommandExecutes(t *testing.T) {
@@ -118,17 +126,61 @@ func TestThatSyncCommandExecutes(t *testing.T) {
 	syncCmd = &sync_cmd_test
 
 	// wait for some time to init
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(1100 * time.Millisecond)
+
+	// check that the sync_cmd.txt file was created when the sync command executes
+	if _, err := os.Stat(tmpDir + "/sync_cmd.txt"); err != nil {
+		t.Fatal("Expected to find the file created by the sync command " + tmpDir + "/sync_cmd.txt")
+	}
 
-	// main is already started by the previous test
-	// and we can't start it here again due to: https://github.com/golang/go/issues/4674
-	//go main()
+	sync_cmd_test = "echo sync-cmd not defined"
+}
 
-	// wait for some time to init
+func TestThatReloadCommandExecutesWhenNewFolderIsAdded(t *testing.T) {
+	tmpDir := setup(t)
+	defer os.RemoveAll(tmpDir)
+
+	// in order to test that the reload command executed, we create a file and later verify that it exists on the disk
+	reload_cmd_test := "touch " + tmpDir + "/reload_cmd.txt"
+	reloadCmd = &reload_cmd_test
+
+	syncFolder = &tmpDir
+	go watchForFSChanges()
+
+	// wait for some time
 	time.Sleep(500 * time.Millisecond)
 
-	// check that the sync_cmd.txt file exists
-	if _, err := os.Stat(tmpDir + "/sync_cmd.txt"); err != nil {
-		t.Fatal("Expected to find the file created by the sync command " + tmpDir + "/sync_cmd.txt")
+	//modifyFS: create a new directory and file
+	dir, err := ioutil.TempDir(tmpDir, "new-folder-")
+	if err != nil {
+		t.Fatal(err)
+	}
+	f2, err := createFile(t, dir, "new-file-")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.Remove(f2.Name()) // clean up
+
+	// wait for some time to track the changes
+	time.Sleep(1000 * time.Millisecond)
+
+	status = sync.GetStatusInstance()
+	// check that reload cmd has been executed
+	if time.Since(status.LastSync).Seconds() > 1 {
+		t.Fatal("sync should have executed earlier than 1.5 but was executed " + time.Since(status.LastSync).String())
+	}
+	if time.Since(status.LastReload).Seconds() > 1 {
+		t.Fatal("reload should have executed earlier than 1.5s but was executed " + time.Since(status.LastReload).String())
+	}
+	if time.Since(status.LastFSChangeDetected).Seconds() > 1 {
+		t.Fatal("FS changes should have been detected earlier than 1.5s but was detected " + time.Since(status.LastFSChangeDetected).String())
+	}
+
+	// check that the reload_cmd.txt file was created when the reload command executed
+	if _, err := os.Stat(tmpDir + "/reload_cmd.txt"); err != nil {
+		t.Fatal("Expected to find the file created by the reload command " + tmpDir + "/reload_cmd.txt")
 	}
+
+	//reset the reload command
+	reload_cmd_test = "echo reload-cmd not defined"
 }

sync/watcher.go

@@ -1,8 +1,9 @@
 package sync
 
 import (
-	"github.com/koyachi/go-term-ansicolor/ansicolor"
 	"log"
+
+	"github.com/koyachi/go-term-ansicolor/ansicolor"
 )
 
 // Watches the specific folder for changes
@@ -20,10 +21,11 @@ func WatchFolderRecursive(folder string, debug bool) <-chan string {
 		for {
 			select {
 			case file := <-watcher.Files:
-				done <- file
 				log.Println(ansicolor.IntenseBlack("FS Changed"), ansicolor.Underline(file))
+				done <- file
 			case folder := <-watcher.Folders:
 				log.Println(ansicolor.Yellow("Watching path"), ansicolor.Yellow(folder))
+				done <- folder
 			}
 		}
 	}()