From: Daira Hopwood <daira@jacaranda.org>
Date: Wed, 7 Aug 2013 20:11:21 +0000 (+0100)
Subject: Fix #2048 (test_copy_using_filecap was doing much more work than necessary).
X-Git-Tag: allmydata-tahoe-1.10.1a1~185
X-Git-Url: https://git.rkrishnan.org/COPYING.TGPPL.html?a=commitdiff_plain;h=20b26f773b6c910a8da4122730f58b86509d611b;p=tahoe-lafs%2Ftahoe-lafs.git

Fix #2048 (test_copy_using_filecap was doing much more work than necessary).

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---

diff --git a/src/allmydata/test/test_cli.py b/src/allmydata/test/test_cli.py
index d00e6e94..feca0d2f 100644
--- a/src/allmydata/test/test_cli.py
+++ b/src/allmydata/test/test_cli.py
@@ -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