[gentoo-portage-dev] [PATCH 07/68] lib/portage/tests/resolver/test_eapi.py: fix whitespace - gentoo-portage-dev

From:	Aaron Bauman <bman@g.o>
To:	gentoo-portage-dev@l.g.o
Cc:	Aaron Bauman <bman@g.o>
Subject:	[gentoo-portage-dev] [PATCH 07/68] lib/portage/tests/resolver/test_eapi.py: fix whitespace
Date:	Mon, 03 Aug 2020 22:44:04
Message-Id:	`20200803224327.1593726-7-bman@gentoo.org`
In Reply to:	[gentoo-portage-dev] [PATCH 01/68] lib/portage/util/_dyn_libs/PreservedLibsRegistry.py: fix whitespace by Aaron Bauman

1

Signed-off-by: Aaron Bauman <bman@g.o>

2

---

3

 lib/portage/tests/resolver/test_eapi.py | 80 ++++++++++++-------------

4

 1 file changed, 40 insertions(+), 40 deletions(-)

5

6

diff --git a/lib/portage/tests/resolver/test_eapi.py b/lib/portage/tests/resolver/test_eapi.py

7

index 50b9d90da..f8cf55b94 100644

8

--- a/lib/portage/tests/resolver/test_eapi.py

9

+++ b/lib/portage/tests/resolver/test_eapi.py

10

@@ -1,4 +1,4 @@

11

-# Copyright 2010-2018 Gentoo Foundation

12

+# Copyright 2010-2020 Gentoo Authors

13

 # Distributed under the terms of the GNU General Public License v2

14

15

 from portage.tests import TestCase

16

@@ -10,58 +10,58 @@ class EAPITestCase(TestCase):

17

18

 		ebuilds = {

19

 			#EAPI-1: IUSE-defaults

20

-			"dev-libs/A-1.0": { "EAPI": 0, "IUSE": "+foo" }, 

21

-			"dev-libs/A-1.1": { "EAPI": 1, "IUSE": "+foo" }, 

22

-			"dev-libs/A-1.2": { "EAPI": 2, "IUSE": "+foo" }, 

23

-			"dev-libs/A-1.3": { "EAPI": 3, "IUSE": "+foo" }, 

24

-			"dev-libs/A-1.4": { "EAPI": "4", "IUSE": "+foo" }, 

25

+			"dev-libs/A-1.0": { "EAPI": 0, "IUSE": "+foo" },

26

+			"dev-libs/A-1.1": { "EAPI": 1, "IUSE": "+foo" },

27

+			"dev-libs/A-1.2": { "EAPI": 2, "IUSE": "+foo" },

28

+			"dev-libs/A-1.3": { "EAPI": 3, "IUSE": "+foo" },

29

+			"dev-libs/A-1.4": { "EAPI": "4", "IUSE": "+foo" },

30

31

 			#EAPI-1: slot deps

32

-			"dev-libs/A-2.0": { "EAPI": 0, "DEPEND": "dev-libs/B:0" }, 

33

-			"dev-libs/A-2.1": { "EAPI": 1, "DEPEND": "dev-libs/B:0" }, 

34

-			"dev-libs/A-2.2": { "EAPI": 2, "DEPEND": "dev-libs/B:0" }, 

35

-			"dev-libs/A-2.3": { "EAPI": 3, "DEPEND": "dev-libs/B:0" }, 

36

-			"dev-libs/A-2.4": { "EAPI": "4", "DEPEND": "dev-libs/B:0" }, 

37

+			"dev-libs/A-2.0": { "EAPI": 0, "DEPEND": "dev-libs/B:0" },

38

+			"dev-libs/A-2.1": { "EAPI": 1, "DEPEND": "dev-libs/B:0" },

39

+			"dev-libs/A-2.2": { "EAPI": 2, "DEPEND": "dev-libs/B:0" },

40

+			"dev-libs/A-2.3": { "EAPI": 3, "DEPEND": "dev-libs/B:0" },

41

+			"dev-libs/A-2.4": { "EAPI": "4", "DEPEND": "dev-libs/B:0" },

42

43

 			#EAPI-2: use deps

44

-			"dev-libs/A-3.0": { "EAPI": 0, "DEPEND": "dev-libs/B[foo]" }, 

45

-			"dev-libs/A-3.1": { "EAPI": 1, "DEPEND": "dev-libs/B[foo]" }, 

46

-			"dev-libs/A-3.2": { "EAPI": 2, "DEPEND": "dev-libs/B[foo]" }, 

47

-			"dev-libs/A-3.3": { "EAPI": 3, "DEPEND": "dev-libs/B[foo]" }, 

48

-			"dev-libs/A-3.4": { "EAPI": "4", "DEPEND": "dev-libs/B[foo]" }, 

49

+			"dev-libs/A-3.0": { "EAPI": 0, "DEPEND": "dev-libs/B[foo]" },

50

+			"dev-libs/A-3.1": { "EAPI": 1, "DEPEND": "dev-libs/B[foo]" },

51

+			"dev-libs/A-3.2": { "EAPI": 2, "DEPEND": "dev-libs/B[foo]" },

52

+			"dev-libs/A-3.3": { "EAPI": 3, "DEPEND": "dev-libs/B[foo]" },

53

+			"dev-libs/A-3.4": { "EAPI": "4", "DEPEND": "dev-libs/B[foo]" },

54

55

 			#EAPI-2: strong blocks

56

-			"dev-libs/A-4.0": { "EAPI": 0, "DEPEND": "!!dev-libs/B" }, 

57

-			"dev-libs/A-4.1": { "EAPI": 1, "DEPEND": "!!dev-libs/B" }, 

58

-			"dev-libs/A-4.2": { "EAPI": 2, "DEPEND": "!!dev-libs/B" }, 

59

-			"dev-libs/A-4.3": { "EAPI": 3, "DEPEND": "!!dev-libs/B" }, 

60

-			"dev-libs/A-4.4": { "EAPI": "4", "DEPEND": "!!dev-libs/B" }, 

61

+			"dev-libs/A-4.0": { "EAPI": 0, "DEPEND": "!!dev-libs/B" },

62

+			"dev-libs/A-4.1": { "EAPI": 1, "DEPEND": "!!dev-libs/B" },

63

+			"dev-libs/A-4.2": { "EAPI": 2, "DEPEND": "!!dev-libs/B" },

64

+			"dev-libs/A-4.3": { "EAPI": 3, "DEPEND": "!!dev-libs/B" },

65

+			"dev-libs/A-4.4": { "EAPI": "4", "DEPEND": "!!dev-libs/B" },

66

67

 			#EAPI-4: slot operator deps

68

-			#~ "dev-libs/A-5.0": { "EAPI": 0, "DEPEND": "dev-libs/B:*" }, 

69

-			#~ "dev-libs/A-5.1": { "EAPI": 1, "DEPEND": "dev-libs/B:*" }, 

70

-			#~ "dev-libs/A-5.2": { "EAPI": 2, "DEPEND": "dev-libs/B:*" }, 

71

-			#~ "dev-libs/A-5.3": { "EAPI": 3, "DEPEND": "dev-libs/B:*" }, 

72

-			#~ "dev-libs/A-5.4": { "EAPI": "4", "DEPEND": "dev-libs/B:*" }, 

73

+			#~ "dev-libs/A-5.0": { "EAPI": 0, "DEPEND": "dev-libs/B:*" },

74

+			#~ "dev-libs/A-5.1": { "EAPI": 1, "DEPEND": "dev-libs/B:*" },

75

+			#~ "dev-libs/A-5.2": { "EAPI": 2, "DEPEND": "dev-libs/B:*" },

76

+			#~ "dev-libs/A-5.3": { "EAPI": 3, "DEPEND": "dev-libs/B:*" },

77

+			#~ "dev-libs/A-5.4": { "EAPI": "4", "DEPEND": "dev-libs/B:*" },

78

79

 			#EAPI-4: use dep defaults

80

-			"dev-libs/A-6.0": { "EAPI": 0, "DEPEND": "dev-libs/B[bar(+)]" }, 

81

-			"dev-libs/A-6.1": { "EAPI": 1, "DEPEND": "dev-libs/B[bar(+)]" }, 

82

-			"dev-libs/A-6.2": { "EAPI": 2, "DEPEND": "dev-libs/B[bar(+)]" }, 

83

-			"dev-libs/A-6.3": { "EAPI": 3, "DEPEND": "dev-libs/B[bar(+)]" }, 

84

-			"dev-libs/A-6.4": { "EAPI": "4", "DEPEND": "dev-libs/B[bar(+)]" }, 

85

-

86

+			"dev-libs/A-6.0": { "EAPI": 0, "DEPEND": "dev-libs/B[bar(+)]" },

87

+			"dev-libs/A-6.1": { "EAPI": 1, "DEPEND": "dev-libs/B[bar(+)]" },

88

+			"dev-libs/A-6.2": { "EAPI": 2, "DEPEND": "dev-libs/B[bar(+)]" },

89

+			"dev-libs/A-6.3": { "EAPI": 3, "DEPEND": "dev-libs/B[bar(+)]" },

90

+			"dev-libs/A-6.4": { "EAPI": "4", "DEPEND": "dev-libs/B[bar(+)]" },

91

+

92

 			#EAPI-4: REQUIRED_USE

93

-			"dev-libs/A-7.0": { "EAPI": 0, "IUSE": "foo bar", "REQUIRED_USE": "|| ( foo bar )" }, 

94

-			"dev-libs/A-7.1": { "EAPI": 1, "IUSE": "foo +bar", "REQUIRED_USE": "|| ( foo bar )" }, 

95

-			"dev-libs/A-7.2": { "EAPI": 2, "IUSE": "foo +bar", "REQUIRED_USE": "|| ( foo bar )" }, 

96

-			"dev-libs/A-7.3": { "EAPI": 3, "IUSE": "foo +bar", "REQUIRED_USE": "|| ( foo bar )" }, 

97

-			"dev-libs/A-7.4": { "EAPI": "4", "IUSE": "foo +bar", "REQUIRED_USE": "|| ( foo bar )" }, 

98

+			"dev-libs/A-7.0": { "EAPI": 0, "IUSE": "foo bar", "REQUIRED_USE": "|| ( foo bar )" },

99

+			"dev-libs/A-7.1": { "EAPI": 1, "IUSE": "foo +bar", "REQUIRED_USE": "|| ( foo bar )" },

100

+			"dev-libs/A-7.2": { "EAPI": 2, "IUSE": "foo +bar", "REQUIRED_USE": "|| ( foo bar )" },

101

+			"dev-libs/A-7.3": { "EAPI": 3, "IUSE": "foo +bar", "REQUIRED_USE": "|| ( foo bar )" },

102

+			"dev-libs/A-7.4": { "EAPI": "4", "IUSE": "foo +bar", "REQUIRED_USE": "|| ( foo bar )" },

103

104

-			"dev-libs/B-1": {"EAPI": 1, "IUSE": "+foo"}, 

105

+			"dev-libs/B-1": {"EAPI": 1, "IUSE": "+foo"},

106

107

 			#EAPI-7: implicit || ( ) no longer satisfies deps

108

-			"dev-libs/C-1": { "EAPI": "6", "IUSE": "foo", "RDEPEND": "|| ( foo? ( dev-libs/B ) )" }, 

109

+			"dev-libs/C-1": { "EAPI": "6", "IUSE": "foo", "RDEPEND": "|| ( foo? ( dev-libs/B ) )" },

110

 			"dev-libs/C-2": { "EAPI": "7", "IUSE": "foo", "RDEPEND": "|| ( foo? ( dev-libs/B ) )" },

111

}

112

113

@@ -102,7 +102,7 @@ class EAPITestCase(TestCase):

114

 			ResolverPlaygroundTestCase(["=dev-libs/A-6.2"], success = False),

115

 			ResolverPlaygroundTestCase(["=dev-libs/A-6.3"], success = False),

116

 			ResolverPlaygroundTestCase(["=dev-libs/A-6.4"], success = True, mergelist = ["dev-libs/B-1", "dev-libs/A-6.4"]),

117

-

118

+

119

 			ResolverPlaygroundTestCase(["=dev-libs/A-7.0"], success = False),

120

 			ResolverPlaygroundTestCase(["=dev-libs/A-7.1"], success = False),

121

 			ResolverPlaygroundTestCase(["=dev-libs/A-7.2"], success = False),

122

--

123

2.28.0

1	Signed-off-by: Aaron Bauman <bman@g.o>
2	---
3	lib/portage/tests/resolver/test_eapi.py \| 80 ++++++++++++-------------
4	1 file changed, 40 insertions(+), 40 deletions(-)
5
6	diff --git a/lib/portage/tests/resolver/test_eapi.py b/lib/portage/tests/resolver/test_eapi.py
7	index 50b9d90da..f8cf55b94 100644
8	--- a/lib/portage/tests/resolver/test_eapi.py
9	+++ b/lib/portage/tests/resolver/test_eapi.py
10	@@ -1,4 +1,4 @@
11	-# Copyright 2010-2018 Gentoo Foundation
12	+# Copyright 2010-2020 Gentoo Authors
13	# Distributed under the terms of the GNU General Public License v2
14
15	from portage.tests import TestCase
16	@@ -10,58 +10,58 @@ class EAPITestCase(TestCase):
17
18	ebuilds = {
19	#EAPI-1: IUSE-defaults
20	- "dev-libs/A-1.0": { "EAPI": 0, "IUSE": "+foo" },
21	- "dev-libs/A-1.1": { "EAPI": 1, "IUSE": "+foo" },
22	- "dev-libs/A-1.2": { "EAPI": 2, "IUSE": "+foo" },
23	- "dev-libs/A-1.3": { "EAPI": 3, "IUSE": "+foo" },
24	- "dev-libs/A-1.4": { "EAPI": "4", "IUSE": "+foo" },
25	+ "dev-libs/A-1.0": { "EAPI": 0, "IUSE": "+foo" },
26	+ "dev-libs/A-1.1": { "EAPI": 1, "IUSE": "+foo" },
27	+ "dev-libs/A-1.2": { "EAPI": 2, "IUSE": "+foo" },
28	+ "dev-libs/A-1.3": { "EAPI": 3, "IUSE": "+foo" },
29	+ "dev-libs/A-1.4": { "EAPI": "4", "IUSE": "+foo" },
30
31	#EAPI-1: slot deps
32	- "dev-libs/A-2.0": { "EAPI": 0, "DEPEND": "dev-libs/B:0" },
33	- "dev-libs/A-2.1": { "EAPI": 1, "DEPEND": "dev-libs/B:0" },
34	- "dev-libs/A-2.2": { "EAPI": 2, "DEPEND": "dev-libs/B:0" },
35	- "dev-libs/A-2.3": { "EAPI": 3, "DEPEND": "dev-libs/B:0" },
36	- "dev-libs/A-2.4": { "EAPI": "4", "DEPEND": "dev-libs/B:0" },
37	+ "dev-libs/A-2.0": { "EAPI": 0, "DEPEND": "dev-libs/B:0" },
38	+ "dev-libs/A-2.1": { "EAPI": 1, "DEPEND": "dev-libs/B:0" },
39	+ "dev-libs/A-2.2": { "EAPI": 2, "DEPEND": "dev-libs/B:0" },
40	+ "dev-libs/A-2.3": { "EAPI": 3, "DEPEND": "dev-libs/B:0" },
41	+ "dev-libs/A-2.4": { "EAPI": "4", "DEPEND": "dev-libs/B:0" },
42
43	#EAPI-2: use deps
44	- "dev-libs/A-3.0": { "EAPI": 0, "DEPEND": "dev-libs/B[foo]" },
45	- "dev-libs/A-3.1": { "EAPI": 1, "DEPEND": "dev-libs/B[foo]" },
46	- "dev-libs/A-3.2": { "EAPI": 2, "DEPEND": "dev-libs/B[foo]" },
47	- "dev-libs/A-3.3": { "EAPI": 3, "DEPEND": "dev-libs/B[foo]" },
48	- "dev-libs/A-3.4": { "EAPI": "4", "DEPEND": "dev-libs/B[foo]" },
49	+ "dev-libs/A-3.0": { "EAPI": 0, "DEPEND": "dev-libs/B[foo]" },
50	+ "dev-libs/A-3.1": { "EAPI": 1, "DEPEND": "dev-libs/B[foo]" },
51	+ "dev-libs/A-3.2": { "EAPI": 2, "DEPEND": "dev-libs/B[foo]" },
52	+ "dev-libs/A-3.3": { "EAPI": 3, "DEPEND": "dev-libs/B[foo]" },
53	+ "dev-libs/A-3.4": { "EAPI": "4", "DEPEND": "dev-libs/B[foo]" },
54
55	#EAPI-2: strong blocks
56	- "dev-libs/A-4.0": { "EAPI": 0, "DEPEND": "!!dev-libs/B" },
57	- "dev-libs/A-4.1": { "EAPI": 1, "DEPEND": "!!dev-libs/B" },
58	- "dev-libs/A-4.2": { "EAPI": 2, "DEPEND": "!!dev-libs/B" },
59	- "dev-libs/A-4.3": { "EAPI": 3, "DEPEND": "!!dev-libs/B" },
60	- "dev-libs/A-4.4": { "EAPI": "4", "DEPEND": "!!dev-libs/B" },
61	+ "dev-libs/A-4.0": { "EAPI": 0, "DEPEND": "!!dev-libs/B" },
62	+ "dev-libs/A-4.1": { "EAPI": 1, "DEPEND": "!!dev-libs/B" },
63	+ "dev-libs/A-4.2": { "EAPI": 2, "DEPEND": "!!dev-libs/B" },
64	+ "dev-libs/A-4.3": { "EAPI": 3, "DEPEND": "!!dev-libs/B" },
65	+ "dev-libs/A-4.4": { "EAPI": "4", "DEPEND": "!!dev-libs/B" },
66
67	#EAPI-4: slot operator deps
68	- #~ "dev-libs/A-5.0": { "EAPI": 0, "DEPEND": "dev-libs/B:*" },
69	- #~ "dev-libs/A-5.1": { "EAPI": 1, "DEPEND": "dev-libs/B:*" },
70	- #~ "dev-libs/A-5.2": { "EAPI": 2, "DEPEND": "dev-libs/B:*" },
71	- #~ "dev-libs/A-5.3": { "EAPI": 3, "DEPEND": "dev-libs/B:*" },
72	- #~ "dev-libs/A-5.4": { "EAPI": "4", "DEPEND": "dev-libs/B:*" },
73	+ #~ "dev-libs/A-5.0": { "EAPI": 0, "DEPEND": "dev-libs/B:*" },
74	+ #~ "dev-libs/A-5.1": { "EAPI": 1, "DEPEND": "dev-libs/B:*" },
75	+ #~ "dev-libs/A-5.2": { "EAPI": 2, "DEPEND": "dev-libs/B:*" },
76	+ #~ "dev-libs/A-5.3": { "EAPI": 3, "DEPEND": "dev-libs/B:*" },
77	+ #~ "dev-libs/A-5.4": { "EAPI": "4", "DEPEND": "dev-libs/B:*" },
78
79	#EAPI-4: use dep defaults
80	- "dev-libs/A-6.0": { "EAPI": 0, "DEPEND": "dev-libs/B[bar(+)]" },
81	- "dev-libs/A-6.1": { "EAPI": 1, "DEPEND": "dev-libs/B[bar(+)]" },
82	- "dev-libs/A-6.2": { "EAPI": 2, "DEPEND": "dev-libs/B[bar(+)]" },
83	- "dev-libs/A-6.3": { "EAPI": 3, "DEPEND": "dev-libs/B[bar(+)]" },
84	- "dev-libs/A-6.4": { "EAPI": "4", "DEPEND": "dev-libs/B[bar(+)]" },
85	-
86	+ "dev-libs/A-6.0": { "EAPI": 0, "DEPEND": "dev-libs/B[bar(+)]" },
87	+ "dev-libs/A-6.1": { "EAPI": 1, "DEPEND": "dev-libs/B[bar(+)]" },
88	+ "dev-libs/A-6.2": { "EAPI": 2, "DEPEND": "dev-libs/B[bar(+)]" },
89	+ "dev-libs/A-6.3": { "EAPI": 3, "DEPEND": "dev-libs/B[bar(+)]" },
90	+ "dev-libs/A-6.4": { "EAPI": "4", "DEPEND": "dev-libs/B[bar(+)]" },
91	+
92	#EAPI-4: REQUIRED_USE
93	- "dev-libs/A-7.0": { "EAPI": 0, "IUSE": "foo bar", "REQUIRED_USE": "\|\| ( foo bar )" },
94	- "dev-libs/A-7.1": { "EAPI": 1, "IUSE": "foo +bar", "REQUIRED_USE": "\|\| ( foo bar )" },
95	- "dev-libs/A-7.2": { "EAPI": 2, "IUSE": "foo +bar", "REQUIRED_USE": "\|\| ( foo bar )" },
96	- "dev-libs/A-7.3": { "EAPI": 3, "IUSE": "foo +bar", "REQUIRED_USE": "\|\| ( foo bar )" },
97	- "dev-libs/A-7.4": { "EAPI": "4", "IUSE": "foo +bar", "REQUIRED_USE": "\|\| ( foo bar )" },
98	+ "dev-libs/A-7.0": { "EAPI": 0, "IUSE": "foo bar", "REQUIRED_USE": "\|\| ( foo bar )" },
99	+ "dev-libs/A-7.1": { "EAPI": 1, "IUSE": "foo +bar", "REQUIRED_USE": "\|\| ( foo bar )" },
100	+ "dev-libs/A-7.2": { "EAPI": 2, "IUSE": "foo +bar", "REQUIRED_USE": "\|\| ( foo bar )" },
101	+ "dev-libs/A-7.3": { "EAPI": 3, "IUSE": "foo +bar", "REQUIRED_USE": "\|\| ( foo bar )" },
102	+ "dev-libs/A-7.4": { "EAPI": "4", "IUSE": "foo +bar", "REQUIRED_USE": "\|\| ( foo bar )" },
103
104	- "dev-libs/B-1": {"EAPI": 1, "IUSE": "+foo"},
105	+ "dev-libs/B-1": {"EAPI": 1, "IUSE": "+foo"},
106
107	#EAPI-7: implicit \|\| ( ) no longer satisfies deps
108	- "dev-libs/C-1": { "EAPI": "6", "IUSE": "foo", "RDEPEND": "\|\| ( foo? ( dev-libs/B ) )" },
109	+ "dev-libs/C-1": { "EAPI": "6", "IUSE": "foo", "RDEPEND": "\|\| ( foo? ( dev-libs/B ) )" },
110	"dev-libs/C-2": { "EAPI": "7", "IUSE": "foo", "RDEPEND": "\|\| ( foo? ( dev-libs/B ) )" },
111	}
112
113	@@ -102,7 +102,7 @@ class EAPITestCase(TestCase):
114	ResolverPlaygroundTestCase(["=dev-libs/A-6.2"], success = False),
115	ResolverPlaygroundTestCase(["=dev-libs/A-6.3"], success = False),
116	ResolverPlaygroundTestCase(["=dev-libs/A-6.4"], success = True, mergelist = ["dev-libs/B-1", "dev-libs/A-6.4"]),
117	-
118	+
119	ResolverPlaygroundTestCase(["=dev-libs/A-7.0"], success = False),
120	ResolverPlaygroundTestCase(["=dev-libs/A-7.1"], success = False),
121	ResolverPlaygroundTestCase(["=dev-libs/A-7.2"], success = False),
122	--
123	2.28.0

Gentoo Archives: gentoo-portage-dev