Projet

Général

Profil

0002-tests-add-a-function-to-force-connections-close-when.patch

Christophe Siraut, 15 juin 2018 16:41

Télécharger (1,43 ko)

Voir les différences:

Subject: [PATCH 2/3] tests: add a function to force connections close when
 performing tests

 tests/utilities.py | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)
tests/utilities.py
160 160
            cur = conn.cursor()
161 161
            cur.execute('DROP DATABASE %s' % known_elements.sql_db_name)
162 162
            cur.close()
163
        except psycopg2.Error:
164
            pass
163
        except psycopg2.Error as e:
164
            print(e)
165 165
        known_elements.sql_db_name = None
166 166

  
167

  
168
def force_connections_close():
169
    # workaround for complex threading issue
170
    # https://code.djangoproject.com/ticket/22420
171
    if known_elements.sql_db_name:
172
        conn = psycopg2.connect(user=os.environ['USER'])
173
        cur = conn.cursor()
174
        cur.execute('''SELECT pg_terminate_backend(pg_stat_activity.pid)
175
        FROM pg_stat_activity
176
        WHERE pg_stat_activity.datname = '{}'
177
        AND pid <> pg_backend_pid();'''.format(known_elements.sql_db_name))
178
        cur.close()
179

  
180

  
167 181
def get_app(pub, https=False):
168 182
    extra_environ = {'HTTP_HOST': 'example.net', 'REMOTE_ADDR': '127.0.0.1'}
169 183
    if https:
170
-