Skip to content

Commit e0820aa

Browse files
committed
fixup! [MIG] delivery_roulier: Migration to 17.0
1 parent 225eaa1 commit e0820aa

File tree

5 files changed

+17
-25
lines changed

5 files changed

+17
-25
lines changed

delivery_roulier/__manifest__.py

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"external_dependencies": {
2121
"python": [
2222
"roulier", # '>0.2.0'
23-
"odoo_test_helper",
2423
],
2524
},
2625
"installable": True,

delivery_roulier/models/delivery_carrier.py

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
22

3-
import logging
3+
from roulier import roulier
44

55
from odoo import models
66

7-
_logger = logging.getLogger(__name__)
8-
try:
9-
from roulier import roulier
10-
except ImportError:
11-
_logger.debug("Cannot `import roulier`.")
12-
137

148
class DeliveryCarrier(models.Model):
159
_inherit = "delivery.carrier"

delivery_roulier/tests/test_delivery_roulier.py

+14-16
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ class DeliveryRoulierCase(TransactionCase):
2727
@classmethod
2828
def setUpClass(cls):
2929
super().setUpClass()
30+
cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True))
3031
cls.loader = FakeModelLoader(cls.env, cls.__module__)
3132
cls.loader.backup_registry()
3233

@@ -35,32 +36,29 @@ def setUpClass(cls):
3536

3637
cls.loader.update_registry((FakeDeliveryCarrier,))
3738
cls.real_get_carriers_action_available = roulier.get_carriers_action_available
38-
39-
def setUp(self):
40-
super().setUp()
41-
delivery_product = self.env["product.product"].create(
39+
delivery_product = cls.env["product.product"].create(
4240
{"name": "test shipping product", "type": "service"}
4341
)
44-
self.account = self.env["carrier.account"].create(
42+
cls.account = cls.env["carrier.account"].create(
4543
{
4644
"name": "Test Carrier Account",
4745
"delivery_type": "test",
4846
"account": "test",
4947
"password": "test",
5048
}
5149
)
52-
self.test_carrier = self.env["delivery.carrier"].create(
50+
cls.test_carrier = cls.env["delivery.carrier"].create(
5351
{
5452
"name": "Test Carrier",
5553
"delivery_type": "test",
5654
"product_id": delivery_product.id,
57-
"carrier_account_id": self.account.id,
55+
"carrier_account_id": cls.account.id,
5856
}
5957
)
60-
partner = self.env["res.partner"].create(
58+
partner = cls.env["res.partner"].create(
6159
{
6260
"name": "Carrier label test customer",
63-
"country_id": self.env.ref("base.fr").id,
61+
"country_id": cls.env.ref("base.fr").id,
6462
"street": "test street",
6563
"street2": "test street2",
6664
"city": "test city",
@@ -69,27 +67,27 @@ def setUp(self):
6967
"zip": "00000",
7068
}
7169
)
72-
product = self.env["product.product"].create(
70+
product = cls.env["product.product"].create(
7371
{"name": "Carrier test product", "type": "product", "weight": 1.2}
7472
)
75-
self.order = self.env["sale.order"].create(
73+
cls.order = cls.env["sale.order"].create(
7674
{
77-
"carrier_id": self.test_carrier.id,
75+
"carrier_id": cls.test_carrier.id,
7876
"partner_id": partner.id,
7977
"order_line": [
8078
(0, 0, {"product_id": product.id, "product_uom_qty": 1})
8179
],
8280
}
8381
)
84-
self.env["stock.quant"].with_context(inventory_mode=True).create(
82+
cls.env["stock.quant"].with_context(inventory_mode=True).create(
8583
{
8684
"product_id": product.id,
87-
"location_id": self.order.warehouse_id.lot_stock_id.id,
85+
"location_id": cls.order.warehouse_id.lot_stock_id.id,
8886
"inventory_quantity": 1,
8987
}
9088
).action_apply_inventory()
91-
self.order.action_confirm()
92-
self.picking = self.order.picking_ids
89+
cls.order.action_confirm()
90+
cls.picking = cls.order.picking_ids
9391

9492
@classmethod
9593
def tearDownClass(cls):

requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
# generated from manifests external_dependencies
2-
odoo_test_helper
32
roulier

test-requirements.txt

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# delivery_roulier
2+
odoo_test_helper

0 commit comments

Comments
 (0)