Ticket #936: fix-test-copy-using-filecap-diff.txt

File fix-test-copy-using-filecap-diff.txt, 1.1 KB (added by davidsarah, at 2010-02-03T23:25:52Z)

Same thing as a unified diff

Line 
1Wed Feb  3 23:13:37 GMT Standard Time 2010  david-sarah@jacaranda.org
2  * Fix race condition in allmydata.test.test_cli.Cp.test_copy_using_filecap
3diff -rN -u old-tahoe/src/allmydata/test/test_cli.py new-tahoe/src/allmydata/test/test_cli.py
4--- old-tahoe/src/allmydata/test/test_cli.py    2010-02-03 23:20:06.803000000 +0000
5+++ new-tahoe/src/allmydata/test/test_cli.py    2010-02-03 23:20:10.483000000 +0000
6@@ -1007,13 +1007,13 @@
7         self.set_up_grid()
8         outdir = os.path.join(self.basedir, "outdir")
9         os.mkdir(outdir)
10-        self.do_cli("create-alias", "tahoe")
11         fn1 = os.path.join(self.basedir, "Metallica")
12         fn2 = os.path.join(outdir, "Not Metallica")
13         fn3 = os.path.join(outdir, "test2")
14         DATA1 = "puppies" * 10000
15         open(fn1, "wb").write(DATA1)
16-        d = self.do_cli("put", fn1)
17+        d = self.do_cli("create-alias", "tahoe")
18+        d.addCallback(lambda res: self.do_cli("put", fn1))
19         def _put_file((rc, out, err)):
20             self.failUnlessEqual(rc, 0)
21             # keep track of the filecap