Ticket #641: small_symlink_test.patch

src/allmydata/scripts/tahoe_backup.py

@@ -267 +267 @@
             elif os.path.isfile(childpath):
                 newfilecap, metadata = self.upload(childpath)
                 newdircontents[child] = ("filenode", newfilecap, metadata)
-            elif os.path.islink(childpath):
-                print >>self.options.stderr, "warning: symbolic links are not yet supported, ignoring '%s'" % childpath
-                break
+#             elif os.path.islink(childpath):
+#                 print >>self.options.stderr, "warning: symbolic links are not yet supported, ignoring '%s'" % childpath
+#                 break
             else:
                 if skip_problematic:
                     self.problematic_skipped += 1

src/allmydata/test/test_cli.py

@@ -1011 +1011 @@
         self.set_up_grid()
 
         # create a small local directory with one file and a symlink
-        source = os.path.join(self.basedir, "home")
-        self.writeto("foo.txt", "foo")
-        os.symlink(os.path.join(source, "foo.txt"), os.path.join(source, "foo2.txt"))
+        #source = os.path.join(self.basedir, "home")
+        #self.writeto("foo.txt", "foo")
+        #os.symlink(os.path.join(source, "foo.txt"), os.path.join(source, "foo2.txt"))
+        os.system('mkdir -p /tmp/test')
+        f = file('/tmp/test/foo.txt', 'w')
+        f.write('top secret')
+        f.close()
+        os.symlink('/tmp/test/foo.txt', '/tmp/test/foo2.txt')
 
         d = self.do_cli("create-alias", "tahoe")
 
-        d.addCallback(lambda res: self.do_cli("backup", "--no-backupdb", source, "tahoe:test"))
+        d.addCallback(lambda res: self.do_cli("backup", "--no-backupdb", '/tmp/test', "tahoe:test"))
 
         def _check((rc, out, err)):
             self.failUnlessEqual(rc, 0)
             self.failUnless(err.startswith("warning: symbolic links are not yet supported, ignoring '"))
-        d.addCallback(_check)
+        #d.addCallback(_check)
 
         return d