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

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

Commit message

In the uboot TestHandleAssetsNoHardwareYaml, patch the cache dir before creating the partition type.

Description of the change

With this change, the bootloader will search for the partition hardware yaml in a tmp dir.

To post a comment you must log in.
508. By Leo Arias

Added a space.

Revision history for this message
Michael Vogt (mvo) wrote :

Nice, thank you!

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-09 17:43:20 +0000
3+++ partition/bootloader_uboot_test.go 2015-06-12 05:17:13 +0000
4@@ -229,12 +229,12 @@
5
6 func (s *PartitionTestSuite) TestHandleAssetsNoHardwareYaml(c *C) {
7 s.makeFakeUbootEnv(c)
8+ defaultCacheDir = c.MkDir()
9+
10 p := New()
11 bootloader, err := bootloader(p)
12 c.Assert(err, IsNil)
13
14- defaultCacheDir = c.MkDir()
15-
16 c.Assert(bootloader.HandleAssets(), IsNil)
17 }
18

Subscribers

People subscribed via source and target branches