From fcc5298d6bd00dd2d91155744509e4465288ec16 Mon Sep 17 00:00:00 2001 From: Stephen Diehl Date: Sun, 4 Mar 2012 16:41:17 -0500 Subject: [PATCH] Partial fix for control flow bugs. ( See Jenkins ) --- zipline/test/factory.py | 9 ++++++--- zipline/test/test_finance.py | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/zipline/test/factory.py b/zipline/test/factory.py index abbcd593..2194aed1 100644 --- a/zipline/test/factory.py +++ b/zipline/test/factory.py @@ -20,11 +20,14 @@ def create_trade_history(sid, prices, amounts, start_time, interval): i = 0 trades = [] current = start_time.replace(tzinfo = pytz.utc) - while i < len(prices): + + for price, amount in zip(prices, amounts): + if(risk.trading_calendar.is_trading_day(current)): - trades.append(create_trade(sid, prices[i], amounts[i], current)) + trade = create_trade(sid, price, amount, current) + trades.append(trade) + current = current + interval - i += 1 else: current = current + datetime.timedelta(days=1) diff --git a/zipline/test/test_finance.py b/zipline/test/test_finance.py index fe59d90f..3c85e747 100644 --- a/zipline/test/test_finance.py +++ b/zipline/test/test_finance.py @@ -158,7 +158,7 @@ class FinanceTestCase(TestCase): trade_history = factory.create_trade_history( a, b, c, ts, dt ) - set1 = SpecificEquityTrades("flat-133",) + set1 = SpecificEquityTrades("flat-133", trade_history) #client sill send 10 orders for 100 shares of 133 client = TestTradingClient(133, 100, 10)