From 2bc2c0431c14fdba5cb741a088a50ffd984a4306 Mon Sep 17 00:00:00 2001
From: Bernardo Damele <bernardo.damele@gmail.com>
Date: Wed, 19 Dec 2012 12:33:37 +0000
Subject: [PATCH] fixed test cases

---
 lib/core/testing.py |  2 +-
 xml/livetests.xml   | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/core/testing.py b/lib/core/testing.py
index 1dc9337ff..906865a9d 100644
--- a/lib/core/testing.py
+++ b/lib/core/testing.py
@@ -206,7 +206,7 @@ def runCase(switches=None, parse=None):
         retVal = False
 
     if parse and retVal:
-        ifile = open(conf.dumper.getOutputFile(), 'r')
+        ifile = open(conf.dumper.getOutputFile(), "rb")
         content = ifile.read()
         ifile.close()
         for item in parse:
diff --git a/xml/livetests.xml b/xml/livetests.xml
index e573c347a..f365a3d59 100644
--- a/xml/livetests.xml
+++ b/xml/livetests.xml
@@ -366,10 +366,10 @@
             <tech value="B"/>
             <search value="True"/>
             <db value="testdb"/>
-            <tbl value="a,e,i"/>
+            <tbl value="foo,se,bar"/>
         </switches>
         <parse>
-            <item value="r'Database: testdb.+3 tables.+users'"/>
+            <item value="r'Database: testdb.+1 table.+users'"/>
             <item value="r'.+5 entries.+wu.+nameisnull'"/>
         </parse>
     </case>
@@ -380,10 +380,10 @@
             <tech value="E"/>
             <search value="True"/>
             <db value="testdb"/>
-            <tbl value="a,e,i"/>
+            <tbl value="foo,se,bar"/>
         </switches>
         <parse>
-            <item value="r'Database: testdb.+3 tables.+users'"/>
+            <item value="r'Database: testdb.+1 table.+users'"/>
             <item value="r'.+5 entries.+wu.+nameisnull'"/>
         </parse>
     </case>
@@ -394,10 +394,10 @@
             <tech value="U"/>
             <search value="True"/>
             <db value="testdb"/>
-            <tbl value="a,e,i"/>
+            <tbl value="foo,se,bar"/>
         </switches>
         <parse>
-            <item value="r'Database: testdb.+3 tables.+users'"/>
+            <item value="r'Database: testdb.+1 table.+users'"/>
             <item value="r'.+5 entries.+wu.+nameisnull'"/>
         </parse>
     </case>
@@ -411,7 +411,7 @@
             <answers value="do you want to dump=N"/>
         </switches>
         <parse>
-            <item value="r'Database: testdb.+3 tables.+users.+Database: mysql.+1 table.+user '"/>
+            <item value="r'Database: testdb.+1 table.+users.+Database: mysql.+1 table.+user '"/>
         </parse>
     </case>
     <case name="MySQL error-based multi-threaded search enumeration - tables without given database">
@@ -424,7 +424,7 @@
             <answers value="do you want to dump=N"/>
         </switches>
         <parse>
-            <item value="r'Database: testdb.+3 tables.+users.+Database: mysql.+1 table.+user '"/>
+            <item value="r'Database: testdb.+1 table.+users.+Database: mysql.+1 table.+user '"/>
         </parse>
     </case>
     <case name="MySQL UNION query multi-threaded search enumeration - tables without given database">
@@ -437,7 +437,7 @@
             <answers value="do you want to dump=N"/>
         </switches>
         <parse>
-            <item value="r'Database: testdb.+3 tables.+users.+Database: mysql.+1 table.+user '"/>
+            <item value="r'Database: testdb.+1 table.+users.+Database: mysql.+1 table.+user '"/>
         </parse>
     </case>
     <case name="MySQL boolean-based multi-threaded search enumeration - column without given db or table">