From 56eaa073cecb3b57d7438dabaf58f720768b64b1 Mon Sep 17 00:00:00 2001
From: Bernardo Damele <bernardo.damele@gmail.com>
Date: Fri, 18 Jan 2013 23:32:39 +0000
Subject: [PATCH] fixed test cases for Firebird - #312

---
 lib/core/testing.py |  3 +++
 xml/livetests.xml   | 14 ++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/core/testing.py b/lib/core/testing.py
index 376747012..2d760569b 100644
--- a/lib/core/testing.py
+++ b/lib/core/testing.py
@@ -275,6 +275,9 @@ def runCase(switches=None, parse=None):
 
     console = getUnicode(console, system=True)
 
+    print "result:", result
+    print "console:", console
+
     if parse and retVal:
         with codecs.open(conf.dumper.getOutputFile(), "rb", UNICODE_ENCODING) as f:
             content = f.read()
diff --git a/xml/livetests.xml b/xml/livetests.xml
index 7f0388778..aa4177d1b 100644
--- a/xml/livetests.xml
+++ b/xml/livetests.xml
@@ -913,7 +913,7 @@
         </switches>
         <parse>
             <item value="Title: AND boolean-based blind - WHERE or HAVING clause"/>
-            <item value="r'back-end DBMS: active fingerprint: Firebird 2.1 (dialect 3)'"/>
+            <item value="r'back-end DBMS: active fingerprint: Firebird 2.1 \(dialect 3\)'"/>
             <item value="banner:    '2.5.0'"/>
             <item value="current user:    'SYSDBA'"/>
             <item value="current database:    '/'"/>
@@ -953,7 +953,7 @@
         </switches>
         <parse>
             <item value="Title: AND boolean-based blind - WHERE or HAVING clause"/>
-            <item value="r'back-end DBMS: active fingerprint: Firebird 2.1 (dialect 3)'"/>
+            <item value="r'back-end DBMS: active fingerprint: Firebird 2.1 \(dialect 3\)'"/>
             <item value="banner:    '2.5.0'"/>
             <item value="current user:    'SYSDBA'"/>
             <item value="current database:    '/'"/>
@@ -968,6 +968,7 @@
             <item value="r'Database: Firebird_masterdb.+Table: USERS.+5 entries.+luther.+nameisnull.+'"/>
         </parse>
     </case>
+    <!-- TODO: this test case fails because of issue #357 -->
     <case name="Firebird UNION query multi-threaded enumeration - all entries">
         <switches>
             <url value="http://debiandev/sqlmap/firebird/get_int.php?id=1"/>
@@ -992,7 +993,7 @@
         </switches>
         <parse>
             <item value="Title: Generic UNION query (NULL) - 3 columns"/>
-            <item value="r'back-end DBMS: active fingerprint: Firebird 2.1 (dialect 3)'"/>
+            <item value="r'back-end DBMS: active fingerprint: Firebird 2.1 \(dialect 3\)'"/>
             <item value="banner:    '2.5.0'"/>
             <item value="current user:    'SYSDBA'"/>
             <item value="current database:    '/'"/>
@@ -1007,6 +1008,7 @@
             <item value="r'Database: Firebird_masterdb.+Table: USERS.+5 entries.+luther.+nameisnull.+'"/>
         </parse>
     </case>
+    <!-- TODO: this test case fails because of issue #357 -->
     <case name="Firebird partial UNION query multi-threaded enumeration - all entries">
         <switches>
             <url value="http://debiandev/sqlmap/firebird/get_int_partialunion.php?id=1"/>
@@ -1031,7 +1033,7 @@
         </switches>
         <parse>
             <item value="Title: Generic UNION query (NULL) - 3 columns"/>
-            <item value="r'back-end DBMS: active fingerprint: Firebird 2.1 (dialect 3)'"/>
+            <item value="r'back-end DBMS: active fingerprint: Firebird 2.1 \(dialect 3\)'"/>
             <item value="banner:    '2.5.0'"/>
             <item value="current user:    'SYSDBA'"/>
             <item value="current database:    '/'"/>
@@ -1057,7 +1059,7 @@
             <isDba value="True"/>
         </switches>
         <parse>
-            <item value="Title: Firebird AND time-based blind \(heavy query\)"/>
+            <item value="Title: Firebird AND time-based blind (heavy query)"/>
             <item value="banner:    '2.5.0'"/>
             <item value="current user is DBA:    True"/>
         </parse>
@@ -1086,7 +1088,7 @@
         </switches>
         <parse>
             <item value="Title: Firebird inline queries"/>
-            <item value="r'back-end DBMS: active fingerprint: Firebird 2.1 (dialect 3)'"/>
+            <item value="r'back-end DBMS: active fingerprint: Firebird 2.1 \(dialect 3\)'"/>
             <item value="banner:    '2.5.0'"/>
             <item value="current user:    'SYSDBA'"/>
             <item value="current database:    '/'"/>