From b924f57e5341ab0ca37df4e9d7e5e837613fbc75 Mon Sep 17 00:00:00 2001 From: Stephen Diehl Date: Thu, 5 Apr 2012 14:52:43 -0400 Subject: [PATCH] "Fix" for hanging tests in simulator. --- zipline/simulator.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/zipline/simulator.py b/zipline/simulator.py index c43f21fc..728bca3d 100644 --- a/zipline/simulator.py +++ b/zipline/simulator.py @@ -57,7 +57,6 @@ class Simulator(ComponentHost): self.running = True return thread - def did_clean_shutdown(self): return not any([t.isAlive() for t in self.subthreads]) @@ -70,8 +69,6 @@ class Simulator(ComponentHost): if not self.running: return - if self.controller: - self.controller.shutdown() for component in self.components.itervalues(): component.shutdown() @@ -80,6 +77,8 @@ class Simulator(ComponentHost): if thread.is_alive(): thread._Thread__stop() + #self.controller.shutdown() + self.running = False assert self.did_clean_shutdown()