diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-08-21 22:12:30 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-08-21 22:12:30 -0400 |
| commit | fe5eede555973044aceda038e28a190ebb483579 (patch) | |
| tree | b65eb6b5ca66cdd15bf930815c711319efafcf28 /lib/sqlalchemy/testing/provision.py | |
| parent | f3f6116c57c00b6e8ab6302624514b559cf2731b (diff) | |
| download | sqlalchemy-fe5eede555973044aceda038e28a190ebb483579.tar.gz | |
- simplify and see if it still works
Change-Id: Id0cf7ae2223507d413aaa22e5f8df066b7ac2b46
Diffstat (limited to 'lib/sqlalchemy/testing/provision.py')
| -rw-r--r-- | lib/sqlalchemy/testing/provision.py | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/lib/sqlalchemy/testing/provision.py b/lib/sqlalchemy/testing/provision.py index 9d41d7e5d..95fa2f8f7 100644 --- a/lib/sqlalchemy/testing/provision.py +++ b/lib/sqlalchemy/testing/provision.py @@ -169,36 +169,19 @@ def _pg_create_db(cfg, eng, ident): currentdb = conn.scalar("select current_database()") for attempt in range(10): try: - log.info( - "emitting CREATE DATABASE %s url %r" % - (ident, eng.url)) conn.execute( "CREATE DATABASE %s TEMPLATE %s" % (ident, currentdb)) except exc.OperationalError as err: - conn.connection.rollback() - if attempt != 10 and "accessed by other users" in str(err): + if "accessed by other users" in str(err): log.info( - "got accessed by others for database %s, URI %r, " - "sleeping for .2", + "Waiting to create %s, URI %r, " + "template DB is in use sleeping for .5", ident, eng.url) - time.sleep(.2) - continue - else: - raise + time.sleep(.5) else: - time.sleep(.5) - log.info( - "checking for database %s URI %r" % - (ident, eng.url)) - result = conn.execute( - "SELECT datname FROM pg_database " - "where datname='%s'" % ident) - row = result.first() - if not row: - raise Exception( - "Database named %s did not get " - "created, in engine %r" % (ident, eng.url)) break + else: + raise err @_create_db.for_db("mysql") |