Merge lp:~elopio/snappy/fix_tpl into lp:~snappy-dev/snappy/snappy-moved-to-github

[Leo Arias]

In the integration tests, delete and recreate the template output directory.

[Federico Gimenez (fgimenez)]

Awesome thanks :)

review: Approve

=== modified file '_integration-tests/main.go'
--- _integration-tests/main.go	2015-07-08 16:14:10 +0000
+++ _integration-tests/main.go	2015-07-08 17:25:32 +0000
@@ -38,12 +38,13 @@
 	defaultChannel = "edge"
 	defaultSSHPort = 22
 	defaultGoArm   = "7"
-	controlFile    = "_integration-tests/data/output/control"
+	tplOutputDir   = "_integration-tests/data/output/"
 	controlTpl     = "_integration-tests/data/tpl/control"
 )
 
 var (
 	commonSSHOptions   = []string{"---", "ssh"}
+	controlFile        = filepath.Join(tplOutputDir, "control")
 	testPackagesLatest = []string{"latest", "failover"}
 	testPackageUpdate  = []string{"update"}
 	testPackages       = append(testPackagesLatest, testPackageUpdate...)
@@ -191,6 +192,7 @@
 		log.Fatalf("Error reading adt-run control template %s", controlTpl)
 	}
 
+	prepareTargetDir(tplOutputDir)
 	outputFile, err := os.Create(controlFile)
 	if err != nil {
 		log.Fatalf("Error creating control file %s", controlFile)