Snappy

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

  1. fix_tpl
  2. Merge into snappy-moved-to-github
Proposed by Leo Arias
Status: Merged
Approved by: Leo Arias
Approved revision: 572
Merged at revision: 573
Proposed branch: lp:~elopio/snappy/fix_tpl
Merge into: lp:~snappy-dev/snappy/snappy-moved-to-github
Diff against target: 26 lines (+3/-1)
1 file modified
_integration-tests/main.go (+3/-1)
To merge this branch: bzr merge lp:~elopio/snappy/fix_tpl
Reviewer Review Type Date Requested Status
Federico Gimenez (community) Approve
Snappy Developers Pending
Review via email: mp+264181@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
Federico Gimenez (fgimenez) wrote :

Awesome thanks :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '_integration-tests/main.go'
2--- _integration-tests/main.go 2015-07-08 16:14:10 +0000
3+++ _integration-tests/main.go 2015-07-08 17:25:32 +0000
4@@ -38,12 +38,13 @@
5 defaultChannel = "edge"
6 defaultSSHPort = 22
7 defaultGoArm = "7"
8- controlFile = "_integration-tests/data/output/control"
9+ tplOutputDir = "_integration-tests/data/output/"
10 controlTpl = "_integration-tests/data/tpl/control"
11 )
12
13 var (
14 commonSSHOptions = []string{"---", "ssh"}
15+ controlFile = filepath.Join(tplOutputDir, "control")
16 testPackagesLatest = []string{"latest", "failover"}
17 testPackageUpdate = []string{"update"}
18 testPackages = append(testPackagesLatest, testPackageUpdate...)
19@@ -191,6 +192,7 @@
20 log.Fatalf("Error reading adt-run control template %s", controlTpl)
21 }
22
23+ prepareTargetDir(tplOutputDir)
24 outputFile, err := os.Create(controlFile)
25 if err != nil {
26 log.Fatalf("Error creating control file %s", controlFile)

Subscribers

People subscribed via source and target branches