From: david-sarah <david-sarah@jacaranda.org>
Date: Thu, 4 Aug 2011 00:30:32 +0000 (-0700)
Subject: test_runner.py: fix a bug in CreateNode.do_create introduced in changeset [5114]... 
X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=b9eb0235ea38ce37b908399751709ce37c1c27d9;p=tahoe-lafs%2Ftahoe-lafs.git

test_runner.py: fix a bug in CreateNode.do_create introduced in changeset [5114] when the tahoe.cfg file has been written with CRLF line endings. refs #1385
---

diff --git a/src/allmydata/test/test_runner.py b/src/allmydata/test/test_runner.py
index 22678f6f..ba74b153 100644
--- a/src/allmydata/test/test_runner.py
+++ b/src/allmydata/test/test_runner.py
@@ -246,7 +246,7 @@ class CreateNode(unittest.TestCase):
             # 'create-node', and disabled for 'create-client'.
             tahoe_cfg = os.path.join(n1, "tahoe.cfg")
             self.failUnless(os.path.exists(tahoe_cfg))
-            content = fileutil.read(tahoe_cfg)
+            content = fileutil.read(tahoe_cfg).replace('\r\n', '\n')
             if kind == "client":
                 self.failUnless(re.search(r"\n\[storage\]\n#.*\nenabled = false\n", content), content)
             else: