From: <pc...@us...> - 2013-04-05 10:43:24
|
Revision: 57907 http://sourceforge.net/p/firebird/code/57907 Author: pcisar Date: 2013-04-05 10:43:19 +0000 (Fri, 05 Apr 2013) Log Message: ----------- Update tests for fbtest 1.0 Modified Paths: -------------- qa/fbt-repository/trunk/tests/bugs/core_0859.fbt qa/fbt-repository/trunk/tests/bugs/core_0870.fbt qa/fbt-repository/trunk/tests/bugs/core_0929.fbt qa/fbt-repository/trunk/tests/bugs/core_0967.fbt qa/fbt-repository/trunk/tests/bugs/core_1073.fbt qa/fbt-repository/trunk/tests/bugs/core_1083.fbt qa/fbt-repository/trunk/tests/bugs/core_1112.fbt qa/fbt-repository/trunk/tests/bugs/core_1148.fbt qa/fbt-repository/trunk/tests/bugs/core_1156.fbt qa/fbt-repository/trunk/tests/bugs/core_1175.fbt qa/fbt-repository/trunk/tests/bugs/core_1249.fbt qa/fbt-repository/trunk/tests/bugs/core_1315.fbt qa/fbt-repository/trunk/tests/bugs/core_1926.fbt qa/fbt-repository/trunk/tests/bugs/core_2017.fbt qa/fbt-repository/trunk/tests/bugs/core_2230.fbt qa/fbt-repository/trunk/tests/bugs/core_2307.fbt qa/fbt-repository/trunk/tests/bugs/core_2420.fbt qa/fbt-repository/trunk/tests/bugs/core_3231.fbt qa/fbt-repository/trunk/tests/bugs/core_3245.fbt qa/fbt-repository/trunk/tests/bugs/core_3517.fbt qa/fbt-repository/trunk/tests/functional/arno/indices/upper_lower_bounds_01.fbt qa/fbt-repository/trunk/tests/functional/arno/indices/upper_lower_bounds_02.fbt qa/fbt-repository/trunk/tests/functional/database/alter_03.fbt qa/fbt-repository/trunk/tests/functional/dml/cte_02.fbt qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_01.fbt qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_02.fbt qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_03.fbt qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_04.fbt qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_05.fbt qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_06.fbt qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_07.fbt qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_08.fbt qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_09.fbt qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_10.fbt qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_11.fbt qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_12.fbt qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_13.fbt qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_14.fbt qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_15.fbt qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_16.fbt qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_17.fbt qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_18.fbt qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_19.fbt qa/fbt-repository/trunk/tests/functional/fkey/primary/select_pk_01.fbt qa/fbt-repository/trunk/tests/functional/fkey/primary/select_pk_02.fbt qa/fbt-repository/trunk/tests/functional/fkey/primary/upd_pk_01.fbt qa/fbt-repository/trunk/tests/functional/fkey/primary/upd_pk_02.fbt qa/fbt-repository/trunk/tests/functional/fkey/unique/insert_01.fbt qa/fbt-repository/trunk/tests/functional/fkey/unique/insert_02.fbt qa/fbt-repository/trunk/tests/functional/fkey/unique/insert_03.fbt qa/fbt-repository/trunk/tests/functional/fkey/unique/insert_04.fbt qa/fbt-repository/trunk/tests/functional/fkey/unique/insert_05.fbt qa/fbt-repository/trunk/tests/functional/fkey/unique/insert_06.fbt qa/fbt-repository/trunk/tests/functional/fkey/unique/insert_07.fbt qa/fbt-repository/trunk/tests/functional/fkey/unique/insert_08.fbt qa/fbt-repository/trunk/tests/functional/fkey/unique/insert_09.fbt qa/fbt-repository/trunk/tests/functional/fkey/unique/insert_11.fbt qa/fbt-repository/trunk/tests/functional/fkey/unique/insert_12.fbt qa/fbt-repository/trunk/tests/functional/fkey/unique/insert_13.fbt qa/fbt-repository/trunk/tests/functional/fkey/unique/insert_14.fbt qa/fbt-repository/trunk/tests/functional/fkey/unique/select_uf_01.fbt qa/fbt-repository/trunk/tests/functional/fkey/unique/select_uf_02.fbt qa/fbt-repository/trunk/tests/functional/fkey/unique/upd_01.fbt qa/fbt-repository/trunk/tests/functional/fkey/unique/upd_02.fbt qa/fbt-repository/trunk/tests/functional/intfunc/string/ascii_val_01.fbt qa/fbt-repository/trunk/tests/functional/monitoring/03.fbt qa/fbt-repository/trunk/tests/functional/monitoring/04.fbt qa/fbt-repository/trunk/tests/functional/trigger/database/connect_02.fbt qa/fbt-repository/trunk/tests/functional/trigger/database/connect_04.fbt Modified: qa/fbt-repository/trunk/tests/bugs/core_0859.fbt =================================================================== --- qa/fbt-repository/trunk/tests/bugs/core_0859.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/bugs/core_0859.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -18,28 +18,28 @@ except: pass else: - print 'Test Failed in case 1' + print ('Test Failed in case 1') try: c.prep('select * from t order by a') except: pass else: - print 'Test Failed in case 2' + print ('Test Failed in case 2') try: c.prep('select b, count(*) from t group by b') except: pass else: - print 'Test Failed in case 3' + print ('Test Failed in case 3') try: c.prep('select a, count(*) from t group by a') except: pass else: - print 'Test Failed in case 4' + print ('Test Failed in case 4') """ Modified: qa/fbt-repository/trunk/tests/bugs/core_0870.fbt =================================================================== --- qa/fbt-repository/trunk/tests/bugs/core_0870.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/bugs/core_0870.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -1,9 +1,10 @@ { -'id': 'bugs.core_870', +'id': 'bugs.core_0870', 'qmid': 'bugs.core_870', 'tracker_id': 'CORE-870', 'title': 'Engine crashes while trying to backup a logically corrupt db', 'description': '', +'min_versions': None, 'versions': [ { 'firebird_version': '2.1', @@ -13,14 +14,14 @@ 'test_type': 'Python', 'test_script': """import os -print 'Starting backup...' +print ('Starting backup...') fbk = os.path.join(context['temp_directory'],'backup.fbk') runProgram('gbak',['-b','-user',user_name,'-password',user_password,dsn,fbk]) -print 'gbak finished...' +print ('gbak finished...') if os.path.isfile(fbk): - print 'Delete backup file...' + print ('Delete backup file...') os.remove(fbk) - print 'Backup file deleted.' + print ('Backup file deleted.') """, 'expected_stdout': """Starting backup... gbak finished... Modified: qa/fbt-repository/trunk/tests/bugs/core_0929.fbt =================================================================== --- qa/fbt-repository/trunk/tests/bugs/core_0929.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/bugs/core_0929.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -1,9 +1,10 @@ { -'id': 'bugs.core_929', +'id': 'bugs.core_0929', 'qmid': 'bugs.core_929', 'tracker_id': 'CORE-929', 'title': 'Bug in DSQL parameter', 'description': '', +'min_versions': None, 'versions': [ { 'firebird_version': '2.1', @@ -23,8 +24,8 @@ try: c.prep('SELECT * FROM TEST WHERE MYDATE + CAST(? AS INTEGER) >= ?') except Exception,e: - print 'Test FAILED' - print e + print ('Test FAILED') + print (e) """ } Modified: qa/fbt-repository/trunk/tests/bugs/core_0967.fbt =================================================================== --- qa/fbt-repository/trunk/tests/bugs/core_0967.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/bugs/core_0967.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -19,12 +19,14 @@ try: c.execute('update t set i=1'+chr(238)+' where 1=0') except Exception,e: - print repr(e[0]) + msg = repr(e[0]) + msg = msg.replace(chr(92),"/") + print (msg) else: c.execute('select * from t') printData(c) """, - 'expected_stdout': """'Error while preparing SQL statement:\\n- SQLCODE: -104\\n- Invalid token\\n- Dynamic SQL Error\\n- SQL error code = -104\\n- Token unknown - line 1, column 17\\n- \\xee' + 'expected_stdout': """'Error while preparing SQL statement:/n- SQLCODE: -104/n- Dynamic SQL Error/n- SQL error code = -104/n- Token unknown - line 1, column 17/n- /xee' """ } ] Modified: qa/fbt-repository/trunk/tests/bugs/core_1073.fbt =================================================================== --- qa/fbt-repository/trunk/tests/bugs/core_1073.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/bugs/core_1073.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -4,6 +4,7 @@ 'tracker_id': 'CORE-1073', 'title': 'SINGULAR buggy when nulls present', 'description': '', +'min_versions': None, 'versions': [ { 'firebird_version': '2.1', @@ -16,8 +17,8 @@ cur.execute(statement) r = cur.fetchone() if (exp and (r is None)) or (not exp and (r is not None)): - print 'Test FAILED in step ',step,', expectation ',exp - print 'Statement:',statement + print ('Test FAILED in step ',step,', expectation ',exp) + print ('Statement:',statement) c = db_conn.cursor() p_singular = 'select 1 from rdb$database where singular(select * from t where a = 1)' Modified: qa/fbt-repository/trunk/tests/bugs/core_1083.fbt =================================================================== --- qa/fbt-repository/trunk/tests/bugs/core_1083.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/bugs/core_1083.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -23,23 +23,23 @@ try: c1.execute("GRANT UPDATE(COL1) ON TAB1 TO ROLE1") con_1.commit() - print 'sucess' + print ('sucess') except Exception, e: - print e[0] + print (e[0]) con_1.begin() try: c1.execute("REVOKE UPDATE (COL1) ON TAB1 FROM ROLE1") con_1.commit() - print 'sucess' + print ('sucess') except Exception, e: - print e[0] + print (e[0]) con_1.begin() try: c1.execute("REVOKE UPDATE (COL2) ON TAB1 FROM ROLE1") con_1.commit() - print 'sucess' + print ('sucess') except Exception, e: - print e[0] + print (e[0]) """, @@ -47,7 +47,6 @@ sucess Error while executing SQL statement: - SQLCODE: -607 -- This operation is not defined for system tables. - unsuccessful metadata update - TEST is not grantor of Update on TAB1 to ROLE1. """, Modified: qa/fbt-repository/trunk/tests/bugs/core_1112.fbt =================================================================== --- qa/fbt-repository/trunk/tests/bugs/core_1112.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/bugs/core_1112.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -4,6 +4,7 @@ 'tracker_id': 'CORE-1112', 'title': 'Crash when dealing with a string literal longer than 32K', 'description': 'This test may crash the server', +'min_versions': None, 'versions': [ { 'firebird_version': '2.1', @@ -21,7 +22,7 @@ except: pass c.execute("select 'a' from rdb$database") -print c.fetchall()""", +print (c.fetchall())""", 'expected_stdout': """[('a',)] """ } Modified: qa/fbt-repository/trunk/tests/bugs/core_1148.fbt =================================================================== --- qa/fbt-repository/trunk/tests/bugs/core_1148.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/bugs/core_1148.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -13,23 +13,22 @@ 'test_script': """from fdb import services con = services.connect(host='localhost', user=user_name.encode(), password=user_password.encode()) try: - con.getLog() - print 'sucess' + con.get_log() + print ('sucess') except Exception, e: - print e[0] + print (e[0]) con = services.connect(host='localhost', user='TEST', password='test') try: - con.getLog() - print 'sucess' + con.get_log() + print ('sucess') except Exception, e: - print e[0] + print (e[0]) """, 'expected_stdout': """sucess Unable to perform the requested Service API action: - SQLCODE: -901 -- Unsuccessful execution caused by system error that does not preclude successful execution of subsequent statements - Unable to perform operation. You must be either SYSDBA or owner of the database """, 'resources': ['test_user'] Modified: qa/fbt-repository/trunk/tests/bugs/core_1156.fbt =================================================================== --- qa/fbt-repository/trunk/tests/bugs/core_1156.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/bugs/core_1156.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -4,6 +4,7 @@ 'tracker_id': 'CORE-1156', 'title': 'Prepare fails when having a parameter in a DSQL statement before a sub query', 'description': '', +'min_versions': None, 'versions': [ { 'firebird_version': '2.1', @@ -13,27 +14,27 @@ try: c.prep('select count(*) from rdb$database where ? < (select count(*) from rdb$database)') except: - print 'Test FAILED in case 1' + print ('Test FAILED in case 1') try: c.prep('select count(*) from rdb$database where (select count(*) from rdb$database) > ?') except: - print 'Test FAILED in case 2' + print ('Test FAILED in case 2') try: c.prep('select count(*) from rdb$database where ? < cast ((select count(*) from rdb$database) as integer)') except: - print 'Test FAILED in case 3' + print ('Test FAILED in case 3') try: c.prep('select count(*) from rdb$database where 0 < (select count(*) from rdb$database)') except: - print 'Test FAILED in case 4' + print ('Test FAILED in case 4') try: c.prep('select count(*) from rdb$database where cast (? as integer) < (select count(*) from rdb$database)') except: - print 'Test FAILED in case 5' + print ('Test FAILED in case 5') """ } Modified: qa/fbt-repository/trunk/tests/bugs/core_1175.fbt =================================================================== --- qa/fbt-repository/trunk/tests/bugs/core_1175.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/bugs/core_1175.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -4,6 +4,7 @@ 'tracker_id': 'CORE-1175', 'title': 'Error "Data type unknown" when any UDF argument is a built-in function containing a DSQL parameter reference', 'description': 'This test uses UDF from ib_udf', +'min_versions': None, 'versions': [ { 'firebird_version': '2.1', @@ -18,10 +19,10 @@ 'test_script': """c = db_conn.cursor() try: c.prep('select * from RDB$DATABASE where RDB$CHARACTER_SET_NAME = rtrim(trim(?))') - print 'Test PASSED!' + print ('Test PASSED!') except Exception,e: - print 'Test FAILED!' - print e + print ('Test FAILED!') + print (e) """, 'expected_stdout': """Test PASSED! Modified: qa/fbt-repository/trunk/tests/bugs/core_1249.fbt =================================================================== --- qa/fbt-repository/trunk/tests/bugs/core_1249.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/bugs/core_1249.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -13,7 +13,7 @@ 'test_script': """cur1 = db_conn.cursor() db_conn.begin() cur1.execute('select * from rdb$database') -print 'Operation performed before shutdown' +print ('Operation performed before shutdown') db_conn.commit() runProgram('gfix',[dsn,'-user',user_name,'-pas',user_password,'-shut','full','-force','0']) @@ -22,9 +22,9 @@ db_conn.begin() cur1.execute('select * from rdb$database') db_conn.commit() - print 'BUG! Operation allowed after shutdown!' + print ('BUG! Operation allowed after shutdown!') except Exception, e: - print "Ok, we've got error.", e[0] + print ("Ok, we've got error.", e[0]) # This is necessary to remove the database #db_conn.close() @@ -36,8 +36,7 @@ 'expected_stdout': """Operation performed before shutdown Ok, we've got error. Error while starting transaction: - SQLCODE: -902 -- Unsuccessful execution caused by a system error that precludes successful execution of subsequent statements -- database C:\JOB\QA\FBTEST\TMP\BUGS.CORE_1249.FDB shutdown +- database /home/job/python/envs/pyfirebird/fbtest/tmp/bugs.core_1249.fdb shutdown """, 'substitutions': [('^.*shutdown','shutdown')] } Modified: qa/fbt-repository/trunk/tests/bugs/core_1315.fbt =================================================================== --- qa/fbt-repository/trunk/tests/bugs/core_1315.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/bugs/core_1315.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -4,6 +4,7 @@ 'tracker_id': 'CORE-1315', 'title': 'Data type unknown', 'description': '', +'min_versions': None, 'versions': [ { 'firebird_version': '2.1', @@ -13,11 +14,11 @@ try: statement = cur.prep('select coalesce(?,1) from RDB$DATABASE') except Exception,e: - print 'Failed!',e + print ('Failed!',e) else: cur.execute(statement,[2]) printData(cur) - print + print() cur.execute(statement,[None]) printData(cur) """, Modified: qa/fbt-repository/trunk/tests/bugs/core_1926.fbt =================================================================== --- qa/fbt-repository/trunk/tests/bugs/core_1926.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/bugs/core_1926.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -4,6 +4,7 @@ 'tracker_id': 'CORE-1926', 'title': 'MON$DATABASE returns outdated transaction counters', 'description': 'Fields MON$NEXT_TRANSACTION etc contain incorrect (outdated) numbers on Classic if there are other active attachments.', +'min_versions': None, 'versions': [ { 'firebird_version': '2.1.2', @@ -21,7 +22,7 @@ c.execute("select MON$NEXT_TRANSACTION from MON$DATABASE") for row in c: j = row[0] -print j-i +print (j-i) con_detail.commit() """, 'expected_stdout': """1 Modified: qa/fbt-repository/trunk/tests/bugs/core_2017.fbt =================================================================== --- qa/fbt-repository/trunk/tests/bugs/core_2017.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/bugs/core_2017.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -51,7 +51,7 @@ c2.execute("select MON$STATEMENT_ID,MON$STAT_ID,MON$SQL_TEXT from mon$statements where mon$sql_text starts with '%s'" % sql) #printData(c) row = c2.fetchone() -#print row +#print (row) c2.execute("select MON$PAGE_READS,MON$PAGE_WRITES,MON$PAGE_FETCHES,MON$PAGE_MARKS from mon$io_stats where mon$stat_id = %i" % row[1]) printData(c2) @@ -106,7 +106,7 @@ c2.execute("select MON$STATEMENT_ID,MON$STAT_ID,MON$SQL_TEXT from mon$statements where mon$sql_text starts with '%s'" % sql) #printData(c) row = c2.fetchone() -#print row +#print (row) c2.execute("select MON$PAGE_READS,MON$PAGE_WRITES,MON$PAGE_FETCHES,MON$PAGE_MARKS from mon$io_stats where mon$stat_id = %i" % row[1]) printData(c2) Modified: qa/fbt-repository/trunk/tests/bugs/core_2230.fbt =================================================================== --- qa/fbt-repository/trunk/tests/bugs/core_2230.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/bugs/core_2230.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -22,19 +22,18 @@ try: c.execute(cmd,[10]) printData(c) -except kdb.ProgrammingError,e: - print e[0] +except kdb.DatabaseError,e: + print (e[0]) else: - print 'Test Failed' + print ('Test Failed') """, 'expected_stdout': """Y ----------- 1 Y ----------- -Cursor.fetchone: Unknown status returned by fetch operation: +Cursor.fetchone: - SQLCODE: -625 -- The insert failed because a column definition includes validation constraints. - validation error for CAST, value "10" """ } Modified: qa/fbt-repository/trunk/tests/bugs/core_2307.fbt =================================================================== --- qa/fbt-repository/trunk/tests/bugs/core_2307.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/bugs/core_2307.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -54,7 +54,7 @@ END""" c = db_conn.cursor() c.execute(sql) -print db_conn.db_info(kdb.isc_info_read_seq_count) +print (db_conn.db_info(kdb.isc_info_read_seq_count)) ''', 'expected_stdout': """{0: 2069, 1: 3, 2: 1, 3: 1, 4: 1, 5: 1, 6: 1043, 8: 1, 9: 1, 11: 1, 12: 1, 14: 1, 15: 1, 17: 1, 18: 1, 20: 1, 28: 1, 29: 1, 31: 1, 128: 1, 129: 1, 130: 1, 131: 1, 132: 1, 133: 1, 134: 1, 135: 1, 136: 1, 137: 1, 138: 1, 139: 1, 140: 1, 141: 1, 142: 1, 143: 1, 144: 1, 145: 1, 146: 1, 147: 1, 148: 1, 149: 1, 150: 1, 151: 1, 152: 1, 153: 1, 154: 1, 155: 1, 156: 1, 157: 1, 158: 1, 159: 1, 160: 1, 161: 1, 162: 1, 163: 1, 164: 1, 165: 1, 166: 1, 167: 1, 168: 1, 169: 1, 170: 1, 171: 1, 172: 1, 173: 1, 174: 1, 175: 1, 176: 1, 177: 1, 178: 1, 179: 1, 180: 1, 181: 1, 182: 1, 183: 1, 184: 1, 185: 1, 186: 1, 187: 1, 188: 1, 189: 1, 190: 1, 191: 1, 192: 1, 193: 1, 194: 1, 195: 1, 196: 1, 197: 1, 198: 1, 199: 1, 200: 1, 201: 1, 202: 1, 203: 1, 204: 1, 205: 1, 206: 1, 207: 1, 208: 1, 209: 1, 210: 1, 211: 1, 212: 1, 213: 1, 214: 1, 215: 1, 216: 1, 217: 1, 218: 1, 219: 1, 220: 1, 221: 1, 222: 1, 223: 1, 224: 1, 225: 1, 226: 1, 227: 1, 228: 1, 229: 1, 230: 1, 231: 1, 232: 1, 233: 1, 234: 1, 235: 1, 236: 1, 237: 1, 238: 1, 239: 1, 240: 1, 241: 1, 242: 1, 243: 1, 244: 1, 245: 1, 246: 1, 247: 1, 248: 1, 249: 1, 250: 1, 251: 1, 252: 1, 253: 1, 254: 1, 255: 1, 256: 1, 257: 1, 258: 1, 259: 1, 260: 1, 261: 1, 262: 1, 263: 1, 264: 1, 265: 1, 266: 1, 267: 1, 268: 1, 269: 1, 270: 1, 271: 1, 272: 1, 273: 1, 274: 1, 275: 1, 276: 1, 277: 1, 278: 1, 279: 1, 280: 1, 281: 1, 282: 1, 283: 1, 284: 1, 285: 1, 286: 1, 287: 1, 288: 1, 289: 1, 290: 1, 291: 1, 292: 1, 293: 1, 294: 1, 295: 1, 296: 1, 297: 1, 298: 1, 299: 1, 300: 1, 301: 1, 302: 1, 303: 1, 304: 1, 305: 1, 306: 1, 307: 1, 308: 1, 309: 1, 310: 1, 311: 1, 312: 1, 313: 1, 314: 1, 315: 1, 316: 1, 317: 1, 318: 1, 319: 1, 320: 1, 321: 1, 322: 1, 323: 1, 324: 1, 325: 1, 326: 1, 327: 1, 328: 1, 329: 1, 330: 1, 331: 1, 332: 1, 333: 1, 334: 1, 335: 1, 336: 1, 337: 1, 338: 1, 339: 1, 340: 1, 341: 1, 342: 1, 343: 1, 344: 1, 345: 1, 346: 1, 347: 1, 348: 1, 349: 1, 350: 1, 351: 1, 352: 1, 353: 1, 354: 1, 355: 1, 356: 1, 357: 1, 358: 1, 359: 1, 360: 1, 361: 1, 362: 1, 363: 1, 364: 1, 365: 1, 366: 1, 367: 1, 368: 1, 369: 1, 370: 1, 371: 1, 372: 1, 373: 1, 374: 1, 375: 1, 376: 1, 377: 1, 378: 1, 379: 1, 380: 1, 381: 1, 382: 1, 383: 1, 384: 1, 385: 1, 386: 1, 387: 1, 388: 1, 389: 1, 390: 1, 391: 1, 392: 1, 393: 1, 394: 1, 395: 1, 396: 1, 397: 1, 398: 1, 399: 1, 400: 1, 401: 1, 402: 1, 403: 1, 404: 1, 405: 1, 406: 1, 407: 1, 408: 1, 409: 1, 410: 1, 411: 1, 412: 1, 413: 1, 414: 1, 415: 1, 416: 1, 417: 1, 418: 1, 419: 1, 420: 1, 421: 1, 422: 1, 423: 1, 424: 1, 425: 1, 426: 1, 427: 1, 428: 1, 429: 1, 430: 1, 431: 1, 432: 1, 433: 1, 434: 1, 435: 1, 436: 1, 437: 1, 438: 1, 439: 1, 440: 1, 441: 1, 442: 1, 443: 1, 444: 1, 445: 1, 446: 1, 447: 1, 448: 1, 449: 1, 450: 1, 451: 1, 452: 1, 453: 1, 454: 1, 455: 1, 456: 1, 457: 1, 458: 1, 459: 1, 460: 1, 461: 1, 462: 1, 463: 1, 464: 1, 465: 1, 466: 1, 467: 1, 468: 1, 469: 1, 470: 1, 471: 1, 472: 1, 473: 1, 474: 1, 475: 1, 476: 1, 477: 1, 478: 1, 479: 1, 480: 1, 481: 1, 482: 1, 483: 1, 484: 1, 485: 1, 486: 1, 487: 1, 488: 1, 489: 1, 490: 1, 491: 1, 492: 1, 493: 1, 494: 1, 495: 1, 496: 1, 497: 1, 498: 1, 499: 1, 500: 1, 501: 1, 502: 1, 503: 1, 504: 1, 505: 1, 506: 1, 507: 1, 508: 1, 509: 1, 510: 1, 511: 1, 512: 1, 513: 1, 514: 1, 515: 1, 516: 1, 517: 1, 518: 1, 519: 1, 520: 1, 521: 1, 522: 1, 523: 1, 524: 1, 525: 1, 526: 1, 527: 1, 528: 1, 529: 1, 530: 1, 531: 1, 532: 1, 533: 1, 534: 1, 535: 1, 536: 1, 537: 1, 538: 1, 539: 1, 540: 1, 541: 1, 542: 1, 543: 1, 544: 1, 545: 1, 546: 1, 547: 1, 548: 1, 549: 1, 550: 1, 551: 1, 552: 1, 553: 1, 554: 1, 555: 1, 556: 1, 557: 1, 558: 1, 559: 1, 560: 1, 561: 1, 562: 1, 563: 1, 564: 1, 565: 1, 566: 1, 567: 1, 568: 1, 569: 1, 570: 1, 571: 1, 572: 1, 573: 1, 574: 1, 575: 1, 576: 1, 577: 1, 578: 1, 579: 1, 580: 1, 581: 1, 582: 1, 583: 1, 584: 1, 585: 1, 586: 1, 587: 1, 588: 1, 589: 1, 590: 1, 591: 1, 592: 1, 593: 1, 594: 1, 595: 1, 596: 1, 597: 1, 598: 1, 599: 1, 600: 1, 601: 1, 602: 1, 603: 1, 604: 1, 605: 1, 606: 1, 607: 1, 608: 1, 609: 1, 610: 1, 611: 1, 612: 1, 613: 1, 614: 1, 615: 1, 616: 1, 617: 1, 618: 1, 619: 1, 620: 1, 621: 1, 622: 1, 623: 1, 624: 1, 625: 1, 626: 1, 627: 1, 628: 1, 629: 1, 630: 1, 631: 1, 632: 1, 633: 1, 634: 1, 635: 1, 636: 1, 637: 1, 638: 1, 639: 1, 640: 1, 641: 1, 642: 1, 643: 1, 644: 1, 645: 1, 646: 1, 647: 1, 648: 1, 649: 1, 650: 1, 651: 1, 652: 1, 653: 1, 654: 1, 655: 1, 656: 1, 657: 1, 658: 1, 659: 1, 660: 1, 661: 1, 662: 1, 663: 1, 664: 1, 665: 1, 666: 1, 667: 1, 668: 1, 669: 1, 670: 1, 671: 1, 672: 1, 673: 1, 674: 1, 675: 1, 676: 1, 677: 1, 678: 1, 679: 1, 680: 1, 681: 1, 682: 1, 683: 1, 684: 1, 685: 1, 686: 1, 687: 1, 688: 1, 689: 1, 690: 1, 691: 1, 692: 1, 693: 1, 694: 1, 695: 1, 696: 1, 697: 1, 698: 1, 699: 1, 700: 1, 701: 1, 702: 1, 703: 1, 704: 1, 705: 1, 706: 1, 707: 1, 708: 1, 709: 1, 710: 1, 711: 1, 712: 1, 713: 1, 714: 1, 715: 1, 716: 1, 717: 1, 718: 1, 719: 1, 720: 1, 721: 1, 722: 1, 723: 1, 724: 1, 725: 1, 726: 1, 727: 1, 728: 1, 729: 1, 730: 1, 731: 1, 732: 1, 733: 1, 734: 1, 735: 1, 736: 1, 737: 1, 738: 1, 739: 1, 740: 1, 741: 1, 742: 1, 743: 1, 744: 1, 745: 1, 746: 1, 747: 1, 748: 1, 749: 1, 750: 1, 751: 1, 752: 1, 753: 1, 754: 1, 755: 1, 756: 1, 757: 1, 758: 1, 759: 1, 760: 1, 761: 1, 762: 1, 763: 1, 764: 1, 765: 1, 766: 1, 767: 1, 768: 1, 769: 1, 770: 1, 771: 1, 772: 1, 773: 1, 774: 1, 775: 1, 776: 1, 777: 1, 778: 1, 779: 1, 780: 1, 781: 1, 782: 1, 783: 1, 784: 1, 785: 1, 786: 1, 787: 1, 788: 1, 789: 1, 790: 1, 791: 1, 792: 1, 793: 1, 794: 1, 795: 1, 796: 1, 797: 1, 798: 1, 799: 1, 800: 1, 801: 1, 802: 1, 803: 1, 804: 1, 805: 1, 806: 1, 807: 1, 808: 1, 809: 1, 810: 1, 811: 1, 812: 1, 813: 1, 814: 1, 815: 1, 816: 1, 817: 1, 818: 1, 819: 1, 820: 1, 821: 1, 822: 1, 823: 1, 824: 1, 825: 1, 826: 1, 827: 1, 828: 1, 829: 1, 830: 1, 831: 1, 832: 1, 833: 1, 834: 1, 835: 1, 836: 1, 837: 1, 838: 1, 839: 1, 840: 1, 841: 1, 842: 1, 843: 1, 844: 1, 845: 1, 846: 1, 847: 1, 848: 1, 849: 1, 850: 1, 851: 1, 852: 1, 853: 1, 854: 1, 855: 1, 856: 1, 857: 1, 858: 1, 859: 1, 860: 1, 861: 1, 862: 1, 863: 1, 864: 1, 865: 1, 866: 1, 867: 1, 868: 1, 869: 1, 870: 1, 871: 1, 872: 1, 873: 1, 874: 1, 875: 1, 876: 1, 877: 1, 878: 1, 879: 1, 880: 1, 881: 1, 882: 1, 883: 1, 884: 1, 885: 1, 886: 1, 887: 1, 888: 1, 889: 1, 890: 1, 891: 1, 892: 1, 893: 1, 894: 1, 895: 1, 896: 1, 897: 1, 898: 1, 899: 1, 900: 1, 901: 1, 902: 1, 903: 1, 904: 1, 905: 1, 906: 1, 907: 1, 908: 1, 909: 1, 910: 1, 911: 1, 912: 1, 913: 1, 914: 1, 915: 1, 916: 1, 917: 1, 918: 1, 919: 1, 920: 1, 921: 1, 922: 1, 923: 1, 924: 1, 925: 1, 926: 1, 927: 1, 928: 1, 929: 1, 930: 1, 931: 1, 932: 1, 933: 1, 934: 1, 935: 1, 936: 1, 937: 1, 938: 1, 939: 1, 940: 1, 941: 1, 942: 1, 943: 1, 944: 1, 945: 1, 946: 1, 947: 1, 948: 1, 949: 1, 950: 1, 951: 1, 952: 1, 953: 1, 954: 1, 955: 1, 956: 1, 957: 1, 958: 1, 959: 1, 960: 1, 961: 1, 962: 1, 963: 1, 964: 1, 965: 1, 966: 1, 967: 1, 968: 1, 969: 1, 970: 1, 971: 1, 972: 1, 973: 1, 974: 1, 975: 1, 976: 1, 977: 1, 978: 1, 979: 1, 980: 1, 981: 1, 982: 1, 983: 1, 984: 1, 985: 1, 986: 1, 987: 1, 988: 1, 989: 1, 990: 1, 991: 1, 992: 1, 993: 1, 994: 1, 995: 1, 996: 1, 997: 1, 998: 1, 999: 1, 1000: 1, 1001: 1, 1002: 1, 1003: 1, 1004: 1, 1005: 1, 1006: 1, 1007: 1, 1008: 1, 1009: 1, 1010: 1, 1011: 1, 1012: 1, 1013: 1, 1014: 1, 1015: 1, 1016: 1, 1017: 1, 1018: 1, 1019: 1, 1020: 1, 1021: 1, 1022: 1, 1023: 1, 1024: 1, 1025: 1, 1026: 1, 1027: 1, 1028: 1, 1029: 1, 1030: 1, 1031: 1, 1032: 1, 1033: 1, 1034: 1, 1035: 1, 1036: 1, 1037: 1, 1038: 1, 1039: 1, 1040: 1, 1041: 1, 1042: 1, 1043: 1, 1044: 1, 1045: 1, 1046: 1, 1047: 1, 1048: 1, 1049: 1, 1050: 1, 1051: 1, 1052: 1, 1053: 1, 1054: 1, 1055: 1, 1056: 1, 1057: 1, 1058: 1, 1059: 1, 1060: 1, 1061: 1, 1062: 1, 1063: 1, 1064: 1, 1065: 1, 1066: 1, 1067: 1, 1068: 1, 1069: 1, 1070: 1, 1071: 1, 1072: 1, 1073: 1, 1074: 1, 1075: 1, 1076: 1, 1077: 1, 1078: 1, 1079: 1, 1080: 1, 1081: 1, 1082: 1, 1083: 1, 1084: 1, 1085: 1, 1086: 1, 1087: 1, 1088: 1, 1089: 1, 1090: 1, 1091: 1, 1092: 1, 1093: 1, 1094: 1, 1095: 1, 1096: 1, 1097: 1, 1098: 1, 1099: 1, 1100: 1, 1101: 1, 1102: 1, 1103: 1, 1104: 1, 1105: 1, 1106: 1, 1107: 1, 1108: 1, 1109: 1, 1110: 1, 1111: 1, 1112: 1, 1113: 1, 1114: 1, 1115: 1, 1116: 1, 1117: 1, 1118: 1, 1119: 1, 1120: 1, 1121: 1, 1122: 1, 1123: 1, 1124: 1, 1125: 1, 1126: 1, 1127: 1} """ Modified: qa/fbt-repository/trunk/tests/bugs/core_2420.fbt =================================================================== --- qa/fbt-repository/trunk/tests/bugs/core_2420.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/bugs/core_2420.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -39,7 +39,7 @@ into :cod, :num, :name, :summa do exit; end""") -print 'Execution OK' +print ('Execution OK') ''', 'expected_stdout': """Execution OK Modified: qa/fbt-repository/trunk/tests/bugs/core_3231.fbt =================================================================== --- qa/fbt-repository/trunk/tests/bugs/core_3231.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/bugs/core_3231.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -16,24 +16,24 @@ c.execute("with q(s) as (select cast('abcdefghijklmno' as blob sub_type 1 character set utf8) from rdb$database) select overlay (s placing cast('0123456789' as blob sub_type 1 character set utf8) from 5) from q") c.fetchall() except Exception,e: - print "Test non multi-bytes Failed" - print e + print ("Test non multi-bytes Failed") + print (e) else: pass try: c.execute("with q(s) as (select cast('abcdefghijklmno' as blob sub_type 1 character set utf8) from rdb$database) select overlay (s placing cast(_iso8859_1 'áé' as blob sub_type 1 character set utf8) from 5) from q") c.fetchall() except Exception,e: - print "Test utf8 Failed" - print e + print ("Test utf8 Failed") + print (e) else: pass try: c.execute("with q(s) as (select cast('abcdefghijklmno' as blob sub_type 1 character set utf8) from rdb$database) select overlay (s placing cast(_iso8859_1 'áé' as blob sub_type 1 character set iso8859_1) from 5) from q") c.fetchall() except Exception,e: - print "Test iso8859_1 Failed" - print e + print ("Test iso8859_1 Failed") + print (e) else: pass """ Modified: qa/fbt-repository/trunk/tests/bugs/core_3245.fbt =================================================================== --- qa/fbt-repository/trunk/tests/bugs/core_3245.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/bugs/core_3245.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -10,8 +10,10 @@ 'firebird_version': '2.1.5', 'platform': 'All', 'page_size': '4096', - 'test_type': 'ISQL', - 'test_script': """ with q (s) as ( + 'test_type': 'Python', + 'test_script': '''cur = db_conn.cursor() +cmd = """ + with q (s) as ( select cast(cast('abc' as char(32767)) as blob sub_type text) || cast('def' as char(32767)) || cast('ghi' as char(32767)) @@ -26,26 +28,14 @@ select char_length(s), right(s, 3), char_length(sub_for), right(sub_for, 3), char_length(sub_nofor), right(sub_nofor, 3) - from q cross join r;""", - 'expected_stdout': """Database: localhost:C:\fbtestnew\tmp\bugs.core_3245.fdb, User: SYSDBA -SQL> CON> CON> CON> CON> CON> CON> CON> CON> CON> CON> CON> CON> CON> CON> CON> - CHAR_LENGTH RIGHT CHAR_LENGTH RIGHT CHAR_LENGTH RIGHT -============ ================= ============ ================= ============ ================= - 98304 0:3c 90305 0:25 90305 0:c -============================================================================== -RIGHT: -jkl -============================================================================== -============================================================================== -RIGHT: -jkl -============================================================================== -============================================================================== -RIGHT: -jkl -============================================================================== - -SQL>""" + from q cross join r;""" +cur.execute(cmd) +printData(cur) +''', + 'expected_stdout': """CHAR_LENGTH RIGHT CHAR_LENGTH RIGHT CHAR_LENGTH RIGHT +----------- ----- ----------- ----- ----------- ----- +98304 jkl 90305 jkl 90305 jkl +""" } ] } Modified: qa/fbt-repository/trunk/tests/bugs/core_3517.fbt =================================================================== --- qa/fbt-repository/trunk/tests/bugs/core_3517.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/bugs/core_3517.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -13,13 +13,12 @@ 'test_type': 'ISQL', 'test_script': """select LPAD('abc', '0', 3) FROM RDB$DATABASE; """, - 'expected_stdout': """Database: localhost:C:\fbtestnew\tmp\bugs.core_3517.fdb, User: SYSDBA -SQL> + 'expected_stdout': """ LPAD -=============================================================================== +====== -SQL>""" +""" } ] } Modified: qa/fbt-repository/trunk/tests/functional/arno/indices/upper_lower_bounds_01.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/arno/indices/upper_lower_bounds_01.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/arno/indices/upper_lower_bounds_01.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -1,10 +1,11 @@ { -'id': 'functional.arno.indexes.upper_lower_bounds_01', +'id': 'functional.arno.indices.upper_lower_bounds_01', 'qmid': 'functional.arno.indexes.upper_lower_bounds_01', 'tracker_id': '', 'title': 'upper and lower bounds', 'description': """equal comparison should be prefered. Lower and Upper bounds are bound by the same value.""", +'min_versions': None, 'versions': [ { 'firebird_version': '1.5', @@ -67,8 +68,8 @@ self.addIndexed(tabid, reads) #-- def show(self): - print 'sequential : ',self.sequential - print 'indexed : ',self.indexed + print ('sequential : ',self.sequential) + print ('indexed : ',self.indexed) cursor=db_conn.cursor() Modified: qa/fbt-repository/trunk/tests/functional/arno/indices/upper_lower_bounds_02.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/arno/indices/upper_lower_bounds_02.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/arno/indices/upper_lower_bounds_02.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -1,10 +1,11 @@ { -'id': 'functional.arno.indexes.upper_lower_bounds_02', +'id': 'functional.arno.indices.upper_lower_bounds_02', 'qmid': 'functional.arno.indexes.upper_lower_bounds_02', 'tracker_id': '', 'title': 'upper and lower bounds', 'description': '''"Less or equal than" should be prefered above "less than" and "greater or equal than" above "greater than". ''', +'min_versions': None, 'versions': [ { 'firebird_version': '2.0', @@ -67,8 +68,8 @@ self.addIndexed(tabid, reads) #-- def show(self): - print 'sequential : ',self.sequential - print 'indexed : ',self.indexed + print ('sequential : ',self.sequential) + print ('indexed : ',self.indexed) cursor=db_conn.cursor() Modified: qa/fbt-repository/trunk/tests/functional/database/alter_03.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/database/alter_03.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/database/alter_03.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -17,10 +17,10 @@ cursor.execute("ALTER DATABASE ADD FILE '$(DATABASE_LOCATION)TEST.G00' STARTING 20000") db_conn.commit() except kdb.ProgrammingError, (errno,errmsg): - print errno, errmsg + print (errno, errmsg) except: - print "Unexpected exception",sys.exc_info()[0] - print "Arguments",sys.exc_info()[1] + print ("Unexpected exception",sys.exc_info()[0]) + print ("Arguments",sys.exc_info()[1]) """, 'expected_stdout': '-607 isc_dsql_execute: unsuccessful metadata update. Cannot add file with the same name as the database or added files.' }, @@ -36,13 +36,12 @@ cursor.execute("ALTER DATABASE ADD FILE '$(DATABASE_LOCATION)TEST.G00' STARTING 20000") db_conn.commit() except kdb.DatabaseError, e: - print e[0] + print (e[0]) except: - print "Unexpected exception",sys.exc_info()[0] - print "Arguments",sys.exc_info()[1]""", + print ("Unexpected exception",sys.exc_info()[0]) + print ("Arguments",sys.exc_info()[1])""", 'expected_stdout': """Error while executing SQL statement: - SQLCODE: -607 -- This operation is not defined for system tables. - unsuccessful metadata update - Cannot add file with the same name as the database or added files """ @@ -58,10 +57,10 @@ cursor.execute("ALTER DATABASE ADD FILE '$(DATABASE_LOCATION)TEST.G00' STARTING 20000") db_conn.commit() except kdb.ProgrammingError, (errno,errmsg): - print errno, errmsg + print (errno, errmsg) except: - print "Unexpected exception",sys.exc_info()[0] - print "Arguments",sys.exc_info()[1] + print ("Unexpected exception",sys.exc_info()[0]) + print ("Arguments",sys.exc_info()[1]) """, 'expected_stdout': """-607 isc_dsql_execute: unsuccessful metadata update Modified: qa/fbt-repository/trunk/tests/functional/dml/cte_02.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/dml/cte_02.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/dml/cte_02.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -88,13 +88,15 @@ """, - 'expected_stdout': """ID_TYPE_PRODUCT NAME COUNT_P + 'expected_stdout': """ +ID_TYPE_PRODUCT NAME COUNT_P =============== ====================== ============ 1 + DVD 6 3 - FILM SF 3 4 - FILM ACTION 1 5 - FILM ROMANCE 2 - 2 + BOOK 0 + 2 + BOOK <null> + """ } ] Modified: qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_01.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_01.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_01.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -55,8 +55,7 @@ c.execute("INSERT INTO DETAIL_TABLE (ID, FKEY) VALUES (1,1)") con_detail.commit() except Exception, e: - #for msg in e: print msg - print e[0]""" + print (e[0])""" } ] } Modified: qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_02.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_02.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_02.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -55,8 +55,7 @@ c.execute("INSERT INTO DETAIL_TABLE (ID, FKEY) VALUES (1,1)") con_detail.commit() except Exception, e: - #for msg in e: print msg - print e[0]""", + print (e[0])""", 'expected_stdout': """Error while executing SQL statement: - SQLCODE: -901 - Unsuccessful execution caused by system error that does not preclude successful execution of subsequent statements @@ -111,11 +110,9 @@ c.execute("INSERT INTO DETAIL_TABLE (ID, FKEY) VALUES (1,1)") con_detail.commit() except Exception, e: - #for msg in e: print msg - print e[0]""", + print (e[0])""", 'expected_stdout': """Error while executing SQL statement: - SQLCODE: -530 -- violation of FOREIGN KEY constraint "" - violation of FOREIGN KEY constraint "FK_DETAIL_TABLE" on table "DETAIL_TABLE" - Foreign key reference target does not exist """ Modified: qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_03.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_03.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_03.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -63,8 +63,7 @@ cd.execute("INSERT INTO DETAIL_TABLE (ID, FKEY) VALUES (1,1)") con_detail.commit() except Exception, e: - #for msg in e: print msg - print e[0]""", + print (e[0])""", 'expected_stdout': """Error while executing SQL statement: - SQLCODE: -901 - Unsuccessful execution caused by system error that does not preclude successful execution of subsequent statements @@ -123,11 +122,9 @@ cd.execute("INSERT INTO DETAIL_TABLE (ID, FKEY) VALUES (1,1)") con_detail.commit() except Exception, e: - #for msg in e: print msg - print e[0]""", + print (e[0])""", 'expected_stdout': """Error while executing SQL statement: - SQLCODE: -530 -- violation of FOREIGN KEY constraint "" - violation of FOREIGN KEY constraint "FK_DETAIL_TABLE" on table "DETAIL_TABLE" - Foreign key reference target does not exist """ Modified: qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_04.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_04.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_04.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -63,8 +63,7 @@ cd.execute("INSERT INTO DETAIL_TABLE (ID, FKEY) VALUES (1,1)") con_detail.commit() except Exception, e: - #for msg in e: print msg - print e[0]""", + print (e[0])""", 'expected_stdout': """Error while executing SQL statement: - SQLCODE: -901 - Unsuccessful execution caused by system error that does not preclude successful execution of subsequent statements @@ -123,11 +122,9 @@ cd.execute("INSERT INTO DETAIL_TABLE (ID, FKEY) VALUES (1,1)") con_detail.commit() except Exception, e: - #for msg in e: print msg - print e[0]""", + print (e[0])""", 'expected_stdout': """Error while executing SQL statement: - SQLCODE: -530 -- violation of FOREIGN KEY constraint "" - violation of FOREIGN KEY constraint "FK_DETAIL_TABLE" on table "DETAIL_TABLE" - Foreign key reference target does not exist """ Modified: qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_05.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_05.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_05.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -56,8 +56,7 @@ c.execute("INSERT INTO DETAIL_TABLE (ID, FKEY) VALUES (1,2)") con_detail.commit() except Exception, e: - #for msg in e: print msg - print e[0]""" + print (e[0])""" } ] } Modified: qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_06.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_06.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_06.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -59,8 +59,7 @@ c.execute("INSERT INTO DETAIL_TABLE (ID, FKEY) VALUES (1,2)") con_detail.commit() except Exception, e: - #for msg in e: print msg - print e[0]""" + print (e[0])""" } ] } Modified: qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_07.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_07.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_07.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -58,8 +58,7 @@ cd.execute("INSERT INTO DETAIL_TABLE (ID, FKEY_1, FKEY_2) VALUES (1, 1, 'one')") con_detail.commit() except Exception, e: - #for msg in e: print msg - print e[0]""" + print (e[0])""" } ] } Modified: qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_08.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_08.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_08.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -58,8 +58,7 @@ cd.execute("INSERT INTO DETAIL_TABLE (ID, FKEY_1, FKEY_2) VALUES (1, 1, 'one')") con_detail.commit() except Exception, e: - #for msg in e: print msg - print e[0]""", + print (e[0])""", 'expected_stdout': """Error while executing SQL statement: - SQLCODE: -901 - Unsuccessful execution caused by system error that does not preclude successful execution of subsequent statements @@ -116,11 +115,9 @@ cd.execute("INSERT INTO DETAIL_TABLE (ID, FKEY_1, FKEY_2) VALUES (1, 1, 'one')") con_detail.commit() except Exception, e: - #for msg in e: print msg - print e[0]""", + print (e[0])""", 'expected_stdout': """Error while executing SQL statement: - SQLCODE: -530 -- violation of FOREIGN KEY constraint "" - violation of FOREIGN KEY constraint "FK_DETAIL_TABLE" on table "DETAIL_TABLE" - Foreign key reference target does not exist """ Modified: qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_09.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_09.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_09.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -59,8 +59,7 @@ cd.execute("INSERT INTO DETAIL_TABLE (ID, FKEY_1, FKEY_2) VALUES (1, 1, 'one')") con_detail.commit() except Exception, e: - #for msg in e: print msg - print e[0]""", + print (e[0])""", 'expected_stdout': """Error while executing SQL statement: - SQLCODE: -901 - Unsuccessful execution caused by system error that does not preclude successful execution of subsequent statements @@ -118,11 +117,9 @@ cd.execute("INSERT INTO DETAIL_TABLE (ID, FKEY_1, FKEY_2) VALUES (1, 1, 'one')") con_detail.commit() except Exception, e: - #for msg in e: print msg - print e[0]""", + print (e[0])""", 'expected_stdout': """Error while executing SQL statement: - SQLCODE: -530 -- violation of FOREIGN KEY constraint "" - violation of FOREIGN KEY constraint "FK_DETAIL_TABLE" on table "DETAIL_TABLE" - Foreign key reference target does not exist """ Modified: qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_10.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_10.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_10.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -59,8 +59,7 @@ cd.execute("INSERT INTO DETAIL_TABLE (ID, FKEY_1, FKEY_2) VALUES (1, 2, 'one')") con_detail.commit() except Exception, e: - #for msg in e: print msg - print e[0]""" + print (e[0])""" } ] } Modified: qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_11.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_11.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_11.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -59,8 +59,7 @@ cd.execute("INSERT INTO DETAIL_TABLE (ID, FKEY_1, FKEY_2) VALUES (1, 2, 'two')") con_detail.commit() except Exception, e: - #for msg in e: print msg - print e[0]""" + print (e[0])""" } ] } Modified: qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_12.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_12.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_12.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -63,8 +63,7 @@ cd.execute("INSERT INTO DETAIL_TABLE (ID, FKEY_1, FKEY_2) VALUES (1, 2, 'two')") con_detail.commit() except Exception, e: - #for msg in e: print msg - print e[0]""" + print (e[0])""" } ] } Modified: qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_13.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_13.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_13.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -54,11 +54,9 @@ cd.execute("INSERT INTO DETAIL_TABLE (ID, FKEY) VALUES (1,1)") con_detail.commit() except Exception, e: - #for msg in e: print msg - print e[0]""", + print (e[0])""", 'expected_stdout': """Error while executing SQL statement: - SQLCODE: -901 -- Unsuccessful execution caused by system error that does not preclude successful execution of subsequent statements - lock conflict on no wait transaction - violation of FOREIGN KEY constraint "FK_DETAIL_TABLE" on table "DETAIL_TABLE" - Foreign key reference target does not exist Modified: qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_14.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_14.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_14.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -55,11 +55,9 @@ cd.execute("INSERT INTO DETAIL_TABLE (ID, FKEY) VALUES (1,1)") con_detail.commit() except Exception, e: - #for msg in e: print msg - print e[0]""", + print (e[0])""", 'expected_stdout': """Error while executing SQL statement: - SQLCODE: -530 -- violation of FOREIGN KEY constraint "" - violation of FOREIGN KEY constraint "FK_DETAIL_TABLE" on table "DETAIL_TABLE" - Foreign key reference target does not exist """ Modified: qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_15.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_15.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_15.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -53,8 +53,7 @@ cd.execute("INSERT INTO DETAIL_TABLE (ID, FKEY) VALUES (1,2)") con_detail.commit() except Exception, e: - #for msg in e: print msg - print e[0]""", + print (e[0])""", 'expected_stdout': """Error while executing SQL statement: - SQLCODE: -901 - Unsuccessful execution caused by system error that does not preclude successful execution of subsequent statements @@ -62,6 +61,57 @@ - violation of FOREIGN KEY constraint "FK_DETAIL_TABLE" on table "DETAIL_TABLE" - Foreign key reference target does not exist """ +}, +{ + 'firebird_version': '2.5.2', + 'platform': 'All', + 'init_script': """CREATE TABLE MASTER_TABLE ( + ID INTEGER PRIMARY KEY, + INT_F INTEGER +); + +CREATE TABLE DETAIL_TABLE ( + ID INTEGER PRIMARY KEY, + FKEY INTEGER +); + +ALTER TABLE DETAIL_TABLE ADD CONSTRAINT FK_DETAIL_TABLE FOREIGN KEY (FKEY) REFERENCES MASTER_TABLE (ID); +COMMIT;""", + 'test_type': 'Python', + 'test_script': """TPB_master = ( + chr(kdb.isc_tpb_write) + + chr(kdb.isc_tpb_read_committed) + chr(kdb.isc_tpb_rec_version) + + chr(kdb.isc_tpb_nowait) + ) +TPB_detail = ( + chr(kdb.isc_tpb_write) + + chr(kdb.isc_tpb_read_committed) + chr(kdb.isc_tpb_rec_version) + + chr(kdb.isc_tpb_nowait) + ) +db_conn.begin(tpb=TPB_master) +cm_1 = db_conn.cursor() +cm_1.execute('INSERT INTO MASTER_TABLE (ID, INT_F) VALUES (2, 20)') + +#Create second connection for change detail table +con_detail = kdb.connect( + dsn=dsn.encode(), + user=user_name.encode(), + password=user_password.encode() +) + +try: + con_detail.begin(tpb=TPB_detail) + cd = con_detail.cursor() + cd.execute("INSERT INTO DETAIL_TABLE (ID, FKEY) VALUES (1,2)") + con_detail.commit() +except Exception, e: + print (e[0])""", + 'expected_stdout': """Error while executing SQL statement: +- SQLCODE: -901 +- lock conflict on no wait transaction +- violation of FOREIGN KEY constraint "FK_DETAIL_TABLE" on table "DETAIL_TABLE" +- Foreign key reference target does not exist +""" } ] } Modified: qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_16.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_16.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_16.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -53,8 +53,7 @@ cd.execute("INSERT INTO DETAIL_TABLE (ID, FKEY) VALUES (1,1)") con_detail.commit() except Exception, e: - #for msg in e: print msg - print e[0]""" + print (e[0])""" } ] } Modified: qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_17.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_17.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_17.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -54,16 +54,15 @@ c = con_detail.cursor() c.execute("INSERT INTO DETAIL_TABLE (ID, FKEY) VALUES (1,1)") except Exception, e: - print e[1] + print (e[1]) try: c = db_conn.cursor() c.execute("update master_table set ID=10 WHERE ID=1") except Exception, e: - print e[0]""", + print (e[0])""", 'expected_stdout': """Error while executing SQL statement: - SQLCODE: -530 -- violation of FOREIGN KEY constraint "" - violation of FOREIGN KEY constraint "FK_DETAIL_TABLE" on table "DETAIL_TABLE" - Foreign key references are present for the record """, Modified: qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_18.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_18.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_18.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -56,16 +56,15 @@ c.execute("INSERT INTO DETAIL_TABLE (ID, FKEY) VALUES (1,1)") con_detail.commit() except Exception, e: - print e[1] + print (e[1]) try: c = db_conn.cursor() c.execute("update master_table set ID=10 WHERE ID=1") except Exception, e: - print e[0]""", + print (e[0])""", 'expected_stdout': """Error while executing SQL statement: - SQLCODE: -530 -- violation of FOREIGN KEY constraint "" - violation of FOREIGN KEY constraint "FK_DETAIL_TABLE" on table "DETAIL_TABLE" - Foreign key references are present for the record """ Modified: qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_19.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_19.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/fkey/primary/insert_pk_19.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -62,8 +62,7 @@ cd.execute("INSERT INTO DETAIL_TABLE (ID, FKEY) VALUES (1,1)") con_detail.commit() except Exception, e: - #for msg in e: print msg - print e[0]""" + print (e[0])""" } ] } Modified: qa/fbt-repository/trunk/tests/functional/fkey/primary/select_pk_01.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/fkey/primary/select_pk_01.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/fkey/primary/select_pk_01.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -55,7 +55,7 @@ c.execute("INSERT INTO DETAIL_TABLE (ID, FKEY) VALUES (1,1)") con_detail.commit() except Exception, e: - print e[0]""" + print (e[0])""" } ] } Modified: qa/fbt-repository/trunk/tests/functional/fkey/primary/select_pk_02.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/fkey/primary/select_pk_02.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/fkey/primary/select_pk_02.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -56,17 +56,16 @@ cd.execute("INSERT INTO DETAIL_TABLE (ID, FKEY) VALUES (1,1)") con_detail.commit() except Exception, e: - print e[0] + print (e[0]) try: c.fetchall() c.execute("UPDATE MASTER_TABLE SET ID=2") db_conn.commit() except Exception, e: - print e[0]""", + print (e[0])""", 'expected_stdout': """Error while executing SQL statement: - SQLCODE: -530 -- violation of FOREIGN KEY constraint "" - violation of FOREIGN KEY constraint "FK_DETAIL_TABLE" on table "DETAIL_TABLE" - Foreign key references are present for the record """ Modified: qa/fbt-repository/trunk/tests/functional/fkey/primary/upd_pk_01.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/fkey/primary/upd_pk_01.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/fkey/primary/upd_pk_01.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -56,8 +56,7 @@ c.execute("UPDATE DETAIL_TABLE SET ID=2 WHERE ID=1") con_detail.commit() except Exception, e: - #for msg in e: print msg - print e[0]""" + print (e[0])""" } ] } Modified: qa/fbt-repository/trunk/tests/functional/fkey/primary/upd_pk_02.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/fkey/primary/upd_pk_02.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/fkey/primary/upd_pk_02.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -59,8 +59,7 @@ c.execute("UPDATE DETAIL_TABLE SET FKEY = 2") con_detail.commit() except Exception, e: - #for msg in e: print msg - print e[0]""" + print (e[0])""" } ] } Modified: qa/fbt-repository/trunk/tests/functional/fkey/unique/insert_01.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/fkey/unique/insert_01.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/fkey/unique/insert_01.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -56,8 +56,7 @@ c.execute("INSERT INTO DETAIL_TABLE (ID, FKEY) VALUES (1,1)") con_detail.commit() except Exception, e: - #for msg in e: print msg - print e[0]""" + print (e[0])""" } ] } Modified: qa/fbt-repository/trunk/tests/functional/fkey/unique/insert_02.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/fkey/unique/insert_02.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/fkey/unique/insert_02.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -56,8 +56,7 @@ c.execute("INSERT INTO DETAIL_TABLE (ID, FKEY) VALUES (1,2)") con_detail.commit() except Exception, e: - #for msg in e: print msg - print e[0]""", + print (e[0])""", 'expected_stdout': """Error while executing SQL statement: - SQLCODE: -901 - Unsuccessful execution caused by system error that does not preclude successful execution of subsequent statements @@ -113,11 +112,9 @@ c.execute("INSERT INTO DETAIL_TABLE (ID, FKEY) VALUES (1,2)") con_detail.commit() except Exception, e: - #for msg in e: print msg - print e[0]""", + print (e[0])""", 'expected_stdout': """Error while executing SQL statement: - SQLCODE: -530 -- violation of FOREIGN KEY constraint "" - violation of FOREIGN KEY constraint "FK_DETAIL_TABLE" on table "DETAIL_TABLE" - Foreign key reference target does not exist """ Modified: qa/fbt-repository/trunk/tests/functional/fkey/unique/insert_03.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/fkey/unique/insert_03.fbt 2013-04-05 09:35:57 UTC (rev 57906) +++ qa/fbt-repository/trunk/tests/functional/fkey/unique/insert_03.fbt 2013-04-05 10:43:19 UTC (rev 57907) @@ -65,11 +65,9 @@ cd.execute("... [truncated message content] |