8000 [FIX] point_of_sale: fix syntax error in `with` statements · odoo/odoo@107bd11 · GitHub
[go: up one dir, main page]
Skip to content

Commit 107bd11

Browse files
aj-fuentesaj-fuentes
committed
[FIX] point_of_sale: fix syntax error in with statements
Python3.7 and 3.8 do not support this syntax. See: python/peps#2244 Part-of: #150433
1 parent b5ea436 commit 107bd11

File tree

1 file changed

+18
-30
lines changed

1 file changed

+18
-30
lines changed

‎addons/point_of_sale/tests/test_pos_capture.py

Lines changed: 18 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,9 @@ def test_capture_one_order(self):
4949
orders = [self.create_ui_order_data([(self.product1, 1)])]
5050

5151
self.assert_activity_and_attachment(session, 0)
52-
with (
53-
patch.object(PosOrder, '_process_order', mocked_process_order),
54-
patch.object(PosSession, '_handle_order_process_fail', mocked_handle_order_process_fail),
55-
self.assertLogs('odoo.addons.point_of_sale.models.pos_order', level=logging.ERROR) as logger_error_output
56-
):
52+
with patch.object(PosOrder, '_process_order', mocked_process_order),\
53+
patch.object(PosSession, '_handle_order_process_fail', mocked_handle_order_process_fail),\
54+
self.assertLogs('odoo.addons.point_of_sale.models.pos_order', level=logging.ERROR) as logger_error_output:
5755
try:
5856
self.env['pos.order'].create_from_ui(orders)
5957
except IntendedException:
@@ -69,11 +67,9 @@ def test_capture_two_orders(self):
6967
order1 = [self.create_ui_order_data([(self.product1, 1)], uid='12345-678-1996')]
7068
order2 = [self.create_ui_order_data([(self.product1, 1)], uid='12345-678-1999')] # Different order with same content but different uuid
7169

72-
with (
73-
patch.object(PosOrder, '_process_order', mocked_process_order),
74-
patch.object(PosSession, '_handle_order_process_fail', mocked_handle_order_process_fail),
75-
self.assertLogs('odoo.addons.point_of_sale.models.pos_order', level=logging.ERROR)
76-
):
70+
with patch.object(PosOrder, '_process_order', mocked_process_order),\
71+
patch.object(PosSession, '_handle_order_process_fail', mocked_handle_order_process_fail),\
72+
self.assertLogs('odoo.addons.point_of_sale.models.pos_order', level=logging.ERROR):
7773
try:
7874
self.env['pos.order'].create_from_ui(order1)
7975
except IntendedException:
@@ -92,11 +88,9 @@ def test_capture_one_order_twice(self):
9288
orders = [self.create_ui_order_data([(self.product1, 1)])]
9389

9490
self.assert_activity_and_attachment(session, 0)
95-
with (
96-
patch.object(PosOrder, '_process_order', mocked_process_order),
97-
patch.object(PosSession, '_handle_order_process_fail', mocked_handle_order_process_fail),
98-
self.assertLogs('odoo.addons.point_of_sale.models.pos_order', level=logging.ERROR)
99-
):
91+
with patch.object(PosOrder, '_process_order', mocked_process_order),\
92+
patch.object(PosSession, '_handle_order_process_fail', mocked_handle_order_process_fail),\
93+
self.assertLogs('odoo.addons.point_of_sale.models.pos_order', level=logging.ERROR):
10094
for _ in range(2):
10195
try:
10296
self.env['pos.order'].create_from_ui(orders)
@@ -112,11 +106,9 @@ def test_capture_order_same_uuid(self):
112106
order2 = [self.create_ui_order_data([(self.product1, 2)], uid='12345-678-1996')]
113107

114108
self.assert_activity_and_attachment(session, 0)
115-
with (
116-
patch.object(PosOrder, '_process_order', mocked_process_order),
117-
patch.object(PosSession, '_handle_order_process_fail', mocked_handle_order_process_fail),
118-
self.assertLogs('odoo.addons.point_of_sale.models.pos_order', level=logging.ERROR)
119-
):
109+
with patch.object(PosOrder, '_process_order', mocked_process_order),\
110+
patch.object(PosSession, '_handle_order_process_fail', mocked_handle_order_process_fail),\
111+
self.assertLogs('odoo.addons.point_of_sale.models.pos_order', level=logging.ERROR):
120112
try:
121113
self.env['pos.order'].create_from_ui(order1)
122114
except IntendedException:
@@ -135,11 +127,9 @@ def test_capture_one_order_and_removed(self):
135127
orders = [self.create_ui_order_data([(self.product1, 1)])]
136128

137129
self.assert_activity_and_attachment(session, 0)
138-
with (
139-
patch.object(PosOrder, '_process_order', mocked_process_order),
140-
patch.object(PosSession, '_handle_order_process_fail', mocked_handle_order_process_fail),
141-
self.assertLogs('odoo.addons.point_of_sale.models.pos_order', level=logging.ERROR)
142-
):
130+
with patch.object(PosOrder, '_process_order', mocked_process_order),\
131+
patch.object(PosSession, '_handle_order_process_fail', mocked_handle_order_process_fail),\
132+
self.assertLogs('odoo.addons.point_of_sale.models.pos_order', level=logging.ERROR):
143133
try:
144134
self.env['pos.order'].create_from_ui(orders)
145135
except IntendedException:
@@ -159,11 +149,9 @@ def test_capture_two_orders_and_removed(self):
159149
order1 = [self.create_ui_order_data([(self.product1, 1)], uid='12345-678-1996')]
160150
order2 = [self.create_ui_order_data([(self.product1, 1)], uid='12345-678-1999')] # Different order with same content but different uuid
161151

162-
with (
163-
patch.object(PosOrder, '_process_order', mocked_process_order),
164-
patch.object(PosSession, '_handle_order_process_fail', mocked_handle_order_process_fail),
165-
self.assertLogs('odoo.addons.point_of_sale.models.pos_order', level=logging.ERROR)
166-
):
152+
with patch.object(PosOrder, '_process_order', mocked_process_order),\
153+
patch.object(PosSession, '_handle_order_process_fail', mocked_handle_order_process_fail),\
154+
self.assertLogs('odoo.addons.point_of_sale.models.pos_order', level=logging.ERROR):
167155
try:
168156
self.env['pos.order'].create_from_ui(order1)
169157
except IntendedException:

0 commit comments

Comments
 (0)
0