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

[Leo Arias]

In the PartitionTestSuite, remove the unnecesary patches for defaultCacheDir.

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.

[Michael Vogt (mvo)]

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!

[Michael Vogt (mvo)]

review: Approve

=== modified file 'partition/bootloader_uboot_test.go'
--- partition/bootloader_uboot_test.go	2015-06-12 05:27:29 +0000
+++ partition/bootloader_uboot_test.go	2015-06-12 05:27:29 +0000
@@ -204,7 +204,6 @@
 
 	// mock the hardwareYaml and the cacheDir
 	p.hardwareSpecFile = makeHardwareYaml(c, "bootloader: grub")
-	defaultCacheDir = c.MkDir()
 
 	err = bootloader.HandleAssets()
 	c.Assert(err, NotNil)
@@ -221,7 +220,6 @@
 bootloader: u-boot
 partition-layout: inplace
 `)
-	defaultCacheDir = c.MkDir()
 
 	err = bootloader.HandleAssets()
 	c.Assert(err, NotNil)
@@ -247,7 +245,6 @@
 	p.hardwareSpecFile = makeHardwareYaml(c, `
 bootloader u-boot
 `)
-	defaultCacheDir = c.MkDir()
 
 	c.Assert(bootloader.HandleAssets(), NotNil)
 }