Updated bugs\core_5039.fbt: Disabled this test to be run on FB 4.0: a…

…dded record to '%FBT_REPO%\tests\qa4x-exclude-list.txt'. Name of service manager is ignored in FB 4.0, see http://tracker.firebirdsql.org/browse/CORE-5883.

tests/bugs/core_1885.fbt

@@ -6,6 +6,17 @@
 'description': 'CREATE COLLATION connection lost under Posix when using LOCALE option',
 'min_versions': None,
 'versions': [
+{
+ 'firebird_version': '2.5.0',
+ 'platform': 'All',
+ 'test_type': 'ISQL',
+ 'test_script': """CREATE COLLATION UNICODE_ENUS_CI FOR UTF8 FROM UNICODE CASE INSENSITIVE 'LOCALE=en_US';
+""",
+ 'expected_stderr': """Statement failed, SQLSTATE = 42000
+unsuccessful metadata update
+-Invalid collation attributes
+"""
+},
 {
  'firebird_version': '3.0',
  'platform': 'Windows',
@@ -22,28 +33,6 @@
     -CREATE COLLATION UNICODE_ENUS_CI failed
     -Invalid collation attributes
   """
-},
-{
- 'firebird_version': '2.5.0',
- 'platform': 'All',
- 'test_type': 'ISQL',
- 'test_script': """CREATE COLLATION UNICODE_ENUS_CI FOR UTF8 FROM UNICODE CASE INSENSITIVE 'LOCALE=en_US';
-""",
- 'expected_stderr': """Statement failed, SQLSTATE = 42000
-unsuccessful metadata update
--Invalid collation attributes
-"""
-},
-{
- 'firebird_version': '2.1.1',
- 'platform': 'All',
- 'test_type': 'ISQL',
- 'test_script': """CREATE COLLATION UNICODE_ENUS_CI FOR UTF8 FROM UNICODE CASE INSENSITIVE 'LOCALE=en_US';
-""",
- 'expected_stderr': """Statement failed, SQLCODE = -607
-unsuccessful metadata update
--Invalid collation attributes
-"""
 }
 ]
 }

tests/bugs/core_5039.fbt

@@ -5,6 +5,11 @@
 'title': 'Connecting to service with invalid servicename yields incorrect error message',
 'description': 
   """
+    28.01.2019. 
+    Name of service manager is ignored in FB 4.0, see http://tracker.firebirdsql.org/browse/CORE-5883
+    ("service_mgr" to be cleaned out from connection string completely...")
+    Disabled this test to be run on FB 4.0: added record to '%FBT_REPO%\tests\qa4x-exclude-list.txt'.
+    Added EMPTY section for FB version 4.0 in this .fbt as one more way to protect from running.
   """,
 'min_versions': '3.0',
 'versions': [
@@ -28,6 +33,28 @@ runProgram('fbsvcmgr',['localhost:qwe_mnb_zxc_9','user','SYSDBA','password','mas
     Cannot attach to services manager
     -service qwe_mnb_zxc_9 is not defined
   """
+},
+{
+ 'firebird_version': '4.0',
+ 'platform': 'All',
+ 'init_script': 
+  """
+  """,
+ 'test_type': 'ISQL',
+ 'test_script': 
+  """
+     -- This section was intentionally left empty.
+     -- No message should be in expected_* sections.
+     -- It is STRONGLY RECOMMENDED to add this ticket
+     -- in the 'excluded-list file:
+     -- %FBT_REPO%\tests\qa4x-exclude-list.txt
+  """,
+ 'expected_stdout': 
+  """
+  """,
+ 'expected_stderr': 
+  """
+  """
 }
 ]
 }

tests/qa4x-exclude-list.txt

@@ -5,4 +5,5 @@ bugs.core_3058
 bugs.core_3934
 bugs.core_5827
 bugs.core_0858
-bugs.core_2582
+bugs.core_2582
+bugs.core_5039