Merge lp:~verterok/ubuntuone-client/fix-440133 into lp:ubuntuone-client

[Guillermo Gonzalez]

Fix Bug #440133 and add tests for EnableShareWrite context manager

[Guillermo Gonzalez (verterok)]

Fix Bug #440133 and add tests for EnableShareWrite context manager

[Tim Cole (tcole)]

Looks reasonable.

review: Approve

[Nicola Larosa (teknico)]

Yes, nice, apart from some too long lines, but pylint does not work on the client code anyway, does it?

review: Approve

[dobey (dobey)]

The attempt to merge lp:~verterok/ubuntuone-client/fix-440133 into lp:ubuntuone-client failed.Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
(B testing autoconf2.50... not found.
  testing autoconf... found 2.64
checking for automake >= 1.10...
(B testing automake-1.11... found 1.11
checking for libtool >= 1.5...
(B testing libtoolize... found 2.2.6
checking for intltool >= 0.30...
(B testing intltoolize... found 0.41.0
checking for pkg-config >= 0.14.0...
(B testing pkg-config... found 0.22
Checking for required M4 macros...
(BChecking for forbidden M4 macros...
(BProcessing ./configure.ac
(BRunning libtoolize...
(Blibtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
(BRunning aclocal-1.11...
(BRunning autoconf...
(BRunning autoheader...
(BRunning automake-1.11...
(BRunning ./configure --enable-maintainer-mode --prefix=/usr ...
(Bchecking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking for C compiler default output file name... a.out
checking whether the C compiler works... yes
checking whether we are cross compiling... no
checking for suffix of executables...
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload obje...

[lp:~verterok/ubuntuone-client/fix-440133]

237. By Guillermo Gonzalez on 2009-10-07

remove unused import

=== modified file 'bin/ubuntuone-syncdaemon'
--- bin/ubuntuone-syncdaemon	2009-09-30 16:30:21 +0000
+++ bin/ubuntuone-syncdaemon	2009-10-07 15:21:11 +0000
@@ -147,6 +147,10 @@
                 os.makedirs(parent)
             shutil.move(old_data_dir, options.data_dir)
     if not os.path.exists(options.data_dir):
+        parent = os.path.dirname(options.data_dir)
+        if os.path.exists(parent) and not os.access(parent, os.W_OK):
+            # make the parent dir writable
+            os.chmod(parent, 0775)
         os.makedirs(options.data_dir)
 
     # create the partials_dir

=== modified file 'tests/syncdaemon/test_fsm.py'
--- tests/syncdaemon/test_fsm.py	2009-09-22 15:19:25 +0000
+++ tests/syncdaemon/test_fsm.py	2009-10-07 15:21:11 +0000
@@ -29,6 +29,7 @@
 )
 
 from ubuntuone.syncdaemon.filesystem_manager import (
+    EnableShareWrite,
     FileSystemManager,
     InconsistencyError,
     METADATA_VERSION,
@@ -2230,6 +2231,48 @@
         self.assertTrue(os.path.exists(self.fsm.get_abspath("", a_dir_root)))
         self.assertTrue(os.path.exists(a_dir_share))
 
+
+class TestEnableShareWrite(FSMTestCase):
+    """Tests for EnableShareWrite context manager"""
+
+    def setUp(self):
+        """Test setup"""
+        FSMTestCase.setUp(self)
+        # create a ro share
+        self.share_ro = self.create_share('share_ro', 'share_ro_name',
+                                       self.fsm, self.shares_dir, access_level='View')
+        self.share_ro_path = self.share_ro.path
+
+    def test_write_in_ro_share(self):
+        """test the EnableShareWrite context manager in a ro share"""
+        path = os.path.join(self.share_ro_path, 'foo', 'a_file_in_a_ro_share')
+        data = 'yes I can write!'
+        can_write_parent = os.access(os.path.dirname(self.share_ro_path), os.W_OK)
+        with EnableShareWrite(self.share_ro, path):
+            with open(path, 'w') as f:
+                f.write(data)
+        self.assertEquals(data, open(path, 'r').read())
+        self.assertFalse(os.access(self.share_ro_path, os.W_OK))
+        # check that the parent permissions are ok
+        self.assertEquals(can_write_parent, os.access(os.path.dirname(self.share_ro_path), os.W_OK))
+        # fail to write directly in the share
+        self.assertRaises(IOError, open, path, 'w')
+
+
+    def test_write_in_rw_share(self):
+        """test the EnableShareWrite context manager in a rw share"""
+        path = os.path.join(self.share_path, 'a_file_in_a_rw_share')
+        data = 'yes I can write!'
+        can_write_parent = os.access(os.path.dirname(self.share_path), os.W_OK)
+        with EnableShareWrite(self.share, path):
+            with open(path, 'w') as f:
+                f.write(data)
+        self.assertEquals(data, open(path, 'r').read())
+        self.assertTrue(os.access(self.share_path, os.W_OK))
+        # check that the parent permissions are ok
+        self.assertEquals(can_write_parent, os.access(self.share_path, os.W_OK))
+
+
 def test_suite():
     # pylint: disable-msg=C0111
     return unittest.TestLoader().loadTestsFromName(__name__)