Merge pull request #322 from liampauling/bugfix/320-reserve-runners

Bugfix/320 reserve runners
betcode-org · Jul 27, 2020 · 4870aab · 4870aab
2 parents dc88af8 + 4e173b4
commit 4870aab
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/betfairlightweight/endpoints/streaming.py b/betfairlightweight/endpoints/streaming.py
@@ -72,7 +72,6 @@ def create_historical_stream(
             file_path = kwargs.get("directory")
 
         listener = listener if listener else BaseListener()
-        listener.register_stream(0, "marketSubscription")
         return HistoricalStream(file_path, listener)
 
     @staticmethod
@@ -96,5 +95,4 @@ def create_historical_generator_stream(
             file_path = kwargs.get("directory")
 
         listener = listener if listener else StreamListener()
-        listener.register_stream(0, "marketSubscription")
         return HistoricalGeneratorStream(file_path, listener)
diff --git a/betfairlightweight/streaming/betfairstream.py b/betfairlightweight/streaming/betfairstream.py
@@ -298,6 +298,7 @@ def stop(self) -> None:
         self._running = False
 
     def _read_loop(self) -> None:
+        self.listener.register_stream(0, "marketSubscription")
         with open(self.file_path, "r") as f:
             for update in f:
                 if self.listener.on_data(update) is False:
@@ -321,6 +322,7 @@ def get_generator(self):
 
     def _read_loop(self):
         self._running = True
+        self.listener.register_stream(0, "marketSubscription")
         with open(self.file_path, "r") as f:
             for update in f:
                 if self.listener.on_data(update) is False:

diff --git a/tests/unit/test_betfairstream.py b/tests/unit/test_betfairstream.py
@@ -372,6 +372,7 @@ def test__read_loop(self, mock_stop):
         self.listener.on_data.snap()
         mock_stop.assert_called_with()
         self.assertTrue(self.stream._running)
+        self.listener.register_stream.assert_called_with(0, "marketSubscription")
 
 
 class HistoricalGeneratorStreamTest(unittest.TestCase):
@@ -401,3 +402,4 @@ def test__read_loop(self, mock_stop):
         self.listener.on_data.snap()
         mock_stop.assert_called_with()
         self.assertTrue(self.stream._running)
+        self.listener.register_stream.assert_called_with(0, "marketSubscription")
diff --git a/tests/unit/test_streamingendpoint.py b/tests/unit/test_streamingendpoint.py
@@ -34,8 +34,6 @@ def test_create_historical_stream(self, mock_stream):
         file_path = "test"
         listener = mock.Mock()
         self.streaming.create_historical_stream(file_path=file_path, listener=listener)
-
-        listener.register_stream.assert_called_with(0, "marketSubscription")
         mock_stream.assert_called_with(file_path, listener)
 
     @mock.patch("betfairlightweight.endpoints.streaming.HistoricalGeneratorStream")
@@ -45,8 +43,6 @@ def test_create_historical_generator_stream(self, mock_stream):
         self.streaming.create_historical_generator_stream(
             file_path=file_path, listener=listener
         )
-
-        listener.register_stream.assert_called_with(0, "marketSubscription")
         mock_stream.assert_called_with(file_path, listener)
 
     @mock.patch("betfairlightweight.endpoints.streaming.HistoricalStream")
@@ -58,8 +54,6 @@ def test_create_historical_stream_with_directory(self, mock_stream):
             self.streaming.create_historical_stream(
                 directory=file_path, listener=listener
             )
-
-            listener.register_stream.assert_called_with(0, "marketSubscription")
             mock_stream.assert_called_with(file_path, listener)
 
     @mock.patch("betfairlightweight.endpoints.streaming.HistoricalGeneratorStream")
@@ -71,6 +65,4 @@ def test_create_historical_generator_stream_with_directory(self, mock_stream):
             self.streaming.create_historical_generator_stream(
                 directory=file_path, listener=listener
             )
-
-            listener.register_stream.assert_called_with(0, "marketSubscription")
             mock_stream.assert_called_with(file_path, listener)