archive/blender-asset-manager
Archived
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup: ws & ignore errors removing a dir

Browse Source
This commit is contained in:
Campbell Barton
2014-11-14 17:08:13 +01:00
parent 70b27732c0
commit 29b10c260b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/test_cli.py
View File

@@ -130,7 +130,7 @@ def server(mode='testing', debug=False):
def run_testing_server(): def run_testing_server():
from application import app from application import app
# If we run the server in testing mode (the default) we override sqlite database, # If we run the server in testing mode (the default) we override sqlite database,
# with a testing, disposable one (create TMP dir) # with a testing, disposable one (create TMP dir)
if mode == 'testing': if mode == 'testing':
from application import db from application import db
@@ -179,7 +179,7 @@ class BamSessionTestCase(unittest.TestCase):
if not os.path.isdir(self.path_local_store): if not os.path.isdir(self.path_local_store):
os.makedirs(self.path_local_store) os.makedirs(self.path_local_store)
# Create remote storage (usually is on the server). # Create remote storage (usually is on the server).
# SVN repo and SVN checkout will live here # SVN repo and SVN checkout will live here
if not os.path.isdir(self.path_remote_store): if not os.path.isdir(self.path_remote_store):
os.makedirs(self.path_remote_store) os.makedirs(self.path_remote_store)
@@ -243,7 +243,7 @@ class BamInitTest(BamSessionTestCase):
class BamListTest(BamSessionTestCase): class BamListTest(BamSessionTestCase):
"""Test for the `bam ls --json` command. We run it with --json for easier command """Test for the `bam ls --json` command. We run it with --json for easier command
output parsing. output parsing.
""" """
def __init__(self, *args): def __init__(self, *args):
@@ -254,7 +254,7 @@ class BamListTest(BamSessionTestCase):
self.init_repo() self.init_repo()
d = os.path.join(self.path_local_store, self.proj_name) d = os.path.join(self.path_local_store, self.proj_name)
stdout, stderr = bam_run(["ls", "--json"], d) stdout, stderr = bam_run(["ls", "--json"], d)
self.assertEqual("", stderr) self.assertEqual("", stderr)
@@ -267,5 +267,6 @@ if __name__ == '__main__':
p = server() p = server()
unittest.main(exit=False) unittest.main(exit=False)
p.terminate() p.terminate()
shutil.rmtree(TEMP_SERVER)
shutil.rmtree(TEMP_SERVER, ignore_errors=True)