Merge pull request #2144 from bacongobbler/test-fixes

Matthew Fisher · Matthew Fisher · commit 871f2f95e830 · 2014-10-17T10:03:00.000-07:00
test(builds): optimize commit workflow
diff --git a/tests/builds_test.go b/tests/builds_test.go
@@ -41,11 +41,7 @@ func buildSetup(t *testing.T) *utils.DeisTestConfig {
 	}
 	utils.Execute(t, appsCreateCmd, cfg, false, "")
 	utils.Execute(t, gitPushCmd, cfg, false, "")
-	if err := utils.CreateFile(cfg.ExampleApp); err != nil {
-		t.Fatal(err)
-	}
-	utils.Execute(t, gitAddCmd, cfg, false, "")
-	utils.Execute(t, gitCommitCmd, cfg, false, "")
+	utils.Execute(t, "git commit --allow-empty -m bump", cfg, false, "")
 	utils.Execute(t, gitPushCmd, cfg, false, "")
 	if err := utils.Chdir(".."); err != nil {
 		t.Fatal(err)
diff --git a/tests/integration_test.go b/tests/integration_test.go
@@ -14,8 +14,6 @@ var (
 	gitCloneCmd  = "if [ ! -d {{.ExampleApp}} ] ; then git clone https://github.com/deis/{{.ExampleApp}}.git ; fi"
 	gitRemoveCmd = "git remote remove deis"
 	gitPushCmd   = "git push deis master"
-	gitAddCmd    = "git add ."
-	gitCommitCmd = "git commit -m fake"
 )
 
 func TestGlobal(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,6 @@ var (`
`14`	`14`	`gitCloneCmd = "if [ ! -d {{.ExampleApp}} ] ; then git clone https://github.com/deis/{{.ExampleApp}}.git ; fi"`
`15`	`15`	`gitRemoveCmd = "git remote remove deis"`
`16`	`16`	`gitPushCmd = "git push deis master"`
`17`		`- gitAddCmd = "git add ."`
`18`		`- gitCommitCmd = "git commit -m fake"`
`19`	`17`	`)`
`20`	`18`
`21`	`19`	`func TestGlobal(t *testing.T) {`