1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
|
Description: 'assertEquals' removed, replaced by 'assertEqual'
Origin: upstream 8c301083 + d7803cdd
Author: Dominik Wombacher
Forwarded: not-needed
--- a/tests/test_pagure_flask_api_project.py
+++ b/tests/test_pagure_flask_api_project.py
@@ -3482,7 +3482,7 @@ class PagureFlaskApiProjectModifyAclTest
tests.create_tokens_acl(self.session, "aaabbbcccddd", "modify_project")
project = pagure.lib.query._get_project(self.session, "test")
- self.assertEquals(
+ self.assertEqual(
project.access_users,
{"admin": [], "collaborator": [], "commit": [], "ticket": []},
)
@@ -3744,7 +3744,7 @@ class PagureFlaskApiProjectModifyAclTest
headers = {"Authorization": "token aaabbbcccddd"}
project = pagure.lib.query._get_project(self.session, "test")
- self.assertEquals(
+ self.assertEqual(
project.access_users,
{"admin": [], "collaborator": [], "commit": [], "ticket": []},
)
@@ -3793,7 +3793,7 @@ class PagureFlaskApiProjectModifyAclTest
# Ensure `foo` was properly added:
project = pagure.lib.query._get_project(self.session, "test")
user_foo = pagure.lib.query.search_user(self.session, username="foo")
- self.assertEquals(
+ self.assertEqual(
project.access_users,
{
"admin": [],
@@ -3875,7 +3875,7 @@ class PagureFlaskApiProjectModifyAclTest
# Ensure `foo` was properly removed
self.session = pagure.lib.query.create_session(self.dbpath)
project = pagure.lib.query._get_project(self.session, "test")
- self.assertEquals(
+ self.assertEqual(
project.access_users,
{"admin": [], "collaborator": [], "commit": [], "ticket": []},
)
@@ -3889,7 +3889,7 @@ class PagureFlaskApiProjectModifyAclTest
# Ensure `foo` was properly added:
project = pagure.lib.query._get_project(self.session, "test")
user_foo = pagure.lib.query.search_user(self.session, username="foo")
- self.assertEquals(
+ self.assertEqual(
project.access_users,
{
"admin": [],
@@ -3956,7 +3956,7 @@ class PagureFlaskApiProjectModifyAclTest
# Ensure `foo` was properly removed
self.session = pagure.lib.query.create_session(self.dbpath)
project = pagure.lib.query._get_project(self.session, "test")
- self.assertEquals(
+ self.assertEqual(
project.access_users,
{"admin": [], "collaborator": [], "commit": [], "ticket": []},
)
@@ -4037,15 +4037,15 @@ class PagureFlaskApiProjectModifyAclTest
# Ensure `baz` was properly added
self.session = pagure.lib.query.create_session(self.dbpath)
project = pagure.lib.query._get_project(self.session, "test")
- self.assertEquals(
+ self.assertEqual(
project.access_users,
{"admin": [], "collaborator": [], "commit": [], "ticket": []},
)
- self.assertNotEquals(
+ self.assertNotEqual(
project.access_groups,
{"admin": [], "collaborator": [], "commit": [], "ticket": []},
)
- self.assertEquals(len(project.access_groups["ticket"]), 1)
+ self.assertEqual(len(project.access_groups["ticket"]), 1)
# Remove the group from the project
data = {"user_type": "group", "name": "baz", "acl": None}
@@ -4104,11 +4104,11 @@ class PagureFlaskApiProjectModifyAclTest
# Ensure `baz` was properly removed
self.session = pagure.lib.query.create_session(self.dbpath)
project = pagure.lib.query._get_project(self.session, "test")
- self.assertEquals(
+ self.assertEqual(
project.access_users,
{"admin": [], "collaborator": [], "commit": [], "ticket": []},
)
- self.assertEquals(
+ self.assertEqual(
project.access_groups,
{"admin": [], "collaborator": [], "commit": [], "ticket": []},
)
@@ -4189,11 +4189,11 @@ class PagureFlaskApiProjectModifyAclTest
# Ensure `baz` was properly removed
self.session = pagure.lib.query.create_session(self.dbpath)
project = pagure.lib.query._get_project(self.session, "test")
- self.assertEquals(
+ self.assertEqual(
project.access_users,
{"admin": [], "collaborator": [], "commit": [], "ticket": []},
)
- self.assertEquals(
+ self.assertEqual(
project.access_groups,
{"admin": [], "collaborator": [], "commit": [], "ticket": []},
)
@@ -4212,7 +4212,7 @@ class PagureFlaskApiProjectOptionsTests(
tests.create_tokens_acl(self.session, "aaabbbcccddd", "modify_project")
project = pagure.lib.query._get_project(self.session, "test")
- self.assertEquals(
+ self.assertEqual(
project.access_users,
{"admin": [], "collaborator": [], "commit": [], "ticket": []},
)
--- a/tests/test_pagure_flask_ui_repo.py
+++ b/tests/test_pagure_flask_ui_repo.py
@@ -5450,8 +5450,8 @@ index 0000000..fb7093d
tests.add_readme_git_repo(os.path.join(self.path, "repos", "test.git"))
user = pagure.lib.query.search_user(self.session, username="pingou")
- self.assertEquals(len(user.emails), 2)
- self.assertEquals(user.default_email, "bar@pingou.com")
+ self.assertEqual(len(user.emails), 2)
+ self.assertEqual(user.default_email, "bar@pingou.com")
user = tests.FakeUser(username="pingou")
with tests.user_set(self.app.application, user):
--- a/tests/test_pagure_flask_ui_roadmap.py
+++ b/tests/test_pagure_flask_ui_roadmap.py
@@ -662,7 +662,7 @@ class PagureFlaskRoadmaptests(tests.Mode
output_text,
)
self.assertIn('<a class="notblue" href="/test/issue/2">', output_text)
- self.assertEquals(
+ self.assertEqual(
output_text.count('<a class="notblue" href="/test/issue/2">'), 1
)
--- a/tests/test_pagure_utils.py
+++ b/tests/test_pagure_utils.py
@@ -60,23 +60,23 @@ class PagureUtilsTests(tests.SimplePagur
""" Test lookup_deploykey with a non-deploykey username. """
project = pagure.lib.query._get_project(self.session, "test")
res = pagure.utils.lookup_deploykey(project, "pingou")
- self.assertEquals(res, None)
+ self.assertEqual(res, None)
def test_lookup_deploykey_different_project(self):
""" Test lookup_deploykey with a username for another project. """
project = pagure.lib.query._get_project(self.session, "test2")
res = pagure.utils.lookup_deploykey(project, "deploykey_test_1")
- self.assertEquals(res, None)
+ self.assertEqual(res, None)
def test_lookup_deploykey_non_existent_key(self):
""" Test lookup_deploykey with a non-existing deploykey. """
project = pagure.lib.query._get_project(self.session, "test")
res = pagure.utils.lookup_deploykey(project, "deploykey_test_2")
- self.assertEquals(res, None)
+ self.assertEqual(res, None)
def test_lookup_deploykey(self):
""" Test lookup_deploykey with a correct username. """
project = pagure.lib.query._get_project(self.session, "test")
res = pagure.utils.lookup_deploykey(project, "deploykey_test_1")
- self.assertNotEquals(res, None)
+ self.assertNotEqual(res, None)
self.assertFalse(res.pushaccess)
|
