diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-11 21:20:26 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-11 21:20:26 -0500 |
| commit | fdc5003903584ec8a1e83ccf80ebb6d3be3c671e (patch) | |
| tree | 370a47770ec703b3100e96c7c524842feecc7cf4 /mediagoblin/tests | |
| parent | a32acafa0bfebfc886a05414b4e33943d358efc7 (diff) | |
| download | mediagoblin-fdc5003903584ec8a1e83ccf80ebb6d3be3c671e.tar.lz mediagoblin-fdc5003903584ec8a1e83ccf80ebb6d3be3c671e.tar.xz mediagoblin-fdc5003903584ec8a1e83ccf80ebb6d3be3c671e.zip | |
Don't bother returning whether or not we copied it or not, we can
figure that out by looking to see whether our storage is local or not.
Diffstat (limited to 'mediagoblin/tests')
| -rw-r--r-- | mediagoblin/tests/test_workbench.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mediagoblin/tests/test_workbench.py b/mediagoblin/tests/test_workbench.py index f08a26a0..994688c4 100644 --- a/mediagoblin/tests/test_workbench.py +++ b/mediagoblin/tests/test_workbench.py @@ -65,9 +65,8 @@ class TestWorkbench(object): our_file.write('Our file') # with a local file storage - filename, copied = self.workbench_manager.possibly_localize_file( + filename = self.workbench_manager.possibly_localize_file( this_workbench, this_storage, filepath) - assert copied is False assert filename == os.path.join( tmpdir, 'dir1/dir2/ourfile.txt') @@ -78,20 +77,20 @@ class TestWorkbench(object): with this_storage.get_file(filepath, 'w') as our_file: our_file.write('Our file') - filename, copied = self.workbench_manager.possibly_localize_file( + filename = self.workbench_manager.possibly_localize_file( this_workbench, this_storage, filepath) assert filename == os.path.join( this_workbench, 'ourfile.txt') # fake remote file storage, filename_if_copying set - filename, copied = self.workbench_manager.possibly_localize_file( + filename = self.workbench_manager.possibly_localize_file( this_workbench, this_storage, filepath, 'thisfile') assert filename == os.path.join( this_workbench, 'thisfile.txt') # fake remote file storage, filename_if_copying set, # keep_extension_if_copying set to false - filename, copied = self.workbench_manager.possibly_localize_file( + filename = self.workbench_manager.possibly_localize_file( this_workbench, this_storage, filepath, 'thisfile.text', False) assert filename == os.path.join( this_workbench, 'thisfile.text') |