mirror of
https://github.com/dbcli/pgcli.git
synced 2024-10-06 02:07:53 +03:00
Added python version suffix to test db name, so each version creates its own test db.
This commit is contained in:
parent
ae2e56f319
commit
59af55c90b
@ -3,6 +3,7 @@ from __future__ import unicode_literals
|
|||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
|
|
||||||
import os
|
import os
|
||||||
|
import sys
|
||||||
import pexpect
|
import pexpect
|
||||||
import db_utils as dbutils
|
import db_utils as dbutils
|
||||||
import fixture_utils as fixutils
|
import fixture_utils as fixutils
|
||||||
@ -18,12 +19,17 @@ def before_all(context):
|
|||||||
|
|
||||||
context.exit_sent = False
|
context.exit_sent = False
|
||||||
|
|
||||||
|
vi = sys.version_info
|
||||||
|
db_name = context.config.userdata.get('pg_test_db', None)
|
||||||
|
db_name_full = '{0}_{1}_{2}_{3}'.format(
|
||||||
|
db_name, vi.major, vi.minor, vi.micro)
|
||||||
|
|
||||||
# Store get params from config.
|
# Store get params from config.
|
||||||
context.conf = {
|
context.conf = {
|
||||||
'host': context.config.userdata.get('pg_test_host', 'localhost'),
|
'host': context.config.userdata.get('pg_test_host', 'localhost'),
|
||||||
'user': context.config.userdata.get('pg_test_user', 'postgres'),
|
'user': context.config.userdata.get('pg_test_user', 'postgres'),
|
||||||
'pass': context.config.userdata.get('pg_test_pass', None),
|
'pass': context.config.userdata.get('pg_test_pass', None),
|
||||||
'dbname': context.config.userdata.get('pg_test_db', None),
|
'dbname': db_name_full,
|
||||||
}
|
}
|
||||||
|
|
||||||
# Store old env vars.
|
# Store old env vars.
|
||||||
|
@ -126,7 +126,7 @@ def step_db_connect_test(context):
|
|||||||
"""
|
"""
|
||||||
Send connect to database.
|
Send connect to database.
|
||||||
"""
|
"""
|
||||||
db_name = context.config.userdata.get('pg_test_db', None)
|
db_name = context.conf['dbname']
|
||||||
context.cli.sendline('\connect {0}'.format(db_name))
|
context.cli.sendline('\connect {0}'.format(db_name))
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user