summaryrefslogtreecommitdiff
path: root/scripts/IceGridUtil.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-03-24 13:23:12 +0100
committerBenoit Foucher <benoit@zeroc.com>2017-03-24 13:23:12 +0100
commit10196f5f7ce2c02a3886a26a6b9a8dc726979eba (patch)
tree894cb1b99a2265c8f704635b60c1db77543fe54f /scripts/IceGridUtil.py
parentFix (ICE-7498) - Port more test to UWP (diff)
downloadice-10196f5f7ce2c02a3886a26a6b9a8dc726979eba.tar.bz2
ice-10196f5f7ce2c02a3886a26a6b9a8dc726979eba.tar.xz
ice-10196f5f7ce2c02a3886a26a6b9a8dc726979eba.zip
Fix to IceGrid removal of db directory
Diffstat (limited to 'scripts/IceGridUtil.py')
-rw-r--r--scripts/IceGridUtil.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/scripts/IceGridUtil.py b/scripts/IceGridUtil.py
index 85e3a23eed0..2e9ec2b8129 100644
--- a/scripts/IceGridUtil.py
+++ b/scripts/IceGridUtil.py
@@ -76,7 +76,10 @@ class IceGridNode(ProcessFromBinDir, Server):
def teardown(self, current, success):
# Remove the database directory tree
- shutil.rmtree(self.dbdir)
+ try:
+ shutil.rmtree(self.dbdir)
+ except:
+ pass
def getProps(self, current):
props = {
@@ -127,7 +130,10 @@ class IceGridRegistry(ProcessFromBinDir, Server):
def teardown(self, current, success):
# Remove the database directory tree
- shutil.rmtree(self.dbdir)
+ try:
+ shutil.rmtree(self.dbdir)
+ except:
+ pass
def getProps(self, current):
# NOTE: we use the loopback interface for multicast with IPv6 to prevent failures