From eeebc25d22f5dd4da90171771a58b30aad0646fe Mon Sep 17 00:00:00 2001 From: Mark Spruiell Date: Fri, 7 Dec 2012 16:25:52 -0800 Subject: ICE-5108 - cleanDbDir should ignore __Freeze --- scripts/TestUtil.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'scripts/TestUtil.py') diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 9bac3b403fa..ac2e44c2a92 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1317,7 +1317,11 @@ def cleanDbDir(path): os.remove(os.path.join(path, "__Freeze", "lock")) if os.path.exists(os.path.join(path, "__Freeze")): os.rmdir(os.path.join(path, "__Freeze")) - for filename in [ os.path.join(path, f) for f in os.listdir(path) if f != ".gitignore" and f != "DB_CONFIG" ]: + # + # We include __Freeze in this list even though we just removed it - see ICE-5108. + # + ignore = [".gitignore", "DB_CONFIG", "__Freeze"] + for filename in [ os.path.join(path, f) for f in os.listdir(path) if f not in ignore ]: os.remove(filename) def startClient(exe, args = "", config=None, env=None, echo = True, startReader = True, clientConfig = False, iceOptions = None, iceProfile = None): -- cgit v1.2.3