Skip to content

E
edx-platform
Commit 2edf1aef by Jesse Zoldak
Options

Merge pull request #4798 from edx/zoldak/rmtree-cleanup 

Ignore errors on rmtree cleanup
parents 680d5031 9a25c9ff
Showing with 3 additions and 3 deletions
common/lib/xmodule/xmodule/modulestore/tests/test_cross_modulestore_import_export.py
...@@ -102,7 +102,7 @@ class MongoModulestoreBuilder(object): ...@@ -102,7 +102,7 @@ class MongoModulestoreBuilder(object):
modulestore._drop_database() modulestore._drop_database()
# Delete the created directory on the filesystem # Delete the created directory on the filesystem
rmtree(fs_root) rmtree(fs_root, ignore_errors=True)
def __repr__(self): def __repr__(self):
return 'MongoModulestoreBuilder()' return 'MongoModulestoreBuilder()'
...@@ -145,7 +145,7 @@ class VersioningModulestoreBuilder(object): ...@@ -145,7 +145,7 @@ class VersioningModulestoreBuilder(object):
modulestore._drop_database() modulestore._drop_database()
# Delete the created directory on the filesystem # Delete the created directory on the filesystem
rmtree(fs_root) rmtree(fs_root, ignore_errors=True)
def __repr__(self): def __repr__(self):
return 'SplitModulestoreBuilder()' return 'SplitModulestoreBuilder()'
...@@ -242,7 +242,7 @@ class CrossStoreXMLRoundtrip(CourseComparisonTest): ...@@ -242,7 +242,7 @@ class CrossStoreXMLRoundtrip(CourseComparisonTest):
def setUp(self): def setUp(self):
super(CrossStoreXMLRoundtrip, self).setUp() super(CrossStoreXMLRoundtrip, self).setUp()
self.export_dir = mkdtemp() self.export_dir = mkdtemp()
self.addCleanup(rmtree, self.export_dir) self.addCleanup(rmtree, self.export_dir, ignore_errors=True)
@ddt.data(*itertools.product( @ddt.data(*itertools.product(
MODULESTORE_SETUPS, MODULESTORE_SETUPS,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment