Fix #2048 (test_copy_using_filecap was doing much more work than necessary).
authorDaira Hopwood <daira@jacaranda.org>
Wed, 7 Aug 2013 20:11:21 +0000 (21:11 +0100)
committerDaira Hopwood <daira@jacaranda.org>
Mon, 5 May 2014 14:29:29 +0000 (15:29 +0100)
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
src/allmydata/test/test_cli.py

index d00e6e940e4d65e08fa1ed44dc060e7648a4aff6..feca0d2fb283d52b512fd96560926a1bb3705f5c 100644 (file)
@@ -2032,9 +2032,12 @@ class Cp(GridTestMixin, CLITestMixin, unittest.TestCase):
 
         # Test that the --verbose option prints correct indices (#1805).
         d.addCallback(lambda ign:
-                      self.do_cli("cp", "--verbose", '--recursive', self.basedir, self.dircap))
+                      self.do_cli("cp", "--verbose", fn3, self.dircap))
         def _test_for_wrong_indices((rc, out, err)):
-            self.failUnless('examining 1 of 1\n' in err)
+            lines = err.split('\n')
+            self.failUnlessIn('examining 1 of 1', lines)
+            self.failUnlessIn('starting copy, 1 files, 1 directories', lines)
+            self.failIfIn('examining 0 of', err)
         d.addCallback(_test_for_wrong_indices)
         return d