Merge lp:~james-page/charm-helpers/fstab-tabs into lp:charm-helpers

[James Page]

Fixup problem with fstab parsing if tabs are used instead of spaces

[Liam Young (gnuoy)]

lgtm

review: Approve

=== modified file 'charmhelpers/core/fstab.py'
--- charmhelpers/core/fstab.py	2014-06-02 16:35:43 +0000
+++ charmhelpers/core/fstab.py	2014-06-19 09:43:25 +0000
@@ -48,9 +48,11 @@
         file.__init__(self, self._path, 'r+')
 
     def _hydrate_entry(self, line):
+        # NOTE: use split with no arguments to split on any
+        #       whitespace including tabs
         return Fstab.Entry(*filter(
             lambda x: x not in ('', None),
-            line.strip("\n").split(" ")))
+            line.strip("\n").split()))
 
     @property
     def entries(self):
 
=== modified file 'tests/core/test_fstab.py'
--- tests/core/test_fstab.py	2014-06-02 15:17:00 +0000
+++ tests/core/test_fstab.py	2014-06-19 09:43:25 +0000
@@ -13,10 +13,13 @@
 
 DEFAULT_FSTAB_FILE = """/dev/sda /mnt/sda ext3 defaults 0 0
 /dev/sdb /mnt/sdb ext3 defaults 0 0
-/dev/sdc /mnt/sdc ext3 defaults 0 0
+/dev/sdc	/mnt/sdc	ext3	defaults	0	0
 UUID=3af44368-c50b-4768-8e58-aff003cef8be / ext4 errors=remount-ro 0 1
 """
 
+# NOTE: helper will writeback with spaces instead of tabs
+GENERATED_FSTAB_FILE = DEFAULT_FSTAB_FILE.replace('\t', ' ')
+
 
 class FstabTest(unittest.TestCase):
 
@@ -31,7 +34,7 @@
 
     def test_entries(self):
         """Test if entries are correctly readed from fstab file"""
-        assert_equal(sorted(DEFAULT_FSTAB_FILE.splitlines()),
+        assert_equal(sorted(GENERATED_FSTAB_FILE.splitlines()),
                      sorted(str(entry) for entry in self.fstab.entries))
 
     def test_get_entry_by_device_attr(self):
@@ -82,5 +85,5 @@
             'UUID=3af44368-c50b-4768-8e58-aff003cef8be',
             '/', 'ext4', 'errors=remount-ro', 0, 1))
 
-        assert_equal(sorted(DEFAULT_FSTAB_FILE.splitlines()),
+        assert_equal(sorted(GENERATED_FSTAB_FILE.splitlines()),
                      sorted(str(entry) for entry in self.fstab.entries))
 
=== modified file 'tests/tools/test_charm_helper_sync.py'
--- tests/tools/test_charm_helper_sync.py	2013-07-12 01:28:42 +0000
+++ tests/tools/test_charm_helper_sync.py	2014-06-19 09:43:25 +0000
@@ -22,7 +22,8 @@
         '''It properly branches the correct helpers branch'''
         with patch('subprocess.check_call') as check_call:
             sync.clone_helpers(work_dir='/tmp/foo', branch='lp:charm-helpers')
-            check_call.assert_called_with(['bzr', 'branch',
+            check_call.assert_called_with(['bzr',
+                                           'checkout', '--lightweight',
                                            'lp:charm-helpers',
                                            '/tmp/foo/charm-helpers'])