# HG changeset patch # User Julien Cristau # Date 1445006676 -7200 # Node ID 26a36c2a5fbd343607be2ac0f015f59ddb58b23e # Parent 839ea43f4d5b66c9a1b32db41181ad78ff72d759 [devtools] delete postgresql socket directory after killing the server ... or when failing to start it. diff -r 839ea43f4d5b -r 26a36c2a5fbd devtools/__init__.py --- a/devtools/__init__.py Mon Jul 27 10:13:25 2015 +0200 +++ b/devtools/__init__.py Fri Oct 16 16:44:36 2015 +0200 @@ -564,6 +564,10 @@ '-o', options], env=env) except OSError as err: + try: + os.rmdir(sockdir) + except OSError: + pass if err.errno == errno.ENOENT: raise OSError('"pg_ctl" could not be found. ' 'You should add the postgresql bin folder to your PATH ' @@ -576,6 +580,10 @@ datadir = join(os.path.dirname(pyfile), 'data', 'pgdb-%s' % os.path.splitext(os.path.basename(pyfile))[0]) subprocess.call(['pg_ctl', 'stop', '-D', datadir, '-m', 'fast']) + try: + os.rmdir(DEFAULT_PSQL_SOURCES['system']['db-host']) + except OSError: + pass class PostgresTestDataBaseHandler(TestDataBaseHandler):