fixed test cases

This commit is contained in:
Bernardo Damele 2012-12-19 12:33:37 +00:00
parent 5ceadf02ae
commit 2bc2c0431c
2 changed files with 10 additions and 10 deletions

View File

@ -206,7 +206,7 @@ def runCase(switches=None, parse=None):
retVal = False retVal = False
if parse and retVal: if parse and retVal:
ifile = open(conf.dumper.getOutputFile(), 'r') ifile = open(conf.dumper.getOutputFile(), "rb")
content = ifile.read() content = ifile.read()
ifile.close() ifile.close()
for item in parse: for item in parse:

View File

@ -366,10 +366,10 @@
<tech value="B"/> <tech value="B"/>
<search value="True"/> <search value="True"/>
<db value="testdb"/> <db value="testdb"/>
<tbl value="a,e,i"/> <tbl value="foo,se,bar"/>
</switches> </switches>
<parse> <parse>
<item value="r'Database: testdb.+3 tables.+users'"/> <item value="r'Database: testdb.+1 table.+users'"/>
<item value="r'.+5 entries.+wu.+nameisnull'"/> <item value="r'.+5 entries.+wu.+nameisnull'"/>
</parse> </parse>
</case> </case>
@ -380,10 +380,10 @@
<tech value="E"/> <tech value="E"/>
<search value="True"/> <search value="True"/>
<db value="testdb"/> <db value="testdb"/>
<tbl value="a,e,i"/> <tbl value="foo,se,bar"/>
</switches> </switches>
<parse> <parse>
<item value="r'Database: testdb.+3 tables.+users'"/> <item value="r'Database: testdb.+1 table.+users'"/>
<item value="r'.+5 entries.+wu.+nameisnull'"/> <item value="r'.+5 entries.+wu.+nameisnull'"/>
</parse> </parse>
</case> </case>
@ -394,10 +394,10 @@
<tech value="U"/> <tech value="U"/>
<search value="True"/> <search value="True"/>
<db value="testdb"/> <db value="testdb"/>
<tbl value="a,e,i"/> <tbl value="foo,se,bar"/>
</switches> </switches>
<parse> <parse>
<item value="r'Database: testdb.+3 tables.+users'"/> <item value="r'Database: testdb.+1 table.+users'"/>
<item value="r'.+5 entries.+wu.+nameisnull'"/> <item value="r'.+5 entries.+wu.+nameisnull'"/>
</parse> </parse>
</case> </case>
@ -411,7 +411,7 @@
<answers value="do you want to dump=N"/> <answers value="do you want to dump=N"/>
</switches> </switches>
<parse> <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> </parse>
</case> </case>
<case name="MySQL error-based multi-threaded search enumeration - tables without given database"> <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"/> <answers value="do you want to dump=N"/>
</switches> </switches>
<parse> <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> </parse>
</case> </case>
<case name="MySQL UNION query multi-threaded search enumeration - tables without given database"> <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"/> <answers value="do you want to dump=N"/>
</switches> </switches>
<parse> <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> </parse>
</case> </case>
<case name="MySQL boolean-based multi-threaded search enumeration - column without given db or table"> <case name="MySQL boolean-based multi-threaded search enumeration - column without given db or table">