Snappy

Merge lp:~elopio/snappy/fix1464502-patch_defaultCacheDir-again into lp:~snappy-dev/snappy/snappy-moved-to-github

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

Commit message

In the uboot TestHandleAssetsNoHardwareYaml, patch the hardwareSpecFile so it doesn't attempt to read the real path in /writable.

Description of the change

This was fixed, but got reintroduced by the changes on partition.go. Now the hardwareSpecFile value is assigned when the package is imported, so it's not enough to patch the cache dir. We have to patch the path.

To post a comment you must log in.
Revision history for this message
John Lenton (chipaca) wrote :

good one!

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-24 13:42:15 +0000
3+++ partition/bootloader_uboot_test.go 2015-06-26 16:43:19 +0000
4@@ -218,6 +218,7 @@
5
6 func (s *PartitionTestSuite) TestHandleAssetsNoHardwareYaml(c *C) {
7 s.makeFakeUbootEnv(c)
8+ hardwareSpecFile = filepath.Join(c.MkDir(), "non-existent.yaml")
9
10 p := New()
11 bootloader, err := bootloader(p)

Subscribers

People subscribed via source and target branches