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

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

Revision: 62455
          http://sourceforge.net/p/firebird/code/62455
Author:   makowski
Date:     2015-10-28 15:48:54 +0000 (Wed, 28 Oct 2015)
Log Message:
-----------
adapt tests for FB3.0 under Linux

Modified Paths:
--------------
    qa/fbt-repository/trunk/tests/bugs/core_3942.fbt
    qa/fbt-repository/trunk/tests/bugs/core_4503.fbt
    qa/fbt-repository/trunk/tests/bugs/core_4880.fbt
    qa/fbt-repository/trunk/tests/functional/shadow/create_02.fbt

Modified: qa/fbt-repository/trunk/tests/bugs/core_3942.fbt
===================================================================
--- qa/fbt-repository/trunk/tests/bugs/core_3942.fbt	2015-10-28 14:44:40 UTC (rev 62454)
+++ qa/fbt-repository/trunk/tests/bugs/core_3942.fbt	2015-10-28 15:48:54 UTC (rev 62455)
@@ -40,6 +40,74 @@
     -Exiting before completion due to errors
   """,
   'substitutions':[('.*database.*already exists.*','database already exists.*')]
+},
+{
+ 'firebird_version': '3.0',
+ 'platform': 'Windows',
+ 'test_type': 'Python',
+ 'init_script':
+  """
+  """,
+ 'test_script':
+  """import os
+db_conn.close()
+fdb='$(DATABASE_LOCATION)bugs.core_3942.fdb'
+fbk = os.path.join(context['temp_directory'],'tmp.core_3942.fbk')
+runProgram('gbak',['-b','-user',user_name,'-password',user_password,dsn,fbk])
+print ('Trying to overwrite eisting database file using gbak -se...')
+runProgram('gbak',['-c','-se','localhost:service_mgr','-user',user_name,'-password',user_password,fbk,fdb])
+print ('Trying to overwrite eisting database file using fbsvcmgr...')
+runProgram('fbsvcmgr',['localhost:service_mgr','user','SYSDBA','password','masterkey','action_restore','dbname',fdb,'bkp_file',fbk])
+if os.path.isfile(fbk):
+    os.remove(fbk)
+  """,
+ 'expected_stdout': 
+  """
+    Trying to overwrite eisting database file using gbak -se...
+    Trying to overwrite eisting database file using fbsvcmgr...
+  """,
+ 'expected_stderr': 
+  """
+    gbak: ERROR:database C:/FBTESTING/qa/fbt-repo/tmp/bugs.core_3942.fdb already exists.  To replace it, use the -REP switch
+    gbak: ERROR:    Exiting before completion due to errors
+    gbak:Exiting before completion due to errors
+    database C:/FBTESTING/qa/fbt-repo/tmp/bugs.core_3942.fdb already exists.  To replace it, use the -REP switch
+    -Exiting before completion due to errors
+  """,
+  'substitutions':[('.*database.*already exists.*','database already exists.*')]
+},
+{
+ 'firebird_version': '3.0',
+ 'platform': 'Linux',
+ 'test_type': 'Python',
+ 'init_script':
+  """
+  """,
+ 'test_script':
+  """import os
+db_conn.close()
+fdb='$(DATABASE_LOCATION)bugs.core_3942.fdb'
+fbk = os.path.join(context['temp_directory'],'tmp.core_3942.fbk')
+runProgram('gbak',['-b','-user',user_name,'-password',user_password,dsn,fbk])
+print ('Trying to overwrite eisting database file using gbak -se...')
+runProgram('gbak',['-c','-se','localhost:service_mgr','-user',user_name,'-password',user_password,fbk,fdb])
+print ('Trying to overwrite eisting database file using fbsvcmgr...')
+runProgram('fbsvcmgr',['localhost:service_mgr','user','SYSDBA','password','masterkey','action_restore','dbname',fdb,'bkp_file',fbk])
+if os.path.isfile(fbk):
+    os.remove(fbk)
+  """,
+ 'expected_stdout': 
+  """
+    Trying to overwrite eisting database file using gbak -se...
+    Trying to overwrite eisting database file using fbsvcmgr...
+  """,
+ 'expected_stderr': 
+  """
+    gbak: ERROR:database C:/FBTESTING/qa/fbt-repo/tmp/bugs.core_3942.fdb already exists.  To replace it, use the -REP switch
+    gbak: ERROR:    Exiting before completion due to errors
+    gbak:Exiting before completion due to errors
+  """,
+  'substitutions':[('.*database.*already exists.*','database already exists.*')]
 }
 ]
 }

Modified: qa/fbt-repository/trunk/tests/bugs/core_4503.fbt
===================================================================
--- qa/fbt-repository/trunk/tests/bugs/core_4503.fbt	2015-10-28 14:44:40 UTC (rev 62454)
+++ qa/fbt-repository/trunk/tests/bugs/core_4503.fbt	2015-10-28 15:48:54 UTC (rev 62455)
@@ -51,7 +51,7 @@
     4  JOHN                                1  MICK
     3 #SYSDBA
   """,
-  'substitutions':[
+  'substitutions':[('.*0.*TMP.*','')
   ]
 }
 ]

Modified: qa/fbt-repository/trunk/tests/bugs/core_4880.fbt
===================================================================
--- qa/fbt-repository/trunk/tests/bugs/core_4880.fbt	2015-10-28 14:44:40 UTC (rev 62454)
+++ qa/fbt-repository/trunk/tests/bugs/core_4880.fbt	2015-10-28 15:48:54 UTC (rev 62455)
@@ -28,7 +28,7 @@
 'versions': [
 {
  'firebird_version': '3.0',
- 'platform': 'All',
+ 'platform': 'Windows',
  'page_size': '4096',
  'init_script':
   """

Modified: qa/fbt-repository/trunk/tests/functional/shadow/create_02.fbt
===================================================================
--- qa/fbt-repository/trunk/tests/functional/shadow/create_02.fbt	2015-10-28 14:44:40 UTC (rev 62454)
+++ qa/fbt-repository/trunk/tests/functional/shadow/create_02.fbt	2015-10-28 15:48:54 UTC (rev 62455)
@@ -233,7 +233,7 @@
  'test_type': 'ISQL',
  'test_script': 
   """
-    create shadow 1 manual conditional '$(DATABASE_LOCATION)test.shd' file '$(DATABASE_LOCATION)test.s00' starting at page 1000;
+    create shadow 1 manual conditional '$(DATABASE_LOCATION)TEST.SHD' file '$(DATABASE_LOCATION)TEST.S00' starting at page 1000;
     commit;
     set list on;
     set count on;

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