aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tests/test_workbench.py
diff options
context:
space:
mode:
authorJoar Wandborg <git@wandborg.com>2011-06-15 22:18:24 +0200
committerJoar Wandborg <git@wandborg.com>2011-06-15 22:18:24 +0200
commit9e883ed3b223311e3325e41e75dec7ee82875ac2 (patch)
treede5c404187681bf35d7a92e917c54a69e902df91 /mediagoblin/tests/test_workbench.py
parenta48014d67a5185c645ac876d365b4cb85cbb6b1f (diff)
parent0e9dd2a28669a4d42c4a3828dbd047937acd776c (diff)
downloadmediagoblin-9e883ed3b223311e3325e41e75dec7ee82875ac2.tar.lz
mediagoblin-9e883ed3b223311e3325e41e75dec7ee82875ac2.tar.xz
mediagoblin-9e883ed3b223311e3325e41e75dec7ee82875ac2.zip
Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/tests/test_workbench.py')
-rw-r--r--mediagoblin/tests/test_workbench.py50
1 files changed, 24 insertions, 26 deletions
diff --git a/mediagoblin/tests/test_workbench.py b/mediagoblin/tests/test_workbench.py
index 89f2ef33..953835a1 100644
--- a/mediagoblin/tests/test_workbench.py
+++ b/mediagoblin/tests/test_workbench.py
@@ -30,29 +30,29 @@ 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')
+ this_workbench.destroy_self()
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'))
-
- 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)
-
- # make sure we can't kill other stuff though
- dont_kill_this = tempfile.mkdtemp()
+ assert os.path.exists(tmpfile_name)
- assert_raises(
- workbench.WorkbenchOutsideScope,
- self.workbench_manager.destroy_workbench,
- dont_kill_this)
+ wb_dir = this_workbench.dir
+ this_workbench.destroy_self()
+ assert not os.path.exists(tmpfile_name)
+ assert not os.path.exists(wb_dir)
def test_localized_file(self):
tmpdir, this_storage = get_tmp_filestorage()
@@ -65,8 +65,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')
@@ -77,20 +76,19 @@ class TestWorkbench(object):
with this_storage.get_file(filepath, 'w') as our_file:
our_file.write('Our file')
- filename = self.workbench_manager.localized_file(
- this_workbench, this_storage, filepath)
+ filename = this_workbench.localized_file(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')
+ filename = this_workbench.localized_file(
+ 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)
+ filename = this_workbench.localized_file(
+ this_storage, filepath, 'thisfile.text', False)
assert filename == os.path.join(
- this_workbench, 'thisfile.text')
+ this_workbench.dir, 'thisfile.text')