]> git.immae.eu Git - perso/Immae/Projets/Cryptomonnaies/Cryptoportfolio/Trader.git/blobdiff - test.py
Merge branch 'dev'
[perso/Immae/Projets/Cryptomonnaies/Cryptoportfolio/Trader.git] / test.py
diff --git a/test.py b/test.py
index ea1fd9a72c17da48fd398d68504125e5b04bbed7..854e27b1089bf6f985778242a550eca9340a0c25 100644 (file)
--- a/test.py
+++ b/test.py
@@ -23,11 +23,12 @@ for test_type in limits:
 class WebMockTestCase(unittest.TestCase):
     import time
 
-    def market_args(self, debug=False, quiet=False):
-        return type('Args', (object,), { "debug": debug, "quiet": quiet })()
+    def market_args(self, debug=False, quiet=False, report_path=None, **kwargs):
+        return main.configargparse.Namespace(report_path=report_path,
+                debug=debug, quiet=quiet, **kwargs)
 
     def setUp(self):
-        super(WebMockTestCase, self).setUp()
+        super().setUp()
         self.wm = requests_mock.Mocker()
         self.wm.start()
 
@@ -55,12 +56,12 @@ class WebMockTestCase(unittest.TestCase):
         for patcher in self.patchers:
             patcher.stop()
         self.wm.stop()
-        super(WebMockTestCase, self).tearDown()
+        super().tearDown()
 
 @unittest.skipUnless("unit" in limits, "Unit skipped")
 class poloniexETest(unittest.TestCase):
     def setUp(self):
-        super(poloniexETest, self).setUp()
+        super().setUp()
         self.wm = requests_mock.Mocker()
         self.wm.start()
 
@@ -68,10 +69,11 @@ class poloniexETest(unittest.TestCase):
 
     def tearDown(self):
         self.wm.stop()
-        super(poloniexETest, self).tearDown()
+        super().tearDown()
 
     def test__init(self):
-        with mock.patch("market.ccxt.poloniexE.session") as session:
+        with self.subTest("Nominal case"), \
+                mock.patch("market.ccxt.poloniexE.session") as session:
             session.request.return_value = "response"
             ccxt = market.ccxt.poloniexE()
             ccxt._market = mock.Mock
@@ -82,6 +84,21 @@ class poloniexETest(unittest.TestCase):
             ccxt._market.report.log_http_request.assert_called_with('GET', 'URL', 'data',
                     'headers', 'response')
 
+        with self.subTest("Raising"),\
+                mock.patch("market.ccxt.poloniexE.session") as session:
+            session.request.side_effect = market.ccxt.RequestException("Boo")
+
+            ccxt = market.ccxt.poloniexE()
+            ccxt._market = mock.Mock
+            ccxt._market.report = mock.Mock()
+
+            with self.assertRaises(market.ccxt.RequestException, msg="Boo") as cm:
+                ccxt.session.request("GET", "URL", data="data",
+                        headers="headers")
+            ccxt._market.report.log_http_request.assert_called_with('GET', 'URL', 'data',
+                    'headers', cm.exception)
+
+
     def test_nanoseconds(self):
         with mock.patch.object(market.ccxt.time, "time") as time:
             time.return_value = 123456.7890123456
@@ -101,7 +118,7 @@ class poloniexETest(unittest.TestCase):
                     retry_call.assert_called_with(request,
                             delay=1, tries=10, fargs=["foo"],
                             fkwargs={'api': 'public', 'method': 'GET', 'params': {}, 'headers': None, 'body': None},
-                            exceptions=(market.ccxt.RequestTimeout,))
+                            exceptions=(market.ccxt.RequestTimeout, market.ccxt.InvalidNonce))
                     request.assert_not_called()
 
                 with self.subTest(desc="private GET"):
@@ -109,7 +126,7 @@ class poloniexETest(unittest.TestCase):
                     retry_call.assert_called_with(request,
                             delay=1, tries=10, fargs=["foo"],
                             fkwargs={'api': 'private', 'method': 'GET', 'params': {}, 'headers': None, 'body': None},
-                            exceptions=(market.ccxt.RequestTimeout,))
+                            exceptions=(market.ccxt.RequestTimeout, market.ccxt.InvalidNonce))
                     request.assert_not_called()
 
                 with self.subTest(desc="private POST regexp"):
@@ -117,7 +134,7 @@ class poloniexETest(unittest.TestCase):
                     retry_call.assert_called_with(request,
                             delay=1, tries=10, fargs=["returnFoo"],
                             fkwargs={'api': 'private', 'method': 'POST', 'params': {}, 'headers': None, 'body': None},
-                            exceptions=(market.ccxt.RequestTimeout,))
+                            exceptions=(market.ccxt.RequestTimeout, market.ccxt.InvalidNonce))
                     request.assert_not_called()
 
                 with self.subTest(desc="private POST non-regexp"):
@@ -125,7 +142,7 @@ class poloniexETest(unittest.TestCase):
                     retry_call.assert_called_with(request,
                             delay=1, tries=10, fargs=["getMarginPosition"],
                             fkwargs={'api': 'private', 'method': 'POST', 'params': {}, 'headers': None, 'body': None},
-                            exceptions=(market.ccxt.RequestTimeout,))
+                            exceptions=(market.ccxt.RequestTimeout, market.ccxt.InvalidNonce))
                     request.assert_not_called()
             retry_call.reset_mock()
             request.reset_mock()
@@ -609,7 +626,7 @@ class LockedVar(unittest.TestCase):
 @unittest.skipUnless("unit" in limits, "Unit skipped")
 class PortfolioTest(WebMockTestCase):
     def setUp(self):
-        super(PortfolioTest, self).setUp()
+        super().setUp()
 
         with open("test_samples/test_portfolio.json") as example:
             self.json_response = example.read()
@@ -1154,7 +1171,7 @@ class BalanceTest(WebMockTestCase):
 @unittest.skipUnless("unit" in limits, "Unit skipped")
 class MarketTest(WebMockTestCase):
     def setUp(self):
-        super(MarketTest, self).setUp()
+        super().setUp()
 
         self.ccxt = mock.Mock(spec=market.ccxt.poloniexE)
 
@@ -1181,9 +1198,12 @@ class MarketTest(WebMockTestCase):
             with self.subTest(quiet=False):
                 m = market.Market(self.ccxt, self.market_args(quiet=False))
                 report_store.assert_called_with(m, verbose_print=True)
+                report_store().log_market.assert_called_once()
+            report_store.reset_mock()
             with self.subTest(quiet=True):
                 m = market.Market(self.ccxt, self.market_args(quiet=True))
                 report_store.assert_called_with(m, verbose_print=False)
+                report_store().log_market.assert_called_once()
 
     @mock.patch("market.ccxt")
     def test_from_config(self, ccxt):
@@ -1403,6 +1423,38 @@ class MarketTest(WebMockTestCase):
                 else:
                     time_mock.assert_called_with(sleep)
 
+        with self.subTest("disappearing order"), \
+                mock.patch("market.ReportStore"):
+            all_orders.reset_mock()
+            m = market.Market(self.ccxt, self.market_args())
+
+            order_mock1 = mock.Mock()
+            order_mock2 = mock.Mock()
+            all_orders.side_effect = [
+                    [order_mock1, order_mock2],
+                    [order_mock1, order_mock2],
+
+                    [order_mock1, order_mock2],
+                    [order_mock1, order_mock2],
+
+                    []
+                    ]
+
+            order_mock1.get_status.side_effect = ["open", "closed"]
+            order_mock2.get_status.side_effect = ["open", "error_disappeared"]
+
+            order_mock1.trade = mock.Mock()
+            trade_mock = mock.Mock()
+            order_mock2.trade = trade_mock
+
+            trade_mock.tick_actions_recreate.return_value = "tick1"
+
+            m.follow_orders()
+
+            trade_mock.tick_actions_recreate.assert_called_once_with(2)
+            trade_mock.prepare_order.assert_called_once_with(compute_value="tick1")
+            m.report.log_error.assert_called_once_with("follow_orders", message=mock.ANY)
+
     @mock.patch.object(market.BalanceStore, "fetch_balances")
     def test_move_balance(self, fetch_balances):
         for debug in [True, False]:
@@ -1461,16 +1513,18 @@ class MarketTest(WebMockTestCase):
 
                 m.ccxt.transfer_balance.side_effect = [
                         market.ccxt.RequestTimeout,
+                        market.ccxt.InvalidNonce,
                         True
                         ]
                 m.move_balances()
                 self.ccxt.transfer_balance.assert_has_calls([
+                    mock.call("BTC", 3, "exchange", "margin"),
                     mock.call("BTC", 3, "exchange", "margin"),
                     mock.call("BTC", 3, "exchange", "margin")
                     ])
-                self.assertEqual(2, fetch_balances.call_count)
+                self.assertEqual(3, fetch_balances.call_count)
                 m.report.log_error.assert_called_with(mock.ANY, message="Retrying", exception=mock.ANY)
-                self.assertEqual(2, m.report.log_move_balances.call_count)
+                self.assertEqual(3, m.report.log_move_balances.call_count)
 
         self.ccxt.transfer_balance.reset_mock()
         m.report.reset_mock()
@@ -1579,7 +1633,8 @@ class MarketTest(WebMockTestCase):
 
     def test_store_file_report(self):
         file_open = mock.mock_open()
-        m = market.Market(self.ccxt, self.market_args(), report_path="present", user_id=1)
+        m = market.Market(self.ccxt,
+                self.market_args(report_path="present"), user_id=1)
         with self.subTest(file="present"),\
                 mock.patch("market.open", file_open),\
                 mock.patch.object(m, "report") as report,\
@@ -1596,7 +1651,7 @@ class MarketTest(WebMockTestCase):
             file_open().write.assert_any_call("Foo\nBar")
             m.report.to_json.assert_called_once_with()
 
-        m = market.Market(self.ccxt, self.market_args(), report_path="error", user_id=1)
+        m = market.Market(self.ccxt, self.market_args(report_path="error"), user_id=1)
         with self.subTest(file="error"),\
                 mock.patch("market.open") as file_open,\
                 mock.patch.object(m, "report") as report,\
@@ -1644,7 +1699,7 @@ class MarketTest(WebMockTestCase):
             self.assertEqual(stdout_mock.getvalue(), "impossible to store report to database: Exception; Bouh\n")
 
     def test_store_report(self):
-        m = market.Market(self.ccxt, self.market_args(), user_id=1)
+        m = market.Market(self.ccxt, self.market_args(report_db=False), user_id=1)
         with self.subTest(file=None, pg_config=None),\
                 mock.patch.object(m, "report") as report,\
                 mock.patch.object(m, "store_database_report") as db_report,\
@@ -1656,7 +1711,7 @@ class MarketTest(WebMockTestCase):
             db_report.assert_not_called()
 
         report.reset_mock()
-        m = market.Market(self.ccxt, self.market_args(), report_path="present", user_id=1)
+        m = market.Market(self.ccxt, self.market_args(report_db=False, report_path="present"), user_id=1)
         with self.subTest(file="present", pg_config=None),\
                 mock.patch.object(m, "report") as report,\
                 mock.patch.object(m, "store_file_report") as file_report,\
@@ -1672,7 +1727,23 @@ class MarketTest(WebMockTestCase):
             db_report.assert_not_called()
 
         report.reset_mock()
-        m = market.Market(self.ccxt, self.market_args(), pg_config="present", user_id=1)
+        m = market.Market(self.ccxt, self.market_args(report_db=True, report_path="present"), user_id=1)
+        with self.subTest(file="present", pg_config=None, report_db=True),\
+                mock.patch.object(m, "report") as report,\
+                mock.patch.object(m, "store_file_report") as file_report,\
+                mock.patch.object(m, "store_database_report") as db_report,\
+                mock.patch.object(market, "datetime") as time_mock:
+
+            time_mock.now.return_value = datetime.datetime(2018, 2, 25)
+
+            m.store_report()
+
+            report.merge.assert_called_with(store.Portfolio.report)
+            file_report.assert_called_once_with(datetime.datetime(2018, 2, 25))
+            db_report.assert_not_called()
+
+        report.reset_mock()
+        m = market.Market(self.ccxt, self.market_args(report_db=True), pg_config="present", user_id=1)
         with self.subTest(file=None, pg_config="present"),\
                 mock.patch.object(m, "report") as report,\
                 mock.patch.object(m, "store_file_report") as file_report,\
@@ -1688,8 +1759,8 @@ class MarketTest(WebMockTestCase):
             db_report.assert_called_once_with(datetime.datetime(2018, 2, 25))
 
         report.reset_mock()
-        m = market.Market(self.ccxt, self.market_args(),
-                pg_config="pg_config", report_path="present", user_id=1)
+        m = market.Market(self.ccxt, self.market_args(report_db=True, report_path="present"),
+                pg_config="pg_config", user_id=1)
         with self.subTest(file="present", pg_config="present"),\
                 mock.patch.object(m, "report") as report,\
                 mock.patch.object(m, "store_file_report") as file_report,\
@@ -2054,7 +2125,7 @@ class TradeStoreTest(WebMockTestCase):
 @unittest.skipUnless("unit" in limits, "Unit skipped")
 class BalanceStoreTest(WebMockTestCase):
     def setUp(self):
-        super(BalanceStoreTest, self).setUp()
+        super().setUp()
 
         self.fetch_balance = {
                 "ETC": {
@@ -2559,6 +2630,21 @@ class TradeTest(WebMockTestCase):
                     D("125"), "FOO", "long", self.m,
                     trade, close_if_possible=False)
 
+    def test_tick_actions_recreate(self):
+        value_from = portfolio.Amount("BTC", "0.5")
+        value_from.linked_to = portfolio.Amount("ETH", "10.0")
+        value_to = portfolio.Amount("BTC", "1.0")
+        trade = portfolio.Trade(value_from, value_to, "ETH", self.m)
+
+        self.assertEqual("average", trade.tick_actions_recreate(0))
+        self.assertEqual("foo", trade.tick_actions_recreate(0, default="foo"))
+        self.assertEqual("average", trade.tick_actions_recreate(1))
+        self.assertEqual(trade.tick_actions[2][1], trade.tick_actions_recreate(2))
+        self.assertEqual(trade.tick_actions[2][1], trade.tick_actions_recreate(3))
+        self.assertEqual(trade.tick_actions[5][1], trade.tick_actions_recreate(5))
+        self.assertEqual(trade.tick_actions[5][1], trade.tick_actions_recreate(6))
+        self.assertEqual("default", trade.tick_actions_recreate(7))
+        self.assertEqual("default", trade.tick_actions_recreate(8))
 
     @mock.patch.object(portfolio.Trade, "prepare_order")
     def test_update_order(self, prepare_order):
@@ -2961,12 +3047,12 @@ class OrderTest(WebMockTestCase):
         self.m.ccxt.privatePostReturnOrderTrades.return_value = [
                 {
                     "tradeID": 42, "type": "buy", "fee": "0.0015",
-                    "date": "2017-12-30 12:00:12", "rate": "0.1",
+                    "date": "2017-12-30 13:00:12", "rate": "0.1",
                     "amount": "3", "total": "0.3"
                     },
                 {
                     "tradeID": 43, "type": "buy", "fee": "0.0015",
-                    "date": "2017-12-30 13:00:12", "rate": "0.2",
+                    "date": "2017-12-30 12:00:12", "rate": "0.2",
                     "amount": "2", "total": "0.4"
                     }
             ]
@@ -2979,8 +3065,8 @@ class OrderTest(WebMockTestCase):
 
         self.m.ccxt.privatePostReturnOrderTrades.assert_called_with({"orderNumber": 12})
         self.assertEqual(2, len(order.mouvements))
-        self.assertEqual(42, order.mouvements[0].id)
-        self.assertEqual(43, order.mouvements[1].id)
+        self.assertEqual(43, order.mouvements[0].id)
+        self.assertEqual(42, order.mouvements[1].id)
 
         self.m.ccxt.privatePostReturnOrderTrades.side_effect = portfolio.ExchangeError
         order = portfolio.Order("buy", portfolio.Amount("ETH", 10),
@@ -3036,8 +3122,9 @@ class OrderTest(WebMockTestCase):
         self.m.report.log_debug_action.assert_called_once()
 
     @mock.patch.object(portfolio.Order, "fetch_mouvements")
+    @mock.patch.object(portfolio.Order, "mark_disappeared_order")
     @mock.patch.object(portfolio.Order, "mark_finished_order")
-    def test_fetch(self, mark_finished_order, fetch_mouvements):
+    def test_fetch(self, mark_finished_order, mark_disappeared_order, fetch_mouvements):
         order = portfolio.Order("buy", portfolio.Amount("ETH", 10),
                 D("0.1"), "BTC", "long", self.m, "trade")
         order.id = 45
@@ -3048,6 +3135,7 @@ class OrderTest(WebMockTestCase):
             self.m.report.log_debug_action.reset_mock()
             self.m.ccxt.fetch_order.assert_not_called()
             mark_finished_order.assert_not_called()
+            mark_disappeared_order.assert_not_called()
             fetch_mouvements.assert_not_called()
 
         with self.subTest(debug=False):
@@ -3065,6 +3153,7 @@ class OrderTest(WebMockTestCase):
             self.assertEqual(1, len(order.results))
             self.m.report.log_debug_action.assert_not_called()
             mark_finished_order.assert_called_once()
+            mark_disappeared_order.assert_called_once()
 
             mark_finished_order.reset_mock()
             with self.subTest(missing_order=True):
@@ -3075,6 +3164,88 @@ class OrderTest(WebMockTestCase):
                 self.assertEqual("closed_unknown", order.status)
                 mark_finished_order.assert_called_once()
 
+    def test_mark_disappeared_order(self):
+        with self.subTest("Open order"):
+            order = portfolio.Order("buy", portfolio.Amount("ETH", 10),
+                    D("0.1"), "BTC", "long", self.m, "trade")
+            order.id = 45
+            order.mouvements.append(portfolio.Mouvement("XRP", "BTC", {
+                "tradeID":21336541,
+                "currencyPair":"BTC_XRP",
+                "type":"sell",
+                "rate":"0.00007013",
+                "amount":"0.00000222",
+                "total":"0.00000000",
+                "fee":"0.00150000",
+                "date":"2018-04-02 00:09:13"
+                }))
+            order.mark_disappeared_order()
+            self.assertEqual("pending", order.status)
+
+        with self.subTest("Non-zero amount"):
+            order = portfolio.Order("buy", portfolio.Amount("ETH", 10),
+                    D("0.1"), "BTC", "long", self.m, "trade")
+            order.id = 45
+            order.status = "closed"
+            order.mouvements.append(portfolio.Mouvement("XRP", "BTC", {
+                "tradeID":21336541,
+                "currencyPair":"BTC_XRP",
+                "type":"sell",
+                "rate":"0.00007013",
+                "amount":"0.00000222",
+                "total":"0.00000010",
+                "fee":"0.00150000",
+                "date":"2018-04-02 00:09:13"
+                }))
+            order.mark_disappeared_order()
+            self.assertEqual("closed", order.status)
+
+        with self.subTest("Other mouvements"):
+            order = portfolio.Order("buy", portfolio.Amount("ETH", 10),
+                    D("0.1"), "BTC", "long", self.m, "trade")
+            order.id = 45
+            order.status = "closed"
+            order.mouvements.append(portfolio.Mouvement("XRP", "BTC", {
+                "tradeID":21336541,
+                "currencyPair":"BTC_XRP",
+                "type":"sell",
+                "rate":"0.00007013",
+                "amount":"0.00000222",
+                "total":"0.00000001",
+                "fee":"0.00150000",
+                "date":"2018-04-02 00:09:13"
+                }))
+            order.mouvements.append(portfolio.Mouvement("XRP", "BTC", {
+                "tradeID":21336541,
+                "currencyPair":"BTC_XRP",
+                "type":"sell",
+                "rate":"0.00007013",
+                "amount":"0.00000222",
+                "total":"0.00000000",
+                "fee":"0.00150000",
+                "date":"2018-04-02 00:09:13"
+                }))
+            order.mark_disappeared_order()
+            self.assertEqual("error_disappeared", order.status)
+
+        with self.subTest("Order disappeared"):
+            order = portfolio.Order("buy", portfolio.Amount("ETH", 10),
+                    D("0.1"), "BTC", "long", self.m, "trade")
+            order.id = 45
+            order.status = "closed"
+            order.mouvements.append(portfolio.Mouvement("XRP", "BTC", {
+                "tradeID":21336541,
+                "currencyPair":"BTC_XRP",
+                "type":"sell",
+                "rate":"0.00007013",
+                "amount":"0.00000222",
+                "total":"0.00000000",
+                "fee":"0.00150000",
+                "date":"2018-04-02 00:09:13"
+                }))
+            order.mark_disappeared_order()
+            self.assertEqual("error_disappeared", order.status)
+
     @mock.patch.object(portfolio.Order, "fetch")
     def test_get_status(self, fetch):
         with self.subTest(debug=True):
@@ -3213,6 +3384,549 @@ class OrderTest(WebMockTestCase):
             self.assertEqual(5, self.m.report.log_error.call_count)
             self.m.report.log_error.assert_called_with(mock.ANY, message="Giving up Order(buy long 0.00096060 ETH at 0.1 BTC [pending])", exception=mock.ANY)
 
+        self.m.reset_mock()
+        with self.subTest(invalid_nonce=True):
+            with self.subTest(retry_success=True):
+                order = portfolio.Order("buy", portfolio.Amount("ETH", "0.001"),
+                        D("0.1"), "BTC", "long", self.m, "trade")
+                self.m.ccxt.create_order.side_effect = [
+                        portfolio.InvalidNonce,
+                        portfolio.InvalidNonce,
+                        { "id": 123 },
+                        ]
+                order.run()
+                self.m.ccxt.create_order.assert_has_calls([
+                    mock.call('ETH/BTC', 'limit', 'buy', D('0.0010'), account='exchange', price=D('0.1')),
+                    mock.call('ETH/BTC', 'limit', 'buy', D('0.0010'), account='exchange', price=D('0.1')),
+                    mock.call('ETH/BTC', 'limit', 'buy', D('0.0010'), account='exchange', price=D('0.1')),
+                ])
+                self.assertEqual(3, self.m.ccxt.create_order.call_count)
+                self.assertEqual(3, order.tries)
+                self.m.report.log_error.assert_called()
+                self.assertEqual(2, self.m.report.log_error.call_count)
+                self.m.report.log_error.assert_called_with(mock.ANY, message="Retrying after invalid nonce", exception=mock.ANY)
+                self.assertEqual(123, order.id)
+
+            self.m.reset_mock()
+            with self.subTest(retry_success=False):
+                order = portfolio.Order("buy", portfolio.Amount("ETH", "0.001"),
+                        D("0.1"), "BTC", "long", self.m, "trade")
+                self.m.ccxt.create_order.side_effect = [
+                        portfolio.InvalidNonce,
+                        portfolio.InvalidNonce,
+                        portfolio.InvalidNonce,
+                        portfolio.InvalidNonce,
+                        portfolio.InvalidNonce,
+                        ]
+                order.run()
+                self.assertEqual(5, self.m.ccxt.create_order.call_count)
+                self.assertEqual(5, order.tries)
+                self.m.report.log_error.assert_called()
+                self.assertEqual(5, self.m.report.log_error.call_count)
+                self.m.report.log_error.assert_called_with(mock.ANY, message="Giving up Order(buy long 0.00100000 ETH at 0.1 BTC [pending]) after invalid nonce", exception=mock.ANY)
+                self.assertEqual("error", order.status)
+
+        self.m.reset_mock()
+        with self.subTest(request_timeout=True):
+            order = portfolio.Order("buy", portfolio.Amount("ETH", "0.001"),
+                    D("0.1"), "BTC", "long", self.m, "trade")
+            with self.subTest(retrieved=False), \
+                    mock.patch.object(order, "retrieve_order") as retrieve:
+                self.m.ccxt.create_order.side_effect = [
+                        portfolio.RequestTimeout,
+                        portfolio.RequestTimeout,
+                        { "id": 123 },
+                        ]
+                retrieve.return_value = False
+                order.run()
+                self.m.ccxt.create_order.assert_has_calls([
+                    mock.call('ETH/BTC', 'limit', 'buy', D('0.0010'), account='exchange', price=D('0.1')),
+                    mock.call('ETH/BTC', 'limit', 'buy', D('0.0010'), account='exchange', price=D('0.1')),
+                    mock.call('ETH/BTC', 'limit', 'buy', D('0.0010'), account='exchange', price=D('0.1')),
+                ])
+                self.assertEqual(3, self.m.ccxt.create_order.call_count)
+                self.assertEqual(3, order.tries)
+                self.m.report.log_error.assert_called()
+                self.assertEqual(2, self.m.report.log_error.call_count)
+                self.m.report.log_error.assert_called_with(mock.ANY, message="Retrying after timeout", exception=mock.ANY)
+                self.assertEqual(123, order.id)
+
+            self.m.reset_mock()
+            order = portfolio.Order("buy", portfolio.Amount("ETH", "0.001"),
+                    D("0.1"), "BTC", "long", self.m, "trade")
+            with self.subTest(retrieved=True), \
+                    mock.patch.object(order, "retrieve_order") as retrieve:
+                self.m.ccxt.create_order.side_effect = [
+                        portfolio.RequestTimeout,
+                        ]
+                def _retrieve():
+                    order.results.append({"id": 123})
+                    return True
+                retrieve.side_effect = _retrieve
+                order.run()
+                self.m.ccxt.create_order.assert_has_calls([
+                    mock.call('ETH/BTC', 'limit', 'buy', D('0.0010'), account='exchange', price=D('0.1')),
+                ])
+                self.assertEqual(1, self.m.ccxt.create_order.call_count)
+                self.assertEqual(1, order.tries)
+                self.m.report.log_error.assert_called()
+                self.assertEqual(1, self.m.report.log_error.call_count)
+                self.m.report.log_error.assert_called_with(mock.ANY, message="Timeout, found the order")
+                self.assertEqual(123, order.id)
+
+            self.m.reset_mock()
+            order = portfolio.Order("buy", portfolio.Amount("ETH", "0.001"),
+                    D("0.1"), "BTC", "long", self.m, "trade")
+            with self.subTest(retrieved=False), \
+                    mock.patch.object(order, "retrieve_order") as retrieve:
+                self.m.ccxt.create_order.side_effect = [
+                        portfolio.RequestTimeout,
+                        portfolio.RequestTimeout,
+                        portfolio.RequestTimeout,
+                        portfolio.RequestTimeout,
+                        portfolio.RequestTimeout,
+                        ]
+                retrieve.return_value = False
+                order.run()
+                self.m.ccxt.create_order.assert_has_calls([
+                    mock.call('ETH/BTC', 'limit', 'buy', D('0.0010'), account='exchange', price=D('0.1')),
+                    mock.call('ETH/BTC', 'limit', 'buy', D('0.0010'), account='exchange', price=D('0.1')),
+                    mock.call('ETH/BTC', 'limit', 'buy', D('0.0010'), account='exchange', price=D('0.1')),
+                    mock.call('ETH/BTC', 'limit', 'buy', D('0.0010'), account='exchange', price=D('0.1')),
+                    mock.call('ETH/BTC', 'limit', 'buy', D('0.0010'), account='exchange', price=D('0.1')),
+                ])
+                self.assertEqual(5, self.m.ccxt.create_order.call_count)
+                self.assertEqual(5, order.tries)
+                self.m.report.log_error.assert_called()
+                self.assertEqual(5, self.m.report.log_error.call_count)
+                self.m.report.log_error.assert_called_with(mock.ANY, message="Giving up Order(buy long 0.00100000 ETH at 0.1 BTC [pending]) after timeouts", exception=mock.ANY)
+                self.assertEqual("error", order.status)
+
+    def test_retrieve_order(self):
+        with self.subTest(similar_open_order=True):
+            order = portfolio.Order("buy", portfolio.Amount("ETH", "0.001"),
+                    D("0.1"), "BTC", "long", self.m, "trade")
+            order.start_date = datetime.datetime(2018, 3, 25, 15, 15, 55)
+
+            self.m.ccxt.order_precision.return_value = 8
+            self.m.ccxt.fetch_orders.return_value = [
+                    { # Wrong amount
+                        'amount': 0.002, 'cost': 0.1,
+                        'datetime': '2018-03-25T15:15:51.000Z',
+                        'fee': None, 'filled': 0.0,
+                        'id': '1',
+                        'info': {
+                            'amount': '0.002',
+                            'date': '2018-03-25 15:15:51',
+                            'margin': 0, 'orderNumber': '1',
+                            'price': '0.1', 'rate': '0.1',
+                            'side': 'buy', 'startingAmount': '0.002',
+                            'status': 'open', 'total': '0.0002',
+                            'type': 'limit'
+                            },
+                        'price': 0.1, 'remaining': 0.002, 'side': 'buy',
+                        'status': 'open', 'symbol': 'ETH/BTC',
+                        'timestamp': 1521990951000, 'trades': None,
+                        'type': 'limit'
+                        },
+                    { # Margin
+                        'amount': 0.001, 'cost': 0.1,
+                        'datetime': '2018-03-25T15:15:51.000Z',
+                        'fee': None, 'filled': 0.0,
+                        'id': '2',
+                        'info': {
+                            'amount': '0.001',
+                            'date': '2018-03-25 15:15:51',
+                            'margin': 1, 'orderNumber': '2',
+                            'price': '0.1', 'rate': '0.1',
+                            'side': 'buy', 'startingAmount': '0.001',
+                            'status': 'open', 'total': '0.0001',
+                            'type': 'limit'
+                            },
+                        'price': 0.1, 'remaining': 0.001, 'side': 'buy',
+                        'status': 'open', 'symbol': 'ETH/BTC',
+                        'timestamp': 1521990951000, 'trades': None,
+                        'type': 'limit'
+                        },
+                    { # selling
+                        'amount': 0.001, 'cost': 0.1,
+                        'datetime': '2018-03-25T15:15:51.000Z',
+                        'fee': None, 'filled': 0.0,
+                        'id': '3',
+                        'info': {
+                            'amount': '0.001',
+                            'date': '2018-03-25 15:15:51',
+                            'margin': 0, 'orderNumber': '3',
+                            'price': '0.1', 'rate': '0.1',
+                            'side': 'sell', 'startingAmount': '0.001',
+                            'status': 'open', 'total': '0.0001',
+                            'type': 'limit'
+                            },
+                        'price': 0.1, 'remaining': 0.001, 'side': 'sell',
+                        'status': 'open', 'symbol': 'ETH/BTC',
+                        'timestamp': 1521990951000, 'trades': None,
+                        'type': 'limit'
+                        },
+                    { # Wrong rate
+                        'amount': 0.001, 'cost': 0.15,
+                        'datetime': '2018-03-25T15:15:51.000Z',
+                        'fee': None, 'filled': 0.0,
+                        'id': '4',
+                        'info': {
+                            'amount': '0.001',
+                            'date': '2018-03-25 15:15:51',
+                            'margin': 0, 'orderNumber': '4',
+                            'price': '0.15', 'rate': '0.15',
+                            'side': 'buy', 'startingAmount': '0.001',
+                            'status': 'open', 'total': '0.0001',
+                            'type': 'limit'
+                            },
+                        'price': 0.15, 'remaining': 0.001, 'side': 'buy',
+                        'status': 'open', 'symbol': 'ETH/BTC',
+                        'timestamp': 1521990951000, 'trades': None,
+                        'type': 'limit'
+                        },
+                    { # All good
+                        'amount': 0.001, 'cost': 0.1,
+                        'datetime': '2018-03-25T15:15:51.000Z',
+                        'fee': None, 'filled': 0.0,
+                        'id': '5',
+                        'info': {
+                            'amount': '0.001',
+                            'date': '2018-03-25 15:15:51',
+                            'margin': 0, 'orderNumber': '1',
+                            'price': '0.1', 'rate': '0.1',
+                            'side': 'buy', 'startingAmount': '0.001',
+                            'status': 'open', 'total': '0.0001',
+                            'type': 'limit'
+                            },
+                        'price': 0.1, 'remaining': 0.001, 'side': 'buy',
+                        'status': 'open', 'symbol': 'ETH/BTC',
+                        'timestamp': 1521990951000, 'trades': None,
+                        'type': 'limit'
+                        }
+                    ]
+            result = order.retrieve_order()
+            self.assertTrue(result)
+            self.assertEqual('5', order.results[0]["id"])
+            self.m.ccxt.fetch_my_trades.assert_not_called()
+            self.m.ccxt.fetch_orders.assert_called_once_with(symbol="ETH/BTC", since=1521983750)
+
+        self.m.reset_mock()
+        with self.subTest(similar_open_order=False, past_trades=True):
+            order = portfolio.Order("buy", portfolio.Amount("ETH", "0.001"),
+                    D("0.1"), "BTC", "long", self.m, "trade")
+            order.start_date = datetime.datetime(2018, 3, 25, 15, 15, 55)
+
+            self.m.ccxt.order_precision.return_value = 8
+            self.m.ccxt.fetch_orders.return_value = []
+            self.m.ccxt.fetch_my_trades.return_value = [
+                    { # Wrong timestamp 1
+                        'amount': 0.0006,
+                        'cost': 0.00006,
+                        'datetime': '2018-03-25T15:15:14.000Z',
+                        'id': '1-1',
+                        'info': {
+                            'amount': '0.0006',
+                            'category': 'exchange',
+                            'date': '2018-03-25 15:15:14',
+                            'fee': '0.00150000',
+                            'globalTradeID': 1,
+                            'orderNumber': '1',
+                            'rate': '0.1',
+                            'total': '0.00006',
+                            'tradeID': '1-1',
+                            'type': 'buy'
+                            },
+                        'order': '1',
+                        'price': 0.1,
+                        'side': 'buy',
+                        'symbol': 'ETH/BTC',
+                        'timestamp': 1521983714,
+                        'type': 'limit'
+                        },
+                    { # Wrong timestamp 2
+                        'amount': 0.0004,
+                        'cost': 0.00004,
+                        'datetime': '2018-03-25T15:16:54.000Z',
+                        'id': '1-2',
+                        'info': {
+                            'amount': '0.0004',
+                            'category': 'exchange',
+                            'date': '2018-03-25 15:16:54',
+                            'fee': '0.00150000',
+                            'globalTradeID': 2,
+                            'orderNumber': '1',
+                            'rate': '0.1',
+                            'total': '0.00004',
+                            'tradeID': '1-2',
+                            'type': 'buy'
+                            },
+                        'order': '1',
+                        'price': 0.1,
+                        'side': 'buy',
+                        'symbol': 'ETH/BTC',
+                        'timestamp': 1521983814,
+                        'type': 'limit'
+                        },
+                    { # Wrong side 1
+                        'amount': 0.0006,
+                        'cost': 0.00006,
+                        'datetime': '2018-03-25T15:15:54.000Z',
+                        'id': '2-1',
+                        'info': {
+                            'amount': '0.0006',
+                            'category': 'exchange',
+                            'date': '2018-03-25 15:15:54',
+                            'fee': '0.00150000',
+                            'globalTradeID': 1,
+                            'orderNumber': '2',
+                            'rate': '0.1',
+                            'total': '0.00006',
+                            'tradeID': '2-1',
+                            'type': 'sell'
+                            },
+                        'order': '2',
+                        'price': 0.1,
+                        'side': 'sell',
+                        'symbol': 'ETH/BTC',
+                        'timestamp': 1521983754,
+                        'type': 'limit'
+                        },
+                    { # Wrong side 2
+                        'amount': 0.0004,
+                        'cost': 0.00004,
+                        'datetime': '2018-03-25T15:16:54.000Z',
+                        'id': '2-2',
+                        'info': {
+                            'amount': '0.0004',
+                            'category': 'exchange',
+                            'date': '2018-03-25 15:16:54',
+                            'fee': '0.00150000',
+                            'globalTradeID': 2,
+                            'orderNumber': '2',
+                            'rate': '0.1',
+                            'total': '0.00004',
+                            'tradeID': '2-2',
+                            'type': 'buy'
+                            },
+                        'order': '2',
+                        'price': 0.1,
+                        'side': 'buy',
+                        'symbol': 'ETH/BTC',
+                        'timestamp': 1521983814,
+                        'type': 'limit'
+                        },
+                    { # Margin trade 1
+                        'amount': 0.0006,
+                        'cost': 0.00006,
+                        'datetime': '2018-03-25T15:15:54.000Z',
+                        'id': '3-1',
+                        'info': {
+                            'amount': '0.0006',
+                            'category': 'marginTrade',
+                            'date': '2018-03-25 15:15:54',
+                            'fee': '0.00150000',
+                            'globalTradeID': 1,
+                            'orderNumber': '3',
+                            'rate': '0.1',
+                            'total': '0.00006',
+                            'tradeID': '3-1',
+                            'type': 'buy'
+                            },
+                        'order': '3',
+                        'price': 0.1,
+                        'side': 'buy',
+                        'symbol': 'ETH/BTC',
+                        'timestamp': 1521983754,
+                        'type': 'limit'
+                        },
+                    { # Margin trade 2
+                        'amount': 0.0004,
+                        'cost': 0.00004,
+                        'datetime': '2018-03-25T15:16:54.000Z',
+                        'id': '3-2',
+                        'info': {
+                            'amount': '0.0004',
+                            'category': 'marginTrade',
+                            'date': '2018-03-25 15:16:54',
+                            'fee': '0.00150000',
+                            'globalTradeID': 2,
+                            'orderNumber': '3',
+                            'rate': '0.1',
+                            'total': '0.00004',
+                            'tradeID': '3-2',
+                            'type': 'buy'
+                            },
+                        'order': '3',
+                        'price': 0.1,
+                        'side': 'buy',
+                        'symbol': 'ETH/BTC',
+                        'timestamp': 1521983814,
+                        'type': 'limit'
+                        },
+                    { # Wrong amount 1
+                        'amount': 0.0005,
+                        'cost': 0.00005,
+                        'datetime': '2018-03-25T15:15:54.000Z',
+                        'id': '4-1',
+                        'info': {
+                            'amount': '0.0005',
+                            'category': 'exchange',
+                            'date': '2018-03-25 15:15:54',
+                            'fee': '0.00150000',
+                            'globalTradeID': 1,
+                            'orderNumber': '4',
+                            'rate': '0.1',
+                            'total': '0.00005',
+                            'tradeID': '4-1',
+                            'type': 'buy'
+                            },
+                        'order': '4',
+                        'price': 0.1,
+                        'side': 'buy',
+                        'symbol': 'ETH/BTC',
+                        'timestamp': 1521983754,
+                        'type': 'limit'
+                        },
+                    { # Wrong amount 2
+                        'amount': 0.0004,
+                        'cost': 0.00004,
+                        'datetime': '2018-03-25T15:16:54.000Z',
+                        'id': '4-2',
+                        'info': {
+                            'amount': '0.0004',
+                            'category': 'exchange',
+                            'date': '2018-03-25 15:16:54',
+                            'fee': '0.00150000',
+                            'globalTradeID': 2,
+                            'orderNumber': '4',
+                            'rate': '0.1',
+                            'total': '0.00004',
+                            'tradeID': '4-2',
+                            'type': 'buy'
+                            },
+                        'order': '4',
+                        'price': 0.1,
+                        'side': 'buy',
+                        'symbol': 'ETH/BTC',
+                        'timestamp': 1521983814,
+                        'type': 'limit'
+                        },
+                    { # Wrong price 1
+                        'amount': 0.0006,
+                        'cost': 0.000066,
+                        'datetime': '2018-03-25T15:15:54.000Z',
+                        'id': '5-1',
+                        'info': {
+                            'amount': '0.0006',
+                            'category': 'exchange',
+                            'date': '2018-03-25 15:15:54',
+                            'fee': '0.00150000',
+                            'globalTradeID': 1,
+                            'orderNumber': '5',
+                            'rate': '0.11',
+                            'total': '0.000066',
+                            'tradeID': '5-1',
+                            'type': 'buy'
+                            },
+                        'order': '5',
+                        'price': 0.11,
+                        'side': 'buy',
+                        'symbol': 'ETH/BTC',
+                        'timestamp': 1521983754,
+                        'type': 'limit'
+                        },
+                    { # Wrong price 2
+                        'amount': 0.0004,
+                        'cost': 0.00004,
+                        'datetime': '2018-03-25T15:16:54.000Z',
+                        'id': '5-2',
+                        'info': {
+                            'amount': '0.0004',
+                            'category': 'exchange',
+                            'date': '2018-03-25 15:16:54',
+                            'fee': '0.00150000',
+                            'globalTradeID': 2,
+                            'orderNumber': '5',
+                            'rate': '0.1',
+                            'total': '0.00004',
+                            'tradeID': '5-2',
+                            'type': 'buy'
+                            },
+                        'order': '5',
+                        'price': 0.1,
+                        'side': 'buy',
+                        'symbol': 'ETH/BTC',
+                        'timestamp': 1521983814,
+                        'type': 'limit'
+                        },
+                    { # All good 1
+                        'amount': 0.0006,
+                        'cost': 0.00006,
+                        'datetime': '2018-03-25T15:15:54.000Z',
+                        'id': '7-1',
+                        'info': {
+                            'amount': '0.0006',
+                            'category': 'exchange',
+                            'date': '2018-03-25 15:15:54',
+                            'fee': '0.00150000',
+                            'globalTradeID': 1,
+                            'orderNumber': '7',
+                            'rate': '0.1',
+                            'total': '0.00006',
+                            'tradeID': '7-1',
+                            'type': 'buy'
+                            },
+                        'order': '7',
+                        'price': 0.1,
+                        'side': 'buy',
+                        'symbol': 'ETH/BTC',
+                        'timestamp': 1521983754,
+                        'type': 'limit'
+                        },
+                    { # All good 2
+                        'amount': 0.0004,
+                        'cost': 0.000036,
+                        'datetime': '2018-03-25T15:16:54.000Z',
+                        'id': '7-2',
+                        'info': {
+                            'amount': '0.0004',
+                            'category': 'exchange',
+                            'date': '2018-03-25 15:16:54',
+                            'fee': '0.00150000',
+                            'globalTradeID': 2,
+                            'orderNumber': '7',
+                            'rate': '0.09',
+                            'total': '0.000036',
+                            'tradeID': '7-2',
+                            'type': 'buy'
+                            },
+                        'order': '7',
+                        'price': 0.09,
+                        'side': 'buy',
+                        'symbol': 'ETH/BTC',
+                        'timestamp': 1521983814,
+                        'type': 'limit'
+                        },
+                    ]
+
+            result = order.retrieve_order()
+            self.assertTrue(result)
+            self.assertEqual('7', order.results[0]["id"])
+            self.m.ccxt.fetch_orders.assert_called_once_with(symbol="ETH/BTC", since=1521983750)
+
+        self.m.reset_mock()
+        with self.subTest(similar_open_order=False, past_trades=False):
+            order = portfolio.Order("buy", portfolio.Amount("ETH", "0.001"),
+                    D("0.1"), "BTC", "long", self.m, "trade")
+            order.start_date = datetime.datetime(2018, 3, 25, 15, 15, 55)
+
+            self.m.ccxt.order_precision.return_value = 8
+            self.m.ccxt.fetch_orders.return_value = []
+            self.m.ccxt.fetch_my_trades.return_value = []
+            result = order.retrieve_order()
+            self.assertFalse(result)
 
 @unittest.skipUnless("unit" in limits, "Unit skipped")
 class MouvementTest(WebMockTestCase):
@@ -3669,6 +4383,34 @@ class ReportStoreTest(WebMockTestCase):
             'response': 'Hey'
             })
 
+        add_log.reset_mock()
+        report_store.log_http_request("method", "url", "body",
+                "headers", ValueError("Foo"))
+        add_log.assert_called_once_with({
+            'type': 'http_request',
+            'method': 'method',
+            'url': 'url',
+            'body': 'body',
+            'headers': 'headers',
+            'status': -1,
+            'response': None,
+            'error': 'ValueError',
+            'error_message': 'Foo',
+            })
+
+    @mock.patch.object(market.ReportStore, "add_log")
+    def test_log_market(self, add_log):
+        report_store = market.ReportStore(self.m)
+
+        report_store.log_market(self.market_args(debug=True, quiet=False), 4, 1)
+        add_log.assert_called_once_with({
+            "type": "market",
+            "commit": "$Format:%H$",
+            "args": { "report_path": None, "debug": True, "quiet": False },
+            "user_id": 4,
+            "market_id": 1,
+            })
+
     @mock.patch.object(market.ReportStore, "print_log")
     @mock.patch.object(market.ReportStore, "add_log")
     def test_log_error(self, add_log, print_log):
@@ -3873,16 +4615,16 @@ class MainTest(WebMockTestCase):
             args_mock.after = "after"
             self.assertEqual("", stdout_mock.getvalue())
 
-            main.process("config", 3, 1, args_mock, "report_path", "pg_config")
+            main.process("config", 3, 1, args_mock, "pg_config")
 
             market_mock.from_config.assert_has_calls([
-                mock.call("config", args_mock, pg_config="pg_config", market_id=3, user_id=1, report_path="report_path"),
+                mock.call("config", args_mock, pg_config="pg_config", market_id=3, user_id=1),
                 mock.call().process("action", before="before", after="after"),
                 ])
 
             with self.subTest(exception=True):
                 market_mock.from_config.side_effect = Exception("boo")
-                main.process(3, "config", 1, "report_path", args_mock, "pg_config")
+                main.process(3, "config", 1, args_mock, "pg_config")
                 self.assertEqual("Exception: boo\n", stdout_mock.getvalue())
 
     def test_main(self):
@@ -3894,24 +4636,23 @@ class MainTest(WebMockTestCase):
 
                 args_mock = mock.Mock()
                 args_mock.parallel = False
-                args_mock.config = "config"
                 args_mock.user = "user"
                 parse_args.return_value = args_mock
 
-                parse_config.return_value = ["pg_config", "report_path"]
+                parse_config.return_value = "pg_config"
 
                 fetch_markets.return_value = [[3, "config1", 1], [1, "config2", 2]]
 
                 main.main(["Foo", "Bar"])
 
                 parse_args.assert_called_with(["Foo", "Bar"])
-                parse_config.assert_called_with("config")
+                parse_config.assert_called_with(args_mock)
                 fetch_markets.assert_called_with("pg_config", "user")
 
                 self.assertEqual(2, process.call_count)
                 process.assert_has_calls([
-                    mock.call("config1", 3, 1, args_mock, "report_path", "pg_config"),
-                    mock.call("config2", 1, 2, args_mock, "report_path", "pg_config"),
+                    mock.call("config1", 3, 1, args_mock, "pg_config"),
+                    mock.call("config2", 1, 2, args_mock, "pg_config"),
                     ])
         with self.subTest(parallel=True):
             with mock.patch("main.parse_args") as parse_args,\
@@ -3922,79 +4663,66 @@ class MainTest(WebMockTestCase):
 
                 args_mock = mock.Mock()
                 args_mock.parallel = True
-                args_mock.config = "config"
                 args_mock.user = "user"
                 parse_args.return_value = args_mock
 
-                parse_config.return_value = ["pg_config", "report_path"]
+                parse_config.return_value = "pg_config"
 
                 fetch_markets.return_value = [[3, "config1", 1], [1, "config2", 2]]
 
                 main.main(["Foo", "Bar"])
 
                 parse_args.assert_called_with(["Foo", "Bar"])
-                parse_config.assert_called_with("config")
+                parse_config.assert_called_with(args_mock)
                 fetch_markets.assert_called_with("pg_config", "user")
 
                 start.assert_called_once_with()
                 self.assertEqual(2, process.call_count)
                 process.assert_has_calls([
                     mock.call.__bool__(),
-                    mock.call("config1", 3, 1, args_mock, "report_path", "pg_config"),
+                    mock.call("config1", 3, 1, args_mock, "pg_config"),
                     mock.call.__bool__(),
-                    mock.call("config2", 1, 2, args_mock, "report_path", "pg_config"),
+                    mock.call("config2", 1, 2, args_mock, "pg_config"),
                     ])
 
     @mock.patch.object(main.sys, "exit")
-    @mock.patch("main.configparser")
     @mock.patch("main.os")
-    def test_parse_config(self, os, configparser, exit):
-        with self.subTest(pg_config=True, report_path=None):
-            config_mock = mock.MagicMock()
-            configparser.ConfigParser.return_value = config_mock
-            def config(element):
-                return element == "postgresql"
-
-            config_mock.__contains__.side_effect = config
-            config_mock.__getitem__.return_value = "pg_config"
-
-            result = main.parse_config("configfile")
-
-            config_mock.read.assert_called_with("configfile")
-
-            self.assertEqual(["pg_config", None], result)
-
-        with self.subTest(pg_config=True, report_path="present"):
-            config_mock = mock.MagicMock()
-            configparser.ConfigParser.return_value = config_mock
+    def test_parse_config(self, os, exit):
+        with self.subTest(report_path=None):
+            args = main.configargparse.Namespace(**{
+                "db_host": "host",
+                "db_port": "port",
+                "db_user": "user",
+                "db_password": "password",
+                "db_database": "database",
+                "report_path": None,
+                })
 
-            config_mock.__contains__.return_value = True
-            config_mock.__getitem__.side_effect = [
-                    {"report_path": "report_path"},
-                    {"report_path": "report_path"},
-                    "pg_config",
-                    ]
+            result = main.parse_config(args)
+            self.assertEqual({ "host": "host", "port": "port", "user":
+                "user", "password": "password", "database": "database"
+                }, result)
+            with self.assertRaises(AttributeError):
+                args.db_password
+
+        with self.subTest(report_path="present"):
+            args = main.configargparse.Namespace(**{
+                "db_host": "host",
+                "db_port": "port",
+                "db_user": "user",
+                "db_password": "password",
+                "db_database": "database",
+                "report_path": "report_path",
+                })
 
             os.path.exists.return_value = False
-            result = main.parse_config("configfile")
 
-            config_mock.read.assert_called_with("configfile")
-            self.assertEqual(["pg_config", "report_path"], result)
+            result = main.parse_config(args)
+
             os.path.exists.assert_called_once_with("report_path")
             os.makedirs.assert_called_once_with("report_path")
 
-        with self.subTest(pg_config=False),\
-                mock.patch('sys.stdout', new_callable=StringIO) as stdout_mock:
-            config_mock = mock.MagicMock()
-            configparser.ConfigParser.return_value = config_mock
-            result = main.parse_config("configfile")
-
-            config_mock.read.assert_called_with("configfile")
-            exit.assert_called_once_with(1)
-            self.assertEqual("no configuration for postgresql in config file\n", stdout_mock.getvalue())
-
-    @mock.patch.object(main.sys, "exit")
-    def test_parse_args(self, exit):
+    def test_parse_args(self):
         with self.subTest(config="config.ini"):
             args = main.parse_args([])
             self.assertEqual("config.ini", args.config)
@@ -4007,13 +4735,10 @@ class MainTest(WebMockTestCase):
             self.assertTrue(args.after)
             self.assertTrue(args.debug)
 
-            exit.assert_not_called()
-
-        with self.subTest(config="inexistant"),\
-                mock.patch('sys.stdout', new_callable=StringIO) as stdout_mock:
+        with self.subTest(config="inexistant"), \
+                self.assertRaises(SystemExit), \
+                mock.patch('sys.stderr', new_callable=StringIO) as stdout_mock:
             args = main.parse_args(["--config", "foo.bar"])
-            exit.assert_called_once_with(1)
-            self.assertEqual("no config file found, exiting\n", stdout_mock.getvalue())
 
     @mock.patch.object(main, "psycopg2")
     def test_fetch_markets(self, psycopg2):