ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-03 00:00:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

test_cli: use explicit (and stable) testdirs, instead of using self.mktemp

Browse Source
This commit is contained in:
Brian Warner 2009-03-07 03:04:28 -07:00
parent 091cfd04ca
commit 9c7fafd5af
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -455,7 +455,7 @@ class CreateAlias(GridTestMixin, CLITestMixin, unittest.TestCase):
self.failUnlessEqual(urls[0], expected_url) self.failUnlessEqual(urls[0], expected_url)
def test_create(self): def test_create(self):
self.basedir = os.path.dirname(self.mktemp()) self.basedir = "cli/CreateAlias/create"
self.set_up_grid() self.set_up_grid()
d = self.do_cli("create-alias", "tahoe") d = self.do_cli("create-alias", "tahoe")
@ -525,8 +525,7 @@ class Put(GridTestMixin, CLITestMixin, unittest.TestCase):
def test_unlinked_immutable_stdin(self): def test_unlinked_immutable_stdin(self):
# tahoe get `echo DATA | tahoe put` # tahoe get `echo DATA | tahoe put`
# tahoe get `echo DATA | tahoe put -` # tahoe get `echo DATA | tahoe put -`
self.basedir = "cli/Put/unlinked_immutable_stdin"
self.basedir = self.mktemp()
DATA = "data" * 100 DATA = "data" * 100
self.set_up_grid() self.set_up_grid()
d = self.do_cli("put", stdin=DATA) d = self.do_cli("put", stdin=DATA)
@ -553,9 +552,7 @@ class Put(GridTestMixin, CLITestMixin, unittest.TestCase):
# tahoe put ./file.txt # tahoe put ./file.txt
# tahoe put /tmp/file.txt # tahoe put /tmp/file.txt
# tahoe put ~/file.txt # tahoe put ~/file.txt
self.basedir = os.path.dirname(self.mktemp()) self.basedir = "cli/Put/unlinked_immutable_from_file"
# this will be "allmydata.test.test_cli/Put/test_put_from_file/RANDOM"
# and the RANDOM directory will exist. Raw mktemp returns a filename.
self.set_up_grid() self.set_up_grid()
rel_fn = os.path.join(self.basedir, "DATAFILE") rel_fn = os.path.join(self.basedir, "DATAFILE")
@ -587,7 +584,7 @@ class Put(GridTestMixin, CLITestMixin, unittest.TestCase):
# tahoe put file.txt tahoe:subdir/uploaded.txt # tahoe put file.txt tahoe:subdir/uploaded.txt
# tahoe put file.txt DIRCAP:./uploaded.txt # tahoe put file.txt DIRCAP:./uploaded.txt
# tahoe put file.txt DIRCAP:./subdir/uploaded.txt # tahoe put file.txt DIRCAP:./subdir/uploaded.txt
self.basedir = os.path.dirname(self.mktemp()) self.basedir = "cli/Put/immutable_from_file"
self.set_up_grid() self.set_up_grid()
rel_fn = os.path.join(self.basedir, "DATAFILE") rel_fn = os.path.join(self.basedir, "DATAFILE")
@ -669,7 +666,7 @@ class Put(GridTestMixin, CLITestMixin, unittest.TestCase):
# echo DATA2 | tahoe put - FILECAP # echo DATA2 | tahoe put - FILECAP
# tahoe get FILECAP, compare against DATA2 # tahoe get FILECAP, compare against DATA2
# tahoe put file.txt FILECAP # tahoe put file.txt FILECAP
self.basedir = os.path.dirname(self.mktemp()) self.basedir = "cli/Put/mutable_unlinked"
self.set_up_grid() self.set_up_grid()
DATA = "data" * 100 DATA = "data" * 100
@ -718,7 +715,7 @@ class Put(GridTestMixin, CLITestMixin, unittest.TestCase):
# echo DATA2 | tahoe put - uploaded.txt # should modify-in-place # echo DATA2 | tahoe put - uploaded.txt # should modify-in-place
# tahoe get uploaded.txt, compare against DATA2 # tahoe get uploaded.txt, compare against DATA2
self.basedir = os.path.dirname(self.mktemp()) self.basedir = "cli/Put/mutable"
self.set_up_grid() self.set_up_grid()
DATA1 = "data" * 100 DATA1 = "data" * 100
@ -750,7 +747,7 @@ class Cp(GridTestMixin, CLITestMixin, unittest.TestCase):
o.parseOptions, ["onearg"]) o.parseOptions, ["onearg"])
def test_unicode_filename(self): def test_unicode_filename(self):
self.basedir = os.path.dirname(self.mktemp()) self.basedir = "cli/Cp/unicode_filename"
self.set_up_grid() self.set_up_grid()
fn1 = os.path.join(self.basedir, "Ärtonwall") fn1 = os.path.join(self.basedir, "Ärtonwall")
@ -781,7 +778,7 @@ class Cp(GridTestMixin, CLITestMixin, unittest.TestCase):
if not hasattr(os, 'symlink'): if not hasattr(os, 'symlink'):
raise unittest.SkipTest("There is no symlink on this platform.") raise unittest.SkipTest("There is no symlink on this platform.")
# cp -r on a directory containing a dangling symlink shouldn't assert # cp -r on a directory containing a dangling symlink shouldn't assert
self.basedir = os.path.dirname(self.mktemp()) self.basedir = "cli/Cp/dangling_symlink_vs_recursion"
self.set_up_grid() self.set_up_grid()
dn = os.path.join(self.basedir, "dir") dn = os.path.join(self.basedir, "dir")
os.mkdir(dn) os.mkdir(dn)
@ -812,7 +809,7 @@ class Backup(GridTestMixin, CLITestMixin, StallMixin, unittest.TestCase):
return [int(s) for s in mo.groups()] return [int(s) for s in mo.groups()]
def test_backup(self): def test_backup(self):
self.basedir = os.path.dirname(self.mktemp()) self.basedir = "cli/Backup/backup"
self.set_up_grid() self.set_up_grid()
# is the backupdb available? If so, we test that a second backup does # is the backupdb available? If so, we test that a second backup does
@ -1038,7 +1035,8 @@ class Backup(GridTestMixin, CLITestMixin, StallMixin, unittest.TestCase):
def test_exclude_options(self): def test_exclude_options(self):
root_listdir = ('lib.a', '_darcs', 'subdir', 'nice_doc.lyx') root_listdir = ('lib.a', '_darcs', 'subdir', 'nice_doc.lyx')
subdir_listdir = ('another_doc.lyx', 'run_snake_run.py', 'CVS', '.svn', '_darcs') subdir_listdir = ('another_doc.lyx', 'run_snake_run.py', 'CVS', '.svn', '_darcs')
basedir = os.path.dirname(self.mktemp()) basedir = "cli/Backup/exclude_options"
fileutil.make_dirs(basedir)
nodeurl_path = os.path.join(basedir, 'node.url') nodeurl_path = os.path.join(basedir, 'node.url')
nodeurl = file(nodeurl_path, 'w') nodeurl = file(nodeurl_path, 'w')
nodeurl.write('http://example.net:2357/') nodeurl.write('http://example.net:2357/')