ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-24 07:06:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

test_cli: remove windows-worrying newlines from test data

Browse Source
This commit is contained in:
Brian Warner 2008-08-01 19:47:34 -07:00
parent 35afe726c1
commit b9f4006b96
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,8 +260,8 @@ class Put(SystemTestMixin, CLITestMixin, unittest.TestCase):
d.addCallback(lambda res: self.do_cli("put", stdin=DATA))
def _uploaded(res):
(stdout, stderr) = res
self.failUnlessEqual(stderr,
"waiting for file data on stdin..\n200 OK\n")
self.failUnless("waiting for file data on stdin.." in stderr)
self.failUnless("200 OK" in stderr)
self.readcap = stdout
self.failUnless(self.readcap.startswith("URI:CHK:"))
d.addCallback(_uploaded)
@ -289,7 +289,7 @@ class Put(SystemTestMixin, CLITestMixin, unittest.TestCase):
abs_fn = os.path.abspath(rel_fn)
# we make the file small enough to fit in a LIT file, for speed
f = open(rel_fn, "w")
f.write("short file\n")
f.write("short file")
f.close()
d = self.set_up_nodes()
d.addCallback(lambda res: self.do_cli("put", rel_fn))
@ -320,8 +320,8 @@ class Put(SystemTestMixin, CLITestMixin, unittest.TestCase):
rel_fn = os.path.join(self.basedir, "DATAFILE")
abs_fn = os.path.abspath(rel_fn)
# we make the file small enough to fit in a LIT file, for speed
DATA = "short file\n"
DATA2 = "short file two\n"
DATA = "short file"
DATA2 = "short file two"
f = open(rel_fn, "w")
f.write(DATA)
f.close()
@ -412,8 +412,8 @@ class Put(SystemTestMixin, CLITestMixin, unittest.TestCase):
d.addCallback(lambda res: self.do_cli("put", "--mutable", stdin=DATA))
def _created(res):
(stdout, stderr) = res
self.failUnlessEqual(stderr,
"waiting for file data on stdin..\n200 OK\n")
self.failUnless("waiting for file data on stdin.." in stderr)
self.failUnless("200 OK" in stderr)
self.filecap = stdout
self.failUnless(self.filecap.startswith("URI:SSK:"))
d.addCallback(_created)
@ -423,8 +423,8 @@ class Put(SystemTestMixin, CLITestMixin, unittest.TestCase):
d.addCallback(lambda res: self.do_cli("put", "-", self.filecap, stdin=DATA2))
def _replaced(res):
(stdout, stderr) = res
self.failUnlessEqual(stderr,
"waiting for file data on stdin..\n200 OK\n")
self.failUnless("waiting for file data on stdin.." in stderr)
self.failUnless("200 OK" in stderr)
self.failUnlessEqual(self.filecap, stdout)
d.addCallback(_replaced)
d.addCallback(lambda res: self.do_cli("get", self.filecap))
@ -433,7 +433,7 @@ class Put(SystemTestMixin, CLITestMixin, unittest.TestCase):
d.addCallback(lambda res: self.do_cli("put", rel_fn, self.filecap))
def _replaced2(res):
(stdout, stderr) = res
self.failUnlessEqual(stderr, "200 OK\n")
self.failUnless("200 OK" in stderr)
self.failUnlessEqual(self.filecap, stdout)
d.addCallback(_replaced2)
d.addCallback(lambda res: self.do_cli("get", self.filecap))