aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tests/test_workbench.py
diff options
context:
space:
mode:
authorElrond <elrond+mediagoblin.org@samba-tng.org>2011-06-13 00:36:56 +0200
committerElrond <elrond+mediagoblin.org@samba-tng.org>2011-06-13 00:39:41 +0200
commit52426ae01f0439af2833656a74eda70a240d66ae (patch)
tree0b49dec3f6033739e0727366f23480202241d115 /mediagoblin/tests/test_workbench.py
parent34d35a23930815438a4e1d8b28ec17016fb938c0 (diff)
downloadmediagoblin-52426ae01f0439af2833656a74eda70a240d66ae.tar.lz
mediagoblin-52426ae01f0439af2833656a74eda70a240d66ae.tar.xz
mediagoblin-52426ae01f0439af2833656a74eda70a240d66ae.zip
Create a Workbench class and use it everywhere.
Some references to Workbench.dir look ugly, I'm happy to hear suggestions there.
Diffstat (limited to 'mediagoblin/tests/test_workbench.py')
-rw-r--r--mediagoblin/tests/test_workbench.py30
1 files changed, 18 insertions, 12 deletions
diff --git a/mediagoblin/tests/test_workbench.py b/mediagoblin/tests/test_workbench.py
index 89f2ef33..2795cd63 100644
--- a/mediagoblin/tests/test_workbench.py
+++ b/mediagoblin/tests/test_workbench.py
@@ -30,24 +30,31 @@ class TestWorkbench(object):
def test_create_workbench(self):
workbench = self.workbench_manager.create_workbench()
- assert os.path.isdir(workbench)
- assert workbench.startswith(self.workbench_manager.base_workbench_dir)
+ assert os.path.isdir(workbench.dir)
+ assert workbench.dir.startswith(self.workbench_manager.base_workbench_dir)
+
+ def test_joinpath(self):
+ this_workbench = self.workbench_manager.create_workbench()
+ tmpname = this_workbench.joinpath('temp.txt')
+ assert tmpname == os.path.join(this_workbench.dir, 'temp.txt')
+ self.workbench_manager.destroy_workbench(this_workbench)
def test_destroy_workbench(self):
# kill a workbench
this_workbench = self.workbench_manager.create_workbench()
- tmpfile = file(os.path.join(this_workbench, 'temp.txt'), 'w')
+ tmpfile_name = this_workbench.joinpath('temp.txt')
+ tmpfile = file(tmpfile_name, 'w')
with tmpfile:
tmpfile.write('lollerskates')
- assert os.path.exists(os.path.join(this_workbench, 'temp.txt'))
+ assert os.path.exists(tmpfile_name)
self.workbench_manager.destroy_workbench(this_workbench)
- assert not os.path.exists(os.path.join(this_workbench, 'temp.txt'))
- assert not os.path.exists(this_workbench)
+ assert not os.path.exists(tmpfile_name)
+ assert not os.path.exists(this_workbench.dir)
# make sure we can't kill other stuff though
- dont_kill_this = tempfile.mkdtemp()
+ dont_kill_this = workbench.Workbench(tempfile.mkdtemp())
assert_raises(
workbench.WorkbenchOutsideScope,
@@ -65,8 +72,7 @@ class TestWorkbench(object):
our_file.write('Our file')
# with a local file storage
- filename = self.workbench_manager.localized_file(
- this_workbench, this_storage, filepath)
+ filename = this_workbench.localized_file(this_storage, filepath)
assert filename == os.path.join(
tmpdir, 'dir1/dir2/ourfile.txt')
@@ -80,17 +86,17 @@ class TestWorkbench(object):
filename = self.workbench_manager.localized_file(
this_workbench, this_storage, filepath)
assert filename == os.path.join(
- this_workbench, 'ourfile.txt')
+ this_workbench.dir, 'ourfile.txt')
# fake remote file storage, filename_if_copying set
filename = self.workbench_manager.localized_file(
this_workbench, this_storage, filepath, 'thisfile')
assert filename == os.path.join(
- this_workbench, 'thisfile.txt')
+ this_workbench.dir, 'thisfile.txt')
# fake remote file storage, filename_if_copying set,
# keep_extension_if_copying set to false
filename = self.workbench_manager.localized_file(
this_workbench, this_storage, filepath, 'thisfile.text', False)
assert filename == os.path.join(
- this_workbench, 'thisfile.text')
+ this_workbench.dir, 'thisfile.text')