Skip to content

Commit a6e2722

Browse files
author
Milan Topuzov
committed
tests: create users in tests; drop base.user_demo
- Add setUpClass user in test classes\n- Replace base.user_demo references\n- Remove test demo XML; revert manifest demo\n- Scope: tests only (no functional changes)
1 parent 4743a33 commit a6e2722

File tree

3 files changed

+86
-9
lines changed

3 files changed

+86
-9
lines changed

queue_job/tests/test_json_field.py

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,23 @@
1414

1515

1616
class TestJson(common.TransactionCase):
17+
@classmethod
18+
def setUpClass(cls):
19+
super().setUpClass()
20+
User = cls.env["res.users"]
21+
main_company = cls.env.ref("base.main_company")
22+
group_user = cls.env.ref("base.group_user")
23+
cls.demo_user = User.create(
24+
{
25+
"name": "Demo User (Queue)",
26+
"login": "queue_demo_user",
27+
"company_id": main_company.id,
28+
"company_ids": [(6, 0, [main_company.id])],
29+
"group_ids": [(6, 0, [group_user.id])],
30+
}
31+
)
1732
def test_encoder_recordset(self):
18-
demo_user = self.env.ref("base.user_demo")
33+
demo_user = self.demo_user
1934
context = demo_user.context_get()
2035
partner = self.env(user=demo_user, context=context).ref("base.main_partner")
2136
value = partner
@@ -33,7 +48,7 @@ def test_encoder_recordset(self):
3348
self.assertEqual(json.loads(value_json), expected)
3449

3550
def test_encoder_recordset_list(self):
36-
demo_user = self.env.ref("base.user_demo")
51+
demo_user = self.demo_user
3752
context = demo_user.context_get()
3853
partner = self.env(user=demo_user, context=context).ref("base.main_partner")
3954
value = ["a", 1, partner]
@@ -55,7 +70,7 @@ def test_encoder_recordset_list(self):
5570
self.assertEqual(json.loads(value_json), expected)
5671

5772
def test_decoder_recordset(self):
58-
demo_user = self.env.ref("base.user_demo")
73+
demo_user = self.demo_user
5974
context = demo_user.context_get()
6075
partner = self.env(user=demo_user).ref("base.main_partner")
6176

@@ -76,7 +91,7 @@ def test_decoder_recordset(self):
7691
self.assertEqual(demo_user, expected.env.user)
7792

7893
def test_decoder_recordset_list(self):
79-
demo_user = self.env.ref("base.user_demo")
94+
demo_user = self.demo_user
8095
context = demo_user.context_get()
8196
partner = self.env(user=demo_user).ref("base.main_partner")
8297
value_json = json.dumps(

test_queue_job/tests/test_job.py

Lines changed: 50 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,22 @@
3232
class TestJobsOnTestingMethod(JobCommonCase):
3333
"""Test Job"""
3434

35+
@classmethod
36+
def setUpClass(cls):
37+
super().setUpClass()
38+
User = cls.env["res.users"]
39+
main_company = cls.env.ref("base.main_company")
40+
group_user = cls.env.ref("base.group_user")
41+
cls.demo_user = User.create(
42+
{
43+
"name": "Demo User (Queue)",
44+
"login": "queue_demo_user_3",
45+
"company_id": main_company.id,
46+
"company_ids": [(6, 0, [main_company.id])],
47+
"group_ids": [(6, 0, [group_user.id])],
48+
}
49+
)
50+
3551
def test_new_job(self):
3652
"""
3753
Create a job
@@ -387,6 +403,22 @@ def test_job_identity_key_func_exact(self):
387403
class TestJobs(JobCommonCase):
388404
"""Test jobs on other methods or with different job configuration"""
389405

406+
@classmethod
407+
def setUpClass(cls):
408+
super().setUpClass()
409+
User = cls.env["res.users"]
410+
main_company = cls.env.ref("base.main_company")
411+
group_user = cls.env.ref("base.group_user")
412+
cls.demo_user = User.create(
413+
{
414+
"name": "Demo User (Queue)",
415+
"login": "queue_demo_user_4",
416+
"company_id": main_company.id,
417+
"company_ids": [(6, 0, [main_company.id])],
418+
"group_ids": [(6, 0, [group_user.id])],
419+
}
420+
)
421+
390422
def test_description(self):
391423
"""If no description is given to the job, it
392424
should be computed from the function
@@ -490,7 +522,7 @@ def test_job_with_mutable_arguments(self):
490522
self.assertEqual({"mutable_kwarg": {"a": 1}}, job_instance.kwargs)
491523

492524
def test_store_env_su_no_sudo(self):
493-
demo_user = self.env.ref("base.user_demo")
525+
demo_user = self.demo_user
494526
self.env = self.env(user=demo_user)
495527
delayable = self.env["test.queue.job"].with_delay()
496528
test_job = delayable.testing_method()
@@ -500,7 +532,7 @@ def test_store_env_su_no_sudo(self):
500532
self.assertTrue(job_instance.user_id, demo_user)
501533

502534
def test_store_env_su_sudo(self):
503-
demo_user = self.env.ref("base.user_demo")
535+
demo_user = self.demo_user
504536
self.env = self.env(user=demo_user)
505537
delayable = self.env["test.queue.job"].sudo().with_delay()
506538
test_job = delayable.testing_method()
@@ -511,6 +543,21 @@ def test_store_env_su_sudo(self):
511543

512544

513545
class TestJobModel(JobCommonCase):
546+
@classmethod
547+
def setUpClass(cls):
548+
super().setUpClass()
549+
User = cls.env["res.users"]
550+
main_company = cls.env.ref("base.main_company")
551+
group_user = cls.env.ref("base.group_user")
552+
cls.demo_user = User.create(
553+
{
554+
"name": "Demo User (Queue)",
555+
"login": "queue_demo_user_5",
556+
"company_id": main_company.id,
557+
"company_ids": [(6, 0, [main_company.id])],
558+
"group_ids": [(6, 0, [group_user.id])],
559+
}
560+
)
514561
def test_job_change_state(self):
515562
stored = self._create_job()
516563
stored._change_job_state(DONE, result="test")
@@ -639,7 +686,7 @@ def test_override_channel(self):
639686
self.assertEqual("root.sub.sub", test_job.channel)
640687

641688
def test_job_change_user_id(self):
642-
demo_user = self.env.ref("base.user_demo")
689+
demo_user = self.demo_user
643690
stored = self._create_job()
644691
stored.user_id = demo_user
645692
self.assertEqual(stored.records.env.uid, demo_user.id)

test_queue_job/tests/test_json_field.py

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,32 @@
1111

1212

1313
class TestJsonField(common.TransactionCase):
14+
@classmethod
15+
def setUpClass(cls):
16+
super().setUpClass()
17+
User = cls.env["res.users"]
18+
main_company = cls.env.ref("base.main_company")
19+
group_user = cls.env.ref("base.group_user")
20+
cls.demo_user = User.create(
21+
{
22+
"name": "Demo User (Queue)",
23+
"login": "queue_demo_user_2",
24+
"company_id": main_company.id,
25+
"company_ids": [(6, 0, [main_company.id])],
26+
"group_ids": [(6, 0, [group_user.id])],
27+
}
28+
)
1429
# TODO: when migrating to 16.0, adapt checks in queue_job/tests/test_json_field.py
1530
# to verify the context keys are encoded and remove these
1631
def test_encoder_recordset_store_context(self):
17-
demo_user = self.env.ref("base.user_demo")
32+
demo_user = self.demo_user
1833
user_context = {"lang": "en_US", "tz": "Europe/Brussels"}
1934
test_model = self.env(user=demo_user, context=user_context)["test.queue.job"]
2035
value_json = json.dumps(test_model, cls=JobEncoder)
2136
self.assertEqual(json.loads(value_json)["context"], user_context)
2237

2338
def test_encoder_recordset_context_filter_keys(self):
24-
demo_user = self.env.ref("base.user_demo")
39+
demo_user = self.demo_user
2540
user_context = {"lang": "en_US", "tz": "Europe/Brussels"}
2641
tampered_context = dict(user_context, foo=object())
2742
test_model = self.env(user=demo_user, context=tampered_context)[

0 commit comments

Comments
 (0)