aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lib/portage/tests/resolver/test_or_choices.py')
-rw-r--r--lib/portage/tests/resolver/test_or_choices.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/portage/tests/resolver/test_or_choices.py b/lib/portage/tests/resolver/test_or_choices.py
index f31a5ff22..5c6803784 100644
--- a/lib/portage/tests/resolver/test_or_choices.py
+++ b/lib/portage/tests/resolver/test_or_choices.py
@@ -667,12 +667,16 @@ class OrChoicesTestCase(TestCase):
# Test for bug 649622 (with www-client/w3m installed via
# xorg-server dependency), where virtual/w3m was pulled in
- # only to be removed by the next emerge --depclean.
+ # only to be removed by the next emerge --depclean. Note
+ # that graph_order must be deterministic in order to achieve
+ # deterministic results which are consistent between both
+ # update and removal (depclean) actions.
ResolverPlaygroundTestCase(
['@world'],
options = {'--update': True, '--deep': True},
success = True,
mergelist=['virtual/w3m-0'],
+ graph_order=['@world', '@system', '@selected', '@profile', '[nomerge]app-misc/neofetch-6.1.0', '[nomerge]mail-client/neomutt-20191207', '[nomerge]www-client/lynx-2.9.0_pre4', '[nomerge]x11-base/xorg-server-1.20.7', '[nomerge]app-text/xmlto-0.0.28-r1', '[nomerge]www-client/w3m-0.5.3_p20190105', 'virtual/w3m-0'],
),
)
@@ -702,12 +706,16 @@ class OrChoicesTestCase(TestCase):
# Test for bug 649622, where virtual/w3m is removed by
# emerge --depclean immediately after it's installed
# by a world update. Since virtual/w3m-0 is not removed
- # here, this case fails to reproduce bug 649622.
+ # here, this case fails to reproduce bug 649622. Note
+ # that graph_order must be deterministic in order to achieve
+ # deterministic results which are consistent between both
+ # update and removal (depclean) actions.
ResolverPlaygroundTestCase(
[],
options={'--depclean': True},
success=True,
cleanlist=[],
+ graph_order=['@world', '@system', '@selected', '@profile', '@____depclean_protected_set____', '[nomerge]app-misc/neofetch-6.1.0', '[nomerge]mail-client/neomutt-20191207', '[nomerge]www-client/lynx-2.9.0_pre4', '[nomerge]x11-base/xorg-server-1.20.7', '[nomerge]app-text/xmlto-0.0.28-r1', '[nomerge]www-client/w3m-0.5.3_p20190105', '[nomerge]virtual/w3m-0'],
),
)