Updates to integration tests

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>

Author: alexellis

commands/fetch_templates.go

@@ -256,8 +256,10 @@ func pullTemplate(repository, templateName string) error {
 		}
 	}
 
-	if !versioncontrol.IsGitRemote(baseRepository) && !versioncontrol.IsPinnedGitRemote(baseRepository) {
-		return fmt.Errorf("the repository URL must be a valid git repo uri")
+	if !isValidFilesystemPath(repository) {
+		if !versioncontrol.IsGitRemote(baseRepository) && !versioncontrol.IsPinnedGitRemote(baseRepository) {
+			return fmt.Errorf("the repository URL must be a valid git repo uri")
+		}
 	}
 
 	repository, refName := versioncontrol.ParsePinnedRemote(repository)
@@ -286,3 +288,10 @@ type TemplateMeta struct {
 	Sha        string    `json:"sha,omitempty"`
 	WrittenAt  time.Time `json:"written_at"`
 }
+
+func isValidFilesystemPath(path string) bool {
+	if _, err := os.Stat(path); err == nil {
+		return true
+	}
+	return false
+}

commands/fetch_templates_test.go

@@ -29,10 +29,11 @@ func Test_PullTemplates(t *testing.T) {
 		}
 	})
 
+	overwrite := true
 	t.Run("fetchTemplates with master ref", func(t *testing.T) {
 		defer tearDownFetchTemplates(t)
 
-		if err := fetchTemplates(localTemplateRepository, "master", templateName, false); err != nil {
+		if err := fetchTemplates(localTemplateRepository, "master", templateName, overwrite); err != nil {
 			t.Fatal(err)
 		}
 
@@ -42,7 +43,7 @@ func Test_PullTemplates(t *testing.T) {
 		defer tearDownFetchTemplates(t)
 
 		templateName := ""
-		if err := fetchTemplates(localTemplateRepository, "", templateName, false); err != nil {
+		if err := fetchTemplates(localTemplateRepository, "", templateName, overwrite); err != nil {
 			t.Error(err)
 		}
 

commands/template_pull_test.go

@@ -22,7 +22,7 @@ func Test_templatePull(t *testing.T) {
 		faasCmd.SetArgs([]string{"template", "pull", localTemplateRepository})
 		err := faasCmd.Execute()
 		if err != nil {
-			t.Errorf("unexpected error while puling valid repo: %s", err.Error())
+			t.Fatalf("unexpected error while puling valid repo (%q): %s", localTemplateRepository, err.Error())
 		}
 
 		// Verify created directories
@@ -33,33 +33,31 @@ func Test_templatePull(t *testing.T) {
 
 	t.Run("WithOverwriting", func(t *testing.T) {
 		defer tearDownFetchTemplates(t)
-
-		faasCmd.SetArgs([]string{"template", "pull", localTemplateRepository})
-		err := faasCmd.Execute()
-		if err != nil {
-			t.Errorf("unexpected error while executing template pull: %s", err.Error())
+		faasCmd.SetArgs([]string{"template", "pull", "--overwrite=false", localTemplateRepository})
+		if err := faasCmd.Execute(); err != nil {
+			t.Errorf("unexpected error while executing initial template pull: %s", err.Error())
 		}
 
 		var buf bytes.Buffer
 		log.SetOutput(&buf)
 
-		r := regexp.MustCompile(`(?m:Cannot overwrite the following \d+ template\(s\):)`)
-
-		faasCmd.SetArgs([]string{"template", "pull", localTemplateRepository})
-		err = faasCmd.Execute()
-		if err != nil {
+		overwrite = false
+		faasCmd.SetArgs([]string{"template", "pull", "--overwrite=false", localTemplateRepository})
+		if err := faasCmd.Execute(); err != nil {
 			t.Errorf("unexpected error while executing template pull: %s", err.Error())
 		}
 
+		r := regexp.MustCompile(`(?m:Cannot overwrite the following \d+ template\(s\):)`)
 		if !r.MatchString(buf.String()) {
-			t.Fatal(buf.String())
+			t.Fatalf("Output from stdio didn't match expression: %s\nvs: %s", buf.String(), r.String())
 		}
 
 		buf.Reset()
 
+		overwrite = true
+
 		faasCmd.SetArgs([]string{"template", "pull", localTemplateRepository, "--overwrite"})
-		err = faasCmd.Execute()
-		if err != nil {
+		if err := faasCmd.Execute(); err != nil {
 			t.Errorf("unexpected error while executing template pull with --overwrite: %s", err.Error())
 		}
 
@@ -80,10 +78,11 @@ func Test_templatePull(t *testing.T) {
 		want := "the repository URL must be a valid git repo uri"
 		got := err.Error()
 		if !strings.Contains(err.Error(), want) {
-			t.Errorf("The error should contain:\n%q\n, but was:\n%q", want, got)
+			t.Fatalf("The error should contain:\n%q\n, but was:\n%q", want, got)
 		}
 	})
 }
+
 func Test_templatePullPriority(t *testing.T) {
 	templateURLs := []struct {
 		name      string
@@ -113,7 +112,7 @@ func Test_templatePullPriority(t *testing.T) {
 		},
 	}
 	for _, scenario := range templateURLs {
-		t.Run(fmt.Sprintf("%s", scenario.name), func(t *testing.T) {
+		t.Run(scenario.name, func(t *testing.T) {
 			repository = getTemplateURL(scenario.cliURL, scenario.envURL, DefaultTemplateRepository)
 			if repository != scenario.resultURL {
 				t.Errorf("result URL,  want %s got %s", scenario.resultURL, repository)