[Firebird-checkins] SF.net SVN: firebird:[63223] qa/fbt-repository/trunk/tests

[<mak...@us...>]

Revision: 63223
          http://sourceforge.net/p/firebird/code/63223
Author:   makowski
Date:     2016-04-11 10:40:48 +0000 (Mon, 11 Apr 2016)
Log Message:
-----------
try to fix false fails under Linux

Modified Paths:
--------------
    qa/fbt-repository/trunk/tests/bugs/core_0014.fbt
    qa/fbt-repository/trunk/tests/bugs/core_4418.fbt
    qa/fbt-repository/trunk/tests/bugs/core_4452.fbt
    qa/fbt-repository/trunk/tests/bugs/core_4766.fbt
    qa/fbt-repository/trunk/tests/bugs/core_4802.fbt
    qa/fbt-repository/trunk/tests/functional/basic/isql/isql_03.fbt

Modified: qa/fbt-repository/trunk/tests/bugs/core_0014.fbt
===================================================================
--- qa/fbt-repository/trunk/tests/bugs/core_0014.fbt	2016-04-11 10:06:32 UTC (rev 63222)
+++ qa/fbt-repository/trunk/tests/bugs/core_0014.fbt	2016-04-11 10:40:48 UTC (rev 63223)
@@ -10,7 +10,7 @@
  'firebird_version': '2.5',
  'platform': 'All',
  'test_type': 'ISQL',
- 'test_script': 
+ 'test_script':
   """
     -- Works OK on 1.5.6 and up to 4.0.0.
     create domain dom_datum_vreme as timestamp not null;
@@ -59,10 +59,10 @@
     as
     begin
 
-        update ulaz_master u set u.vrednost = u.vrednost + new.ukupno 
+        update ulaz_master u set u.vrednost = u.vrednost + new.ukupno
         where u.ulzid = new.ulzid;
 
-        update ulaz_master u set u.rvrednost = u.rvrednost + (1 - new.rabat/100) * new.ukupno 
+        update ulaz_master u set u.rvrednost = u.rvrednost + (1 - new.rabat/100) * new.ukupno
         where u.ulzid = new.ulzid;
 
     end
@@ -73,7 +73,7 @@
     -- this trigger sets fiedls to null on rc8.
     -- on rc6 it works as it should.
 
-    insert into ulaz_master(ulzid, datum, broj_racuna, dobid, dobavljac, napid, nacin_placanja) 
+    insert into ulaz_master(ulzid, datum, broj_racuna, dobid, dobavljac, napid, nacin_placanja)
                      values(1000,  '19.03.2016 12:01:03', 'qwerty123', 78966, 'foo-bar', 32101, 'asd-fgh-jkl'  );
     /*
     create domain dom_datum_vreme as timestamp not null;
@@ -92,20 +92,20 @@
       napid dom_jid not null,
       nacin_placanja dom_naziv not null,
     */
-      
+
     set list on;
     set count on;
 
     select * from ulaz_master;
 
-    insert into 
+    insert into
         ulaz_detalji(ulzid, artid, artikal, kolicina, cena, rabat, vratio)
               values(1000,  1000,  'liste',   19,        7,    30,    0);
 
     select * from ulaz_detalji;
     select * from ulaz_master;
   """,
- 'expected_stdout': 
+ 'expected_stdout':
   """
     ULZID                           1000
     DATUM                           2016-03-19 12:01:03.0000
@@ -115,8 +115,8 @@
     NAPID                           32101
     NACIN_PLACANJA                  asd-fgh-jkl
     DATUMPRISPECA                   <null>
-    VREDNOST                        0.0000000000000000
-    RVREDNOST                       0.0000000000000000
+    VREDNOST                        0.000000000000000
+    RVREDNOST                       0.000000000000000
     STATUS                          0
 
 
@@ -151,7 +151,10 @@
   """,
  'expected_stderr':
   """
-  """
+  """,
+  'substitutions': [
+    ('0\.0000000000000000','0\.000000000000000')
+  ]
 }
 ]
 }

Modified: qa/fbt-repository/trunk/tests/bugs/core_4418.fbt
===================================================================
--- qa/fbt-repository/trunk/tests/bugs/core_4418.fbt	2016-04-11 10:06:32 UTC (rev 63222)
+++ qa/fbt-repository/trunk/tests/bugs/core_4418.fbt	2016-04-11 10:40:48 UTC (rev 63223)
@@ -99,10 +99,11 @@
 DM_IDS                          BIGINT Nullable
 DM_NUMS                         VARCHAR(20) CHARACTER SET UTF8 Nullable
                                  COLLATE NUMS_COLL
-NUMS_COLL, CHARACTER SET UTF8, FROM EXTERNAL ('UNICODE'), PAD SPACE, CASE INSENSITIVE, 'COLL-VERSION=58.0.6.xx;NUMERIC-SORT=1'
+NUMS_COLL, CHARACTER SET UTF8, FROM EXTERNAL ('UNICODE'), PAD SPACE, CASE INSENSITIVE, 'COLL-VERSION=xx;NUMERIC-SORT=1'
   """,
   'substitutions': [
-    ('COLL-VERSION=58\.0\.6\.[0-9][0-9]','COLL-VERSION=58.0.6.xx')
+    ('COLL-VERSION=58\.0\.6\.[0-9][0-9]','COLL-VERSION=xx'),
+    ('COLL-VERSION=137\.51','COLL-VERSION=xx')
   ]
 }
 ]

Modified: qa/fbt-repository/trunk/tests/bugs/core_4452.fbt
===================================================================
--- qa/fbt-repository/trunk/tests/bugs/core_4452.fbt	2016-04-11 10:06:32 UTC (rev 63222)
+++ qa/fbt-repository/trunk/tests/bugs/core_4452.fbt	2016-04-11 10:40:48 UTC (rev 63223)
@@ -37,11 +37,11 @@
   """,
  'expected_stdout':
   """
-NAME_COLL, CHARACTER SET UTF8, FROM EXTERNAL ('UNICODE'), PAD SPACE, CASE INSENSITIVE, 'COLL-VERSION=58.0.6.xx'
-NUMS_COLL, CHARACTER SET UTF8, FROM EXTERNAL ('UNICODE'), PAD SPACE, CASE INSENSITIVE, 'COLL-VERSION=58.0.6.xx;NUMERIC-SORT=1'
+NAME_COLL, CHARACTER SET UTF8, FROM EXTERNAL ('UNICODE'), PAD SPACE, CASE INSENSITIVE, 'COLL-VERSION=xx'
+NUMS_COLL, CHARACTER SET UTF8, FROM EXTERNAL ('UNICODE'), PAD SPACE, CASE INSENSITIVE, 'COLL-VERSION=xx;NUMERIC-SORT=1'
 
-NAME_COLL, CHARACTER SET UTF8, FROM EXTERNAL ('UNICODE'), PAD SPACE, CASE INSENSITIVE, 'COLL-VERSION=58.0.6.xx'
-NUMS_COLL, CHARACTER SET UTF8, FROM EXTERNAL ('UNICODE'), PAD SPACE, CASE INSENSITIVE, 'COLL-VERSION=58.0.6.xx;NUMERIC-SORT=1'
+NAME_COLL, CHARACTER SET UTF8, FROM EXTERNAL ('UNICODE'), PAD SPACE, CASE INSENSITIVE, 'COLL-VERSION=xx'
+NUMS_COLL, CHARACTER SET UTF8, FROM EXTERNAL ('UNICODE'), PAD SPACE, CASE INSENSITIVE, 'COLL-VERSION=xx;NUMERIC-SORT=1'
   """,
  'expected_stderr':
   """
@@ -49,7 +49,8 @@
 There are no user-defined collations in this database
   """,
   'substitutions': [
-    ('COLL-VERSION=58\.0\.6\.[0-9][0-9]','COLL-VERSION=58.0.6.xx')
+    ('COLL-VERSION=58\.0\.6\.[0-9][0-9]','COLL-VERSION=xx'),
+    ('COLL-VERSION=137\.51','COLL-VERSION=xx')
   ]
 }
 ]

Modified: qa/fbt-repository/trunk/tests/bugs/core_4766.fbt
===================================================================
--- qa/fbt-repository/trunk/tests/bugs/core_4766.fbt	2016-04-11 10:06:32 UTC (rev 63222)
+++ qa/fbt-repository/trunk/tests/bugs/core_4766.fbt	2016-04-11 10:40:48 UTC (rev 63223)
@@ -30,7 +30,7 @@
 
     create or alter user boss password '123' grant admin role;
     commit;
-    
+
     set term ^;
     execute block as
     begin
@@ -48,13 +48,13 @@
     begin
         execute statement 'drop user mgr1'
         as user 'BOSS' password '123' role 'RDB$ADMIN';
-    end  
+    end
     -- This lead to 2nd "SQLSTATE = 28000" with text:
     -- before build 32136: "add record error / -no permission for INSERT access to TABLE PLG$VIEW_USERS"
     -- since  that  build: "find/delete record error / -no permission for DELETE access to TABLE"
     ^
     set term ;^
-    
+
     -- Attention: see above ROLLBACK labaled as [###NB###]: without that rollback following
     -- COMMIT will again try to ADD user boss/123 and only after it - drop user statement,
     -- and this will lead to fail again with error about adding (not deleting) user.
@@ -65,7 +65,7 @@
     rollback;
 
     drop user boss;
-    commit; 
+    commit;
   """,
   'expected_stderr':
   """
@@ -76,7 +76,9 @@
     find/delete record error
     -no permission for DELETE access to TABLE PLG
   """,
-  'substitutions':[('TABLE PLG\$VIEW_USERS','TABLE PLG'), ('TABLE PLG\$SRP_VIEW', 'TABLE PLG') ]
+  'substitutions':[('TABLE PLG\$VIEW_USERS','TABLE PLG'),
+                   ('TABLE PLG\$SRP_VIEW', 'TABLE PLG'),
+                   ('find/delete', 'delete' ]
 }
 ]
 }

Modified: qa/fbt-repository/trunk/tests/bugs/core_4802.fbt
===================================================================
--- qa/fbt-repository/trunk/tests/bugs/core_4802.fbt	2016-04-11 10:06:32 UTC (rev 63222)
+++ qa/fbt-repository/trunk/tests/bugs/core_4802.fbt	2016-04-11 10:40:48 UTC (rev 63223)
@@ -13,24 +13,24 @@
   """
   """,
  'test_type': 'ISQL',
- 'test_script': 
+ 'test_script':
   """
     set wng off;
-    
-    recreate table test(fld_for_seniors varchar(70), fld_for_juniors varchar(70)); 
+
+    recreate table test(fld_for_seniors varchar(70), fld_for_juniors varchar(70));
     commit;
-    
-    create or alter user BIG_BROTHER password '123' revoke admin role; 
-    create or alter user SENIOR_MNGR password '456' revoke admin role; 
-    create or alter user JUNIOR_MNGR password '789' revoke admin role; 
+
+    create or alter user BIG_BROTHER password '123' revoke admin role;
+    create or alter user SENIOR_MNGR password '456' revoke admin role;
+    create or alter user JUNIOR_MNGR password '789' revoke admin role;
     create role FLD_FOR_SENIORS_UPDATER;
     create role FLD_FOR_JUNIORS_UPDATER;
     commit;
-    
+
     revoke all on all from BIG_BROTHER;
     revoke all on all from SENIOR_MNGR;
     revoke all on all from JUNIOR_MNGR;
-    
+
     -- Statement failed, SQLSTATE = 28000
     -- unsuccessful metadata update
     -- -REVOKE failed
@@ -39,56 +39,56 @@
     -- revoke all on all from role FLD_FOR_SENIORS_UPDATER;
     -- revoke all on all from role FLD_FOR_JUNIORS_UPDATER;
     commit;
-    grant select on test to PUBLIC; 
-    
+    grant select on test to PUBLIC;
+
     grant update(fld_for_seniors) on test to BIG_BROTHER;
     commit;
-    
+
     grant update(fld_for_seniors) on test to FLD_FOR_SENIORS_UPDATER;
     grant update(fld_for_juniors) on test to FLD_FOR_JUNIORS_UPDATER;
-    
+
     grant FLD_FOR_SENIORS_UPDATER to SENIOR_MNGR;
     grant FLD_FOR_JUNIORS_UPDATER to JUNIOR_MNGR;
     commit;
-    
+
     show grants;
-    
-    insert into test values( 'created by '||upper(current_user), 'created by '||lower(current_user) ); 
+
+    insert into test values( 'created by '||upper(current_user), 'created by '||lower(current_user) );
     commit;
     set list on;
-    
+
     --set echo on;
-    
+
     connect '$(DSN)' user 'BIG_BROTHER' password '123';
     select current_user, current_role from rdb$database;
     update test set fld_for_seniors = 'updated by '||upper(current_user)||', role: '||upper(current_role);
     select * from test;
-    
+
     update test set fld_for_juniors = 'updated by '||lower(current_user)||', role: '||lower(current_role);
     select * from test;
     commit;
     ---------------------------------------------------------------
-    
+
     connect '$(DSN)' user 'SENIOR_MNGR' password '456' role 'FLD_FOR_SENIORS_UPDATER';
     select current_user, current_role from rdb$database;
     update test set fld_for_seniors = 'updated by '||upper(current_user)||', role: '||upper(current_role);
     select * from test;
-    
+
     update test set fld_for_juniors ='updated by '||lower(current_user)||', role: '||lower(current_role);
     select * from test;
     commit;
     ---------------------------------------------------------------
-    
+
     connect '$(DSN)' user 'JUNIOR_MNGR' password '789' role 'FLD_FOR_JUNIORS_UPDATER';
     select current_user, current_role from rdb$database;
     update test set fld_for_seniors = 'updated by '||upper(current_user)||', role: '||upper(current_role);
     select * from test;
-    
+
     update test set fld_for_juniors ='updated by '||lower(current_user)||', role: '||lower(current_role);
     select * from test;
     commit;
     ---------------------------------------------------------------
-    
+
     connect '$(DSN)' user 'SYSDBA' password 'masterkey';
     drop role FLD_FOR_SENIORS_UPDATER;
     drop role FLD_FOR_JUNIORS_UPDATER;
@@ -97,7 +97,7 @@
     drop user JUNIOR_MNGR;
     commit;
   """,
- 'expected_stdout': 
+ 'expected_stdout':
   """
     /* Grant permissions for this database */
     GRANT UPDATE (FLD_FOR_SENIORS) ON TEST TO USER BIG_BROTHER
@@ -106,7 +106,7 @@
     GRANT SELECT ON TEST TO PUBLIC
     GRANT FLD_FOR_JUNIORS_UPDATER TO JUNIOR_MNGR
     GRANT FLD_FOR_SENIORS_UPDATER TO SENIOR_MNGR
-    
+
     USER                            BIG_BROTHER
     ROLE                            NONE
     FLD_FOR_SENIORS                 updated by BIG_BROTHER, role: NONE
@@ -128,17 +128,18 @@
     FLD_FOR_SENIORS                 updated by SENIOR_MNGR, role: FLD_FOR_SENIORS_UPDATER
     FLD_FOR_JUNIORS                 updated by junior_mngr, role: fld_for_juniors_updater
   """,
- 'expected_stderr': 
+ 'expected_stderr':
   """
     Statement failed, SQLSTATE = 28000
     no permission for UPDATE access to COLUMN TEST.FLD_FOR_JUNIORS
-    
+
     Statement failed, SQLSTATE = 28000
     no permission for UPDATE access to COLUMN TEST.FLD_FOR_JUNIORS
-    
+
     Statement failed, SQLSTATE = 28000
     no permission for UPDATE access to COLUMN TEST.FLD_FOR_SENIORS
-  """
+  """,
+  'substitutions':[('GRANT.*TMP.*','')]
 }
 ]
 }

Modified: qa/fbt-repository/trunk/tests/functional/basic/isql/isql_03.fbt
===================================================================
--- qa/fbt-repository/trunk/tests/functional/basic/isql/isql_03.fbt	2016-04-11 10:06:32 UTC (rev 63222)
+++ qa/fbt-repository/trunk/tests/functional/basic/isql/isql_03.fbt	2016-04-11 10:40:48 UTC (rev 63223)
@@ -380,7 +380,7 @@
 SHOW SYSTEM FUNCTIONS;
 
 """,
- 'expected_stdout': 
+ 'expected_stdout':
   """
        MON$ATTACHMENTS                        MON$CALL_STACK
        MON$CONTEXT_VARIABLES                  MON$DATABASE
@@ -556,10 +556,11 @@
 WIN1258, CHARACTER SET WIN1258, PAD SPACE, SYSTEM
 WIN_CZ, CHARACTER SET WIN1250, PAD SPACE, CASE INSENSITIVE, SYSTEM
 WIN_CZ_CI_AI, CHARACTER SET WIN1250, PAD SPACE, CASE INSENSITIVE, ACCENT INSENSITIVE, SYSTEM
-WIN_PTBR, CHARACTER SET WIN1252, PAD SPACE, CASE INSENSITIVE, ACCENT INSENSITIVE, SYSTEM  
+WIN_PTBR, CHARACTER SET WIN1252, PAD SPACE, CASE INSENSITIVE, ACCENT INSENSITIVE, SYSTEM
   """,
  'substitutions': [
-    ("'COLL-VERSION=58\.0\.6\.[0-9][0-9]', ","")
+    ("'COLL-VERSION=58\.0\.6\.[0-9][0-9]', ",""),
+    ("'COLL-VERSION=137\.51', ","")
     ]
 }
 ]

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.