[Checkins] SVN: relstorage/trunk/relstorage/tests/test The test database name can now be provided in the environment as RELSTORAGETEST_DBNAME.
Shane Hathaway
shane at hathawaymix.org
Fri Feb 4 02:54:40 EST 2011
Log message for revision 120095:
The test database name can now be provided in the environment as RELSTORAGETEST_DBNAME.
Changed:
U relstorage/trunk/relstorage/tests/testmysql.py
U relstorage/trunk/relstorage/tests/testoracle.py
U relstorage/trunk/relstorage/tests/testpostgresql.py
-=-
Modified: relstorage/trunk/relstorage/tests/testmysql.py
===================================================================
--- relstorage/trunk/relstorage/tests/testmysql.py 2011-02-04 07:54:23 UTC (rev 120094)
+++ relstorage/trunk/relstorage/tests/testmysql.py 2011-02-04 07:54:40 UTC (rev 120095)
@@ -24,13 +24,17 @@
import os
import unittest
+
+base_dbname = os.environ.get('RELSTORAGETEST_DBNAME', 'relstoragetest')
+
+
class UseMySQLAdapter:
def make_adapter(self):
from relstorage.adapters.mysql import MySQLAdapter
if self.keep_history:
- db = 'relstoragetest'
+ db = base_dbname
else:
- db = 'relstoragetest_hf'
+ db = base_dbname + '_hf'
return MySQLAdapter(
options=Options(keep_history=self.keep_history),
db=db,
@@ -44,9 +48,9 @@
def checkConfigureViaZConfig(self):
replica_conf = os.path.join(os.path.dirname(__file__), 'replicas.conf')
if self.keep_history:
- dbname = 'relstoragetest'
+ dbname = base_dbname
else:
- dbname = 'relstoragetest_hf'
+ dbname = base_dbname + '_hf'
conf = """
%%import relstorage
<zodb main>
@@ -124,10 +128,10 @@
pass
db_names = {
- 'data': 'relstoragetest',
- '1': 'relstoragetest',
- '2': 'relstoragetest2',
- 'dest': 'relstoragetest2',
+ 'data': base_dbname,
+ '1': base_dbname,
+ '2': base_dbname + '2',
+ 'dest': base_dbname + '2',
}
def test_suite():
Modified: relstorage/trunk/relstorage/tests/testoracle.py
===================================================================
--- relstorage/trunk/relstorage/tests/testoracle.py 2011-02-04 07:54:23 UTC (rev 120094)
+++ relstorage/trunk/relstorage/tests/testoracle.py 2011-02-04 07:54:40 UTC (rev 120095)
@@ -24,14 +24,18 @@
import os
import unittest
+
+base_dbname = os.environ.get('RELSTORAGETEST_DBNAME', 'relstoragetest')
+
+
class UseOracleAdapter:
def make_adapter(self):
from relstorage.adapters.oracle import OracleAdapter
dsn = os.environ.get('ORACLE_TEST_DSN', 'XE')
if self.keep_history:
- db = 'relstoragetest'
+ db = base_dbname
else:
- db = 'relstoragetest_hf'
+ db = base_dbname + '_hf'
return OracleAdapter(
user=db,
password='relstoragetest',
@@ -50,9 +54,9 @@
os.close(fd)
try:
if self.keep_history:
- dbname = 'relstoragetest'
+ dbname = base_dbname
else:
- dbname = 'relstoragetest_hf'
+ dbname = base_dbname + '_hf'
conf = """
%%import relstorage
<zodb main>
@@ -132,10 +136,10 @@
pass
db_names = {
- 'data': 'relstoragetest',
- '1': 'relstoragetest',
- '2': 'relstoragetest2',
- 'dest': 'relstoragetest2',
+ 'data': base_dbname,
+ '1': base_dbname,
+ '2': base_dbname + '2',
+ 'dest': base_dbname + '2',
}
def test_suite():
Modified: relstorage/trunk/relstorage/tests/testpostgresql.py
===================================================================
--- relstorage/trunk/relstorage/tests/testpostgresql.py 2011-02-04 07:54:23 UTC (rev 120094)
+++ relstorage/trunk/relstorage/tests/testpostgresql.py 2011-02-04 07:54:40 UTC (rev 120095)
@@ -24,13 +24,17 @@
import os
import unittest
+
+base_dbname = os.environ.get('RELSTORAGETEST_DBNAME', 'relstoragetest')
+
+
class UsePostgreSQLAdapter:
def make_adapter(self):
from relstorage.adapters.postgresql import PostgreSQLAdapter
if self.keep_history:
- db = 'relstoragetest'
+ db = base_dbname
else:
- db = 'relstoragetest_hf'
+ db = base_dbname + '_hf'
return PostgreSQLAdapter(
dsn='dbname=%s user=relstoragetest password=relstoragetest' % db,
options=Options(keep_history=self.keep_history),
@@ -42,9 +46,9 @@
def checkConfigureViaZConfig(self):
replica_conf = os.path.join(os.path.dirname(__file__), 'replicas.conf')
if self.keep_history:
- dbname = 'relstoragetest'
+ dbname = base_dbname
else:
- dbname = 'relstoragetest_hf'
+ dbname = base_dbname + '_hf'
dsn = (
"dbname='%s' user='relstoragetest' password='relstoragetest'"
% dbname)
@@ -120,10 +124,10 @@
pass
db_names = {
- 'data': 'relstoragetest',
- '1': 'relstoragetest',
- '2': 'relstoragetest2',
- 'dest': 'relstoragetest2',
+ 'data': base_dbname,
+ '1': base_dbname,
+ '2': base_dbname + '2',
+ 'dest': base_dbname + '2',
}
def test_suite():
More information about the checkins
mailing list