Merge branch 'master' of git://git.assembla.com/fpdboz.git

This commit is contained in:
eblade 2009-06-09 11:22:08 -04:00
commit 52c2411360
2 changed files with 8 additions and 21 deletions

View File

@ -337,7 +337,6 @@ if __name__=="__main__":
# stat_dict = db_connection.get_stats_from_hand(h, hero) # stat_dict = db_connection.get_stats_from_hand(h, hero)
# for p in stat_dict.keys(): # for p in stat_dict.keys():
# print p, " ", stat_dict[p] # print p, " ", stat_dict[p]
>>>>>>> 7ef6a533ec6c73d5815ace42168067a6f8c26e3a:pyfpdb/Database.py
print "cards =", db_connection.get_cards(u'1') print "cards =", db_connection.get_cards(u'1')
db_connection.close_connection db_connection.close_connection

View File

@ -16,24 +16,12 @@ def testPokerStarsHHDate():
datetime.datetime(2008,9,7,11,23,14)) datetime.datetime(2008,9,7,11,23,14))
) )
def testFullTiltHHDate(): #def testTableDetection():
sitngo1 = "Full Tilt Poker Game #10311865543: $1 + $0.25 Sit & Go (78057629), Table 1 - 25/50 - No Limit Hold'em - 0:07:45 ET - 2009/01/29" # result = Tables.clean_title("French (deep)")
cash1 = "Full Tilt Poker Game #9403951181: Table CR - tay - $0.05/$0.10 - No Limit Hold'em - 9:40:20 ET - 2008/12/09" # assert result == "French"
cash2 = "Full Tilt Poker Game #9468383505: Table Bike (deep 6) - $0.05/$0.10 - No Limit Hold'em - 5:09:36 ET - 2008/12/13" # result = Tables.clean_title("French (deep) - $0.25/$0.50 - No Limit Hold'em - Logged In As xxxx")
# assert result == "French"
result = fpdb_simple.parseHandStartTime(sitngo1,"ftp") #
assert result==datetime.datetime(2009,1,29,05,07,45) # for (header, site, result) in tuples:
result = fpdb_simple.parseHandStartTime(cash1,"ftp") # yield checkDateParse, header, site, result
assert result==datetime.datetime(2008,12,9,14,40,20)
result = fpdb_simple.parseHandStartTime(cash2,"ftp")
assert result==datetime.datetime(2008,12,13,10,9,36)
def testTableDetection():
result = Tables.clean_title("French (deep)")
assert result == "French"
result = Tables.clean_title("French (deep) - $0.25/$0.50 - No Limit Hold'em - Logged In As xxxx")
assert result == "French"
for (header, site, result) in tuples:
yield checkDateParse, header, site, result