Snappy

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

  1. no_patch_defaultCacheDir
  2. Merge into snappy-moved-to-github
Proposed by Leo Arias
Status: Merged
Approved by: Michael Vogt
Approved revision: 509
Merged at revision: 509
Proposed branch: lp:~elopio/snappy/no_patch_defaultCacheDir
Merge into: lp:~snappy-dev/snappy/snappy-moved-to-github
Prerequisite: lp:~elopio/snappy/fix1464502-patch_defaultCacheDir
Diff against target: 27 lines (+0/-3)
1 file modified
partition/bootloader_uboot_test.go (+0/-3)
To merge this branch: bzr merge lp:~elopio/snappy/no_patch_defaultCacheDir
Reviewer Review Type Date Requested Status
Michael Vogt (community) Approve
Review via email: mp+261806@code.launchpad.net

Commit message

In the PartitionTestSuite, remove the unnecesary patches for defaultCacheDir.

Description of the change

After digging in bug #1464502, I found that there are some places where we patch the defaultCacheDir, but that var is not used as we are setting the hardwareSpecFile to a temp dir.

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

Thanks, nice catch. This part of the code got some overhaul recently in the lp:~mvo/snappy/snappy-improved-developer-mode[2-4] branches. Nice cleanup in any case!

Revision history for this message
Michael Vogt (mvo) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'partition/bootloader_uboot_test.go'
2--- partition/bootloader_uboot_test.go 2015-06-12 05:27:29 +0000
3+++ partition/bootloader_uboot_test.go 2015-06-12 05:27:29 +0000
4@@ -204,7 +204,6 @@
5
6 // mock the hardwareYaml and the cacheDir
7 p.hardwareSpecFile = makeHardwareYaml(c, "bootloader: grub")
8- defaultCacheDir = c.MkDir()
9
10 err = bootloader.HandleAssets()
11 c.Assert(err, NotNil)
12@@ -221,7 +220,6 @@
13 bootloader: u-boot
14 partition-layout: inplace
15 `)
16- defaultCacheDir = c.MkDir()
17
18 err = bootloader.HandleAssets()
19 c.Assert(err, NotNil)
20@@ -247,7 +245,6 @@
21 p.hardwareSpecFile = makeHardwareYaml(c, `
22 bootloader u-boot
23 `)
24- defaultCacheDir = c.MkDir()
25
26 c.Assert(bootloader.HandleAssets(), NotNil)
27 }

Subscribers

People subscribed via source and target branches