From: Brian Warner <warner@lothar.com>
Date: Tue, 9 Apr 2013 19:09:37 +0000 (+0100)
Subject: test_cli: probably remove the unix-ism that broke tests on windows
X-Git-Tag: allmydata-tahoe-1.10b1~12
X-Git-Url: https://git.rkrishnan.org/vdrive/%22news.html/simplejson/nxhtml.html?a=commitdiff_plain;h=74843948d1392ec0443f6dffa523cc35b6f1126a;p=tahoe-lafs%2Ftahoe-lafs.git

test_cli: probably remove the unix-ism that broke tests on windows
---

diff --git a/src/allmydata/test/test_cli.py b/src/allmydata/test/test_cli.py
index 22886d0a..658d3ce5 100644
--- a/src/allmydata/test/test_cli.py
+++ b/src/allmydata/test/test_cli.py
@@ -3773,7 +3773,8 @@ class Options(unittest.TestCase):
         # option after, or a basedir argument after, but none in the wrong
         # place, and not more than one of the three.
         o = self.parse(["start"])
-        self.failUnlessEqual(o["basedir"], os.path.expanduser("~/.tahoe"))
+        self.failUnlessEqual(o["basedir"], os.path.join(os.path.expanduser("~"),
+                                                        ".tahoe"))
         o = self.parse(["start", "here"])
         self.failUnlessEqual(o["basedir"], os.path.abspath("here"))
         o = self.parse(["start", "--basedir", "there"])