tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

test_cli.py: fix error that crept in when rebasing the patch for #1072.

This commit is contained in:
david-sarah 2010-07-17 17:01:23 -07:00
parent c59f9b162f
commit 0d79a4a7d1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/allmydata/test/test_cli.py
View File

@ -2435,9 +2435,6 @@ class Rm(GridTestMixin, CLITestMixin, unittest.TestCase):
def test_rm_without_alias(self): def test_rm_without_alias(self):
# 'tahoe rm' should behave sensibly when invoked without an explicit # 'tahoe rm' should behave sensibly when invoked without an explicit
# alias before the default 'tahoe' alias has been created. # alias before the default 'tahoe' alias has been created.
d.addCallback(lambda ign: self.do_cli("unlink", "afile"))
d.addCallback(_check)
self.basedir = "cli/Rm/rm_without_alias" self.basedir = "cli/Rm/rm_without_alias"
self.set_up_grid() self.set_up_grid()
d = self.do_cli("rm", "afile") d = self.do_cli("rm", "afile")
@ -2446,15 +2443,15 @@ class Rm(GridTestMixin, CLITestMixin, unittest.TestCase):
self.failUnlessIn("error:", err) self.failUnlessIn("error:", err)
self.failUnlessReallyEqual(out, "") self.failUnlessReallyEqual(out, "")
d.addCallback(_check) d.addCallback(_check)
d.addCallback(lambda ign: self.do_cli("unlink", "afile"))
d.addCallback(_check)
return d return d
def test_rm_with_nonexistent_alias(self): def test_rm_with_nonexistent_alias(self):
# 'tahoe rm' should behave sensibly when invoked with an explicit # 'tahoe rm' should behave sensibly when invoked with an explicit
# alias that doesn't exist. # alias that doesn't exist.
self.basedir = "cli/Rm/rm_with_nonexistent_alias" self.basedir = "cli/Rm/rm_with_nonexistent_alias"
d.addCallback(lambda ign: self.do_cli("unlink", "nonexistent:afile"))
d.addCallback(_check)
self.set_up_grid() self.set_up_grid()
d = self.do_cli("rm", "nonexistent:afile") d = self.do_cli("rm", "nonexistent:afile")
def _check((rc, out, err)): def _check((rc, out, err)):
@ -2463,6 +2460,9 @@ class Rm(GridTestMixin, CLITestMixin, unittest.TestCase):
self.failUnlessIn("nonexistent", err) self.failUnlessIn("nonexistent", err)
self.failUnlessReallyEqual(out, "") self.failUnlessReallyEqual(out, "")
d.addCallback(_check) d.addCallback(_check)
d.addCallback(lambda ign: self.do_cli("unlink", "nonexistent:afile"))
d.addCallback(_check)
return d return d