Refactor a bit the options passing process

1 files changed, 9 insertions, 10 deletions

diff --git a/tests/test_market.py b/tests/test_market.py
index aeb9f8e..49d159c 100644
--- a/tests/test_market.py
+++ b/tests/test_market.py
@@ -883,7 +883,7 @@ class MarketTest(WebMockTestCase):
     @mock.patch("market.ReportStore.log_error")
     @mock.patch("market.Market.store_report")
     def test_process(self, store_report, log_error, process):
-        m = market.Market(self.ccxt, self.market_args())
+        m = market.Market(self.ccxt, self.market_args(), options={"foo": "bar"})
         with self.subTest(actions=[], before=False, after=False):
             m.process([])
 
@@ -897,7 +897,7 @@ class MarketTest(WebMockTestCase):
         with self.subTest(before=True, after=False):
             m.process(["foo"], before=True)
 
-            process.assert_called_once_with("foo", steps="before")
+            process.assert_called_once_with("foo", options={"foo": "bar"}, steps="before")
             store_report.assert_called_once()
             log_error.assert_not_called()
 
@@ -907,7 +907,7 @@ class MarketTest(WebMockTestCase):
         with self.subTest(before=False, after=True):
             m.process(["sell_all"], after=True)
 
-            process.assert_called_once_with("sell_all", steps="after")
+            process.assert_called_once_with("sell_all", options={"foo": "bar"}, steps="after")
             store_report.assert_called_once()
             log_error.assert_not_called()
 
@@ -917,7 +917,7 @@ class MarketTest(WebMockTestCase):
         with self.subTest(before=False, after=False):
             m.process(["foo"])
 
-            process.assert_called_once_with("foo", steps="all")
+            process.assert_called_once_with("foo", options={"foo": "bar"}, steps="all")
             store_report.assert_called_once()
             log_error.assert_not_called()
 
@@ -927,7 +927,7 @@ class MarketTest(WebMockTestCase):
         with self.subTest(before=True, after=True):
             m.process(["sell_all"], before=True, after=True)
 
-            process.assert_called_once_with("sell_all", steps="all")
+            process.assert_called_once_with("sell_all", options={"foo": "bar"}, steps="all")
             store_report.assert_called_once()
             log_error.assert_not_called()
 
@@ -1010,7 +1010,7 @@ class ProcessorTest(WebMockTestCase):
         with self.subTest("nominal case"):
             processor = market.Processor(self.m)
 
-            processor.process("sell_all", foo="bar")
+            processor.process("sell_all", options="bar")
             self.assertEqual(3, process_step.call_count)
 
             steps = list(map(lambda x: x[1][1]["name"], process_step.mock_calls))
@@ -1018,7 +1018,7 @@ class ProcessorTest(WebMockTestCase):
             kwargs = list(map(lambda x: x[1][2], process_step.mock_calls))
             self.assertEqual(["all_sell", "wait", "all_buy"], steps)
             self.assertEqual(["sell_all", "sell_all", "sell_all"], scenario_names)
-            self.assertEqual([{"foo":"bar"}, {"foo":"bar"}, {"foo":"bar"}], kwargs)
+            self.assertEqual(["bar", "bar", "bar"], kwargs)
 
             process_step.reset_mock()
 
@@ -1126,13 +1126,12 @@ class ProcessorTest(WebMockTestCase):
             method_mock = mock.Mock()
             method_arguments.return_value = [
                     method_mock,
-                    ["foo2", "foo", "foo3"]
+                    ["foo2", "foo"]
                     ]
-            self.m.options = { "foo3": "coucou"}
             method, args = processor.parse_args("action", {"foo": "bar", "foo2": "bar"}, {"foo": "bar2", "bla": "bla"})
 
             self.assertEqual(method_mock, method)
-            self.assertEqual({"foo": "bar2", "foo2": "bar", "foo3": "coucou"}, args)
+            self.assertEqual({"foo": "bar2", "foo2": "bar"}, args)
 
         with mock.patch.object(processor, "method_arguments") as method_arguments:
             method_mock = mock.Mock()