Merge lp:~elopio/snapcraft/fix1497371-clean_clean into lp:~snappy-dev/snapcraft/core

[Leo Arias]

On clean, check the contents of the parts dir only if it exists.

[lp:~elopio/snapcraft/fix1497371-clean_clean]

182. By Leo Arias on 2015-09-18

80 column

[Sergio Schvezov (sergiusens)]

Nice catch!

How about a test that runs clean twice? :-)

[lp:~elopio/snapcraft/fix1497371-clean_clean]

183. By Leo Arias on 2015-09-18

Added a second call to clean in integration tests.

[Sergio Schvezov (sergiusens)]

review: Approve

=== modified file 'integration-tests/units/jobs.pxu'
--- integration-tests/units/jobs.pxu	2015-09-18 13:42:57 +0000
+++ integration-tests/units/jobs.pxu	2015-09-18 17:21:03 +0000
@@ -119,6 +119,9 @@
     test ! -d ./stage
     test ! -d ./parts
     test ! -d ./snap
+    # Clean a second time doesn't fail.
+    # Regression test for https://bugs.launchpad.net/snapcraft/+bug/1497371
+    ${SNAPCRAFT} clean
 
 id: snapcraft/normal/simple-cmake
 plugin: shell
@@ -325,4 +328,3 @@
     ${SNAPCRAFT} pull
     test -f parts/python2/install/usr/lib/python2.7/argparse.py
     test -f parts/python3/install/usr/lib/python3.4/argparse.py
-

=== modified file 'snapcraft/cmds.py'
--- snapcraft/cmds.py	2015-09-17 18:02:05 +0000
+++ snapcraft/cmds.py	2015-09-18 17:21:03 +0000
@@ -237,7 +237,8 @@
             shutil.rmtree(part.partdir)
 
     # parts dir does not contain only generated code.
-    if not os.listdir(common.get_partsdir()):
+    if (os.path.exists(common.get_partsdir()) and
+            not os.listdir(common.get_partsdir())):
         os.rmdir(common.get_partsdir())
 
     logger.info('Cleaning up staging area')

=== modified file 'snapcraft/tests/test_cmds.py'
--- snapcraft/tests/test_cmds.py	2015-09-17 18:02:05 +0000
+++ snapcraft/tests/test_cmds.py	2015-09-18 17:21:03 +0000
@@ -134,6 +134,8 @@
             mock.call().__bool__(),
             mock.call('partdir3'),
             mock.call().__bool__(),
+            mock.call(common.get_partsdir()),
+            mock.call().__bool__(),
             mock.call(common.get_stagedir()),
             mock.call().__bool__(),
             mock.call(common.get_snapdir()),
@@ -152,6 +154,7 @@
 
     def test_everything_is_clean(self):
         self.mock_exists.return_value = False
+        self.mock_listdir.side_effect = FileNotFoundError()
 
         cmds.clean({})
 
@@ -159,12 +162,12 @@
             mock.call('partdir1'),
             mock.call('partdir2'),
             mock.call('partdir3'),
+            mock.call(common.get_partsdir()),
             mock.call(common.get_stagedir()),
             mock.call(common.get_snapdir()),
         ])
 
-        self.mock_rmdir.assert_called_once_with(common.get_partsdir())
-
+        self.assertFalse(self.mock_rmdir.called)
         self.assertFalse(self.mock_rmtree.called)
 
     def test_no_parts_defined(self):