From 73f24f5a2bb5aba9617856ca2e46ce49411dc302 Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Wed, 18 Mar 2015 13:14:05 -0700 Subject: [PATCH] manager: fixes for windows: use shutil.move instead of os.rename to allow move to existing file tests: reset workdir before deleting temp dir --- pywb/manager/manager.py | 3 ++- tests/test_auto_colls.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pywb/manager/manager.py b/pywb/manager/manager.py index 9bd57a6b..ca9adb4a 100644 --- a/pywb/manager/manager.py +++ b/pywb/manager/manager.py @@ -145,7 +145,8 @@ directory structure expected by pywb merged.write(line) last_line = line - os.rename(merged_file, cdx_file) + shutil.move(merged_file, cdx_file) + #os.rename(merged_file, cdx_file) os.remove(temp_file) def set_metadata(self, namevalue_pairs): diff --git a/tests/test_auto_colls.py b/tests/test_auto_colls.py index 6b140b15..63a86e3c 100644 --- a/tests/test_auto_colls.py +++ b/tests/test_auto_colls.py @@ -37,12 +37,12 @@ def setup_module(): root_dir = os.getcwd() def teardown_module(): - global root_dir - shutil.rmtree(root_dir) - global orig_cwd os.chdir(orig_cwd) + global root_dir + shutil.rmtree(root_dir) + #============================================================================= class TestManagedColls(object):