Merge lp:~sergiusens/snapcraft/for-ted into lp:~ted/snapcraft/aws-iot

[Sergio Schvezov]

[lp:~sergiusens/snapcraft/for-ted]

253. By Sergio Schvezov on 2015-10-29

Update unit tests for collision detection

=== modified file 'snapcraft/tests/test_cmds.py'
--- snapcraft/tests/test_cmds.py	2015-10-28 22:11:26 +0000
+++ snapcraft/tests/test_cmds.py	2015-10-29 02:43:11 +0000
@@ -25,6 +25,7 @@
 from snapcraft import (
     cmds,
     common,
+    lifecycle,
     tests
 )
 
@@ -39,16 +40,12 @@
         self.addCleanup(tmpdirObject.cleanup)
         tmpdir = tmpdirObject.name
 
-        part1 = mock.Mock()
-        part1.name = 'part1'
-        part1.code.options.stage = ['*']
+        part1 = lifecycle.load_plugin('part1', 'jdk', {'source': '.'})
         part1.installdir = tmpdir + '/install1'
         os.makedirs(part1.installdir + '/a')
         open(part1.installdir + '/a/1', mode='w').close()
 
-        part2 = mock.Mock()
-        part2.name = 'part2'
-        part2.code.options.stage = ['*']
+        part2 = lifecycle.load_plugin('part2', 'jdk', {'source': '.'})
         part2.installdir = tmpdir + '/install2'
         os.makedirs(part2.installdir + '/a')
         with open(part2.installdir + '/1', mode='w') as f:
@@ -57,9 +54,7 @@
         with open(part2.installdir + '/a/2', mode='w') as f:
             f.write('a/2')
 
-        part3 = mock.Mock()
-        part3.name = 'part3'
-        part3.code.options.stage = ['*']
+        part3 = lifecycle.load_plugin('part3', 'jdk', {'source': '.'})
         part3.installdir = tmpdir + '/install3'
         os.makedirs(part3.installdir + '/a')
         os.makedirs(part3.installdir + '/b')