You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2022/11/09 21:38:20 UTC
[allura] 01/06: convert == and != True/False/None in assert stmts to is / is not
This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a commit to branch db/pep8_nov2022
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 7114ce63e3d0a8ec8e23f52ec5362e4deef2e5c6
Author: Dave Brondsema <db...@slashdotmedia.com>
AuthorDate: Wed Nov 9 16:10:42 2022 -0500
convert == and != True/False/None in assert stmts to is / is not
---
Allura/allura/tests/functional/test_admin.py | 16 +++---
Allura/allura/tests/functional/test_auth.py | 24 ++++-----
.../allura/tests/functional/test_neighborhood.py | 8 +--
Allura/allura/tests/functional/test_rest.py | 18 +++----
Allura/allura/tests/functional/test_site_admin.py | 60 +++++++++++-----------
.../allura/tests/functional/test_user_profile.py | 8 +--
Allura/allura/tests/model/test_project.py | 2 +-
Allura/allura/tests/model/test_repo.py | 22 ++++----
Allura/allura/tests/test_app.py | 2 +-
Allura/allura/tests/test_helpers.py | 14 ++---
Allura/allura/tests/test_multifactor.py | 6 +--
Allura/allura/tests/test_plugin.py | 16 +++---
Allura/allura/tests/test_tasks.py | 4 +-
Allura/allura/tests/test_utils.py | 2 +-
Allura/allura/tests/test_webhooks.py | 22 ++++----
.../test_discussion_moderation_controller.py | 2 +-
Allura/allura/tests/unit/spam/test_spam_filter.py | 2 +-
.../allura/tests/unit/test_ldap_auth_provider.py | 4 +-
Allura/allura/tests/unit/test_repo.py | 20 ++++----
Allura/allura/tests/unit/test_solr.py | 2 +-
.../forgeactivity/tests/functional/test_rest.py | 8 +--
ForgeBlog/forgeblog/tests/functional/test_rest.py | 8 +--
.../forgediscussion/tests/functional/test_rest.py | 10 ++--
.../forgefiles/tests/functional/test_root.py | 2 +-
.../forgegit/tests/functional/test_controllers.py | 30 +++++------
ForgeGit/forgegit/tests/model/test_repository.py | 14 ++---
.../forgeimporters/github/tests/test_wiki.py | 4 +-
.../tests/github/functional/test_github.py | 2 +-
ForgeLink/forgelink/tests/functional/test_rest.py | 10 ++--
ForgeLink/forgelink/tests/functional/test_root.py | 2 +-
.../forgesvn/tests/functional/test_controllers.py | 6 +--
ForgeSVN/forgesvn/tests/model/test_repository.py | 4 +-
.../forgetracker/tests/functional/test_rest.py | 12 ++---
.../forgetracker/tests/functional/test_root.py | 36 ++++++-------
ForgeTracker/forgetracker/tests/test_app.py | 2 +-
.../forgetracker/tests/unit/test_globals_model.py | 2 +-
.../forgetracker/tests/unit/test_ticket_model.py | 4 +-
ForgeWiki/forgewiki/tests/functional/test_rest.py | 12 ++---
ForgeWiki/forgewiki/tests/functional/test_root.py | 6 +--
39 files changed, 214 insertions(+), 214 deletions(-)
diff --git a/Allura/allura/tests/functional/test_admin.py b/Allura/allura/tests/functional/test_admin.py
index 11ac71129..c0a879c3f 100644
--- a/Allura/allura/tests/functional/test_admin.py
+++ b/Allura/allura/tests/functional/test_admin.py
@@ -1161,7 +1161,7 @@ class TestRestInstallTool(TestRestApiBase):
'tool': 'tickets'
}
r = self.api_post('/rest/p/test/admin/install_tool/', **data)
- assert r.json['success'] == False
+ assert r.json['success'] is False
assert r.json['info'] == 'All arguments required.'
def test_invalid_tool(self):
@@ -1175,7 +1175,7 @@ class TestRestInstallTool(TestRestApiBase):
'mount_label': 'tickets_label1'
}
r = self.api_post('/rest/p/test/admin/install_tool/', **data)
- assert r.json['success'] == False
+ assert r.json['success'] is False
assert (r.json['info'] ==
'Incorrect tool name, or limit is reached.')
@@ -1190,7 +1190,7 @@ class TestRestInstallTool(TestRestApiBase):
'mount_label': 'tickets_label1'
}
r = self.api_post('/rest/p/test/admin/install_tool/', **data)
- assert r.json['success'] == False
+ assert r.json['success'] is False
assert (r.json['info'] ==
'Mount point "tickets_mount1" is invalid')
@@ -1205,7 +1205,7 @@ class TestRestInstallTool(TestRestApiBase):
'mount_label': 'tickets_label1'
}
r = self.api_post('/rest/p/test/admin/install_tool/', **data)
- assert r.json['success'] == True
+ assert r.json['success'] is True
assert (r.json['info'] ==
'Tool %s with mount_point %s and mount_label %s was created.'
% ('tickets', 'ticketsmount1', 'tickets_label1'))
@@ -1233,7 +1233,7 @@ class TestRestInstallTool(TestRestApiBase):
with h.push_config(c, user=M.User.query.get()):
project.install_app('wiki', mount_point=data['mount_point'])
r = self.api_post('/rest/p/test/admin/install_tool/', **data)
- assert r.json['success'] == False
+ assert r.json['success'] is False
assert r.json['info'] == 'Mount point already exists.'
def test_tool_installation_limit(self):
@@ -1249,12 +1249,12 @@ class TestRestInstallTool(TestRestApiBase):
'mount_label': 'wiki_label'
}
r = self.api_post('/rest/p/test/admin/install_tool/', **data)
- assert r.json['success'] == True
+ assert r.json['success'] is True
data['mount_point'] = 'wikimount1'
data['mount_label'] = 'wiki_label1'
r = self.api_post('/rest/p/test/admin/install_tool/', **data)
- assert r.json['success'] == False
+ assert r.json['success'] is False
assert (r.json['info'] ==
'Incorrect tool name, or limit is reached.')
@@ -1314,7 +1314,7 @@ class TestRestInstallTool(TestRestApiBase):
]
for datum in data:
r = self.api_post('/rest/p/test/admin/install_tool/', **datum)
- assert r.json['success'] == True
+ assert r.json['success'] is True
assert (r.json['info'] ==
'Tool %s with mount_point %s and mount_label %s was created.'
% (datum['tool'], datum['mount_point'], datum['mount_label']))
diff --git a/Allura/allura/tests/functional/test_auth.py b/Allura/allura/tests/functional/test_auth.py
index c1030a3cb..5c459db65 100644
--- a/Allura/allura/tests/functional/test_auth.py
+++ b/Allura/allura/tests/functional/test_auth.py
@@ -244,9 +244,9 @@ class TestAuth(TestController):
def test_track_login(self):
user = M.User.by_username('test-user')
- assert user.last_access['login_date'] == None
- assert user.last_access['login_ip'] == None
- assert user.last_access['login_ua'] == None
+ assert user.last_access['login_date'] is None
+ assert user.last_access['login_ip'] is None
+ assert user.last_access['login_ua'] is None
self.app.get('/').follow() # establish session
self.app.post('/auth/do_login',
@@ -260,7 +260,7 @@ class TestAuth(TestController):
antispam=True,
)
user = M.User.by_username('test-user')
- assert user.last_access['login_date'] != None
+ assert user.last_access['login_date'] is not None
assert user.last_access['login_ip'] == '127.0.0.1'
assert user.last_access['login_ua'] == 'browser'
@@ -275,7 +275,7 @@ class TestAuth(TestController):
_session_id=self.app.cookies['_session_id'],
), antispam=True)
assert r.session['username'] == username
- assert r.session['login_expires'] == True
+ assert r.session['login_expires'] is True
for header, contents in r.headerlist:
if header == 'Set-cookie':
@@ -287,7 +287,7 @@ class TestAuth(TestController):
_session_id=self.app.cookies['_session_id'],
), antispam=True)
assert r.session['username'] == username
- assert r.session['login_expires'] != True
+ assert r.session['login_expires'] is not True
for header, contents in r.headerlist:
if header == 'Set-cookie':
@@ -724,7 +724,7 @@ class TestAuth(TestController):
assert 'test-admin@users.localhost' not in r
# preferred address has not changed if email is not verified
user = M.User.query.get(username='test-admin')
- assert user.get_pref('email_address') == None
+ assert user.get_pref('email_address') is None
with td.audits('Display Name changed Test Admin => Admin', user=True):
r = self.app.post('/auth/preferences/update',
@@ -2168,7 +2168,7 @@ class TestDisableAccount(TestController):
'_session_id': self.app.cookies['_session_id'], })
assert 'Invalid password' in r
user = M.User.by_username('test-admin')
- assert user.disabled == False
+ assert user.disabled is False
def test_disable(self):
self.app.get('/').follow() # establish session
@@ -2180,7 +2180,7 @@ class TestDisableAccount(TestController):
assert flash['status'] == 'ok'
assert flash['message'] == 'Your account was successfully disabled!'
user = M.User.by_username('test-admin')
- assert user.disabled == True
+ assert user.disabled is True
class TestPasswordExpire(TestController):
@@ -2584,7 +2584,7 @@ class TestTwoFactor(TestController):
# confirm first, no change
assert 'Password Confirmation' in r
user = M.User.query.get(username='test-admin')
- assert user.get_pref('multifactor') == True
+ assert user.get_pref('multifactor') is True
# confirm submit, everything goes off
r.form['password'] = 'foo'
@@ -2592,8 +2592,8 @@ class TestTwoFactor(TestController):
r = r.form.submit()
assert 'Multifactor authentication has now been disabled.' == json.loads(self.webflash(r))['message'], self.webflash(r)
user = M.User.query.get(username='test-admin')
- assert user.get_pref('multifactor') == False
- assert TotpService().get().get_secret_key(user) == None
+ assert user.get_pref('multifactor') is False
+ assert TotpService().get().get_secret_key(user) is None
assert RecoveryCodeService().get().get_codes(user) == []
# email confirmation
diff --git a/Allura/allura/tests/functional/test_neighborhood.py b/Allura/allura/tests/functional/test_neighborhood.py
index 636830de4..90ab50c10 100644
--- a/Allura/allura/tests/functional/test_neighborhood.py
+++ b/Allura/allura/tests/functional/test_neighborhood.py
@@ -993,8 +993,8 @@ class TestPhoneVerificationOnProjectRegistration(TestController):
assert r.json == expected
rid = r.session.get('phone_verification.request_id')
hash = r.session.get('phone_verification.number_hash')
- assert rid == None
- assert hash == None
+ assert rid is None
+ assert hash is None
@patch.object(g, 'phone_service', autospec=True)
def test_verify_phone(self, phone_service):
@@ -1057,7 +1057,7 @@ class TestPhoneVerificationOnProjectRegistration(TestController):
user = M.User.by_username('test-admin')
hash = user.get_tool_data('phone_verification', 'number_hash')
- assert hash == None
+ assert hash is None
@patch.object(g, 'phone_service', autospec=True)
def test_check_phone_verification_ok(self, phone_service):
@@ -1104,7 +1104,7 @@ class TestPhoneVerificationOnProjectRegistration(TestController):
extra_environ=dict(username='test-user'),
antispam=True)
overlay = r.html.find('div', {'id': 'phone_verification_overlay'})
- assert overlay != None
+ assert overlay is not None
header = overlay.find('h2')
iframe = overlay.find('iframe')
assert header.getText() == 'Phone Verification Required'
diff --git a/Allura/allura/tests/functional/test_rest.py b/Allura/allura/tests/functional/test_rest.py
index 265cfcd12..5ee8a45ff 100644
--- a/Allura/allura/tests/functional/test_rest.py
+++ b/Allura/allura/tests/functional/test_rest.py
@@ -225,12 +225,12 @@ class TestRestHome(TestRestApiBase):
'/rest/p/has_access?user=babadook&perm=read',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
r = self.api_get(
'/rest/p/has_access?user=test-admin&perm=jump',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
def test_neighborhood_has_access_not_admin(self):
"""
@@ -247,12 +247,12 @@ class TestRestHome(TestRestApiBase):
'/rest/p/has_access?user=root&perm=update',
user='root')
assert r.status_int == 200
- assert r.json['result'] == True
+ assert r.json['result'] is True
r = self.api_get(
'/rest/p/has_access?user=test-user&perm=update',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
def test_neighborhood(self):
self.api_get('/rest/p/', status=404)
@@ -279,12 +279,12 @@ class TestRestHome(TestRestApiBase):
'/rest/p/test/has_access?user=babadook&perm=read',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
r = self.api_get(
'/rest/p/test/has_access?user=test-admin&perm=jump',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
def test_project_has_access_not_admin(self):
"""
@@ -301,19 +301,19 @@ class TestRestHome(TestRestApiBase):
'/rest/p/test/has_access?user=test-admin&perm=update',
user='root')
assert r.status_int == 200
- assert r.json['result'] == True
+ assert r.json['result'] is True
r = self.api_get(
'/rest/p/test/has_access?user=test-user&perm=update',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
def test_subproject_has_access(self):
r = self.api_get(
'/rest/p/test/sub1/has_access?user=test-admin&perm=update',
user='root')
assert r.status_int == 200
- assert r.json['result'] == True
+ assert r.json['result'] is True
def test_unicode(self):
self.app.post(
diff --git a/Allura/allura/tests/functional/test_site_admin.py b/Allura/allura/tests/functional/test_site_admin.py
index f4cb04855..cc5797890 100644
--- a/Allura/allura/tests/functional/test_site_admin.py
+++ b/Allura/allura/tests/functional/test_site_admin.py
@@ -514,8 +514,8 @@ class TestUserDetails(TestController):
def test_disable_user(self):
# user was not pending
- assert M.User.by_username('test-user-3').disabled == False
- assert M.User.by_username('test-user-3').pending == False
+ assert M.User.by_username('test-user-3').disabled is False
+ assert M.User.by_username('test-user-3').pending is False
r = self.app.get('/nf/admin/user/test-user-3')
form = r.forms[0]
assert form['username'].value == 'test-user-3'
@@ -525,16 +525,16 @@ class TestUserDetails(TestController):
r = form.submit()
assert M.AuditLog.query.find().count() == 1
assert 'User disabled' in self.webflash(r)
- assert M.User.by_username('test-user-3').disabled == True
- assert M.User.by_username('test-user-3').pending == False
+ assert M.User.by_username('test-user-3').disabled is True
+ assert M.User.by_username('test-user-3').pending is False
# user was pending
user = M.User.by_username('test-user-3')
user.disabled = False
user.pending = True
ThreadLocalORMSession.flush_all()
- assert M.User.by_username('test-user-3').disabled == False
- assert M.User.by_username('test-user-3').pending == True
+ assert M.User.by_username('test-user-3').disabled is False
+ assert M.User.by_username('test-user-3').pending is True
r = self.app.get('/nf/admin/user/test-user-3')
form = r.forms[0]
assert form['username'].value == 'test-user-3'
@@ -544,16 +544,16 @@ class TestUserDetails(TestController):
r = form.submit()
assert M.AuditLog.query.find().count() == 1
assert 'User disabled' in self.webflash(r)
- assert M.User.by_username('test-user-3').disabled == True
- assert M.User.by_username('test-user-3').pending == True
+ assert M.User.by_username('test-user-3').disabled is True
+ assert M.User.by_username('test-user-3').pending is True
def test_enable_user(self):
# user was not pending
user = M.User.by_username('test-user-3')
user.disabled = True
ThreadLocalORMSession.flush_all()
- assert M.User.by_username('test-user-3').disabled == True
- assert M.User.by_username('test-user-3').pending == False
+ assert M.User.by_username('test-user-3').disabled is True
+ assert M.User.by_username('test-user-3').pending is False
r = self.app.get('/nf/admin/user/test-user-3')
form = r.forms[0]
assert form['username'].value == 'test-user-3'
@@ -563,16 +563,16 @@ class TestUserDetails(TestController):
r = form.submit()
assert M.AuditLog.query.find().count() == 1
assert 'User enabled' in self.webflash(r)
- assert M.User.by_username('test-user-3').disabled == False
- assert M.User.by_username('test-user-3').pending == False
+ assert M.User.by_username('test-user-3').disabled is False
+ assert M.User.by_username('test-user-3').pending is False
# user was pending
user = M.User.by_username('test-user-3')
user.disabled = False
user.pending = True
ThreadLocalORMSession.flush_all()
- assert M.User.by_username('test-user-3').disabled == False
- assert M.User.by_username('test-user-3').pending == True
+ assert M.User.by_username('test-user-3').disabled is False
+ assert M.User.by_username('test-user-3').pending is True
r = self.app.get('/nf/admin/user/test-user-3')
form = r.forms[0]
assert form['username'].value == 'test-user-3'
@@ -582,16 +582,16 @@ class TestUserDetails(TestController):
r = form.submit()
assert M.AuditLog.query.find().count() == 1
assert 'User enabled' in self.webflash(r)
- assert M.User.by_username('test-user-3').disabled == False
- assert M.User.by_username('test-user-3').pending == False
+ assert M.User.by_username('test-user-3').disabled is False
+ assert M.User.by_username('test-user-3').pending is False
# user was pending and disabled
user = M.User.by_username('test-user-3')
user.disabled = True
user.pending = True
ThreadLocalORMSession.flush_all()
- assert M.User.by_username('test-user-3').disabled == True
- assert M.User.by_username('test-user-3').pending == True
+ assert M.User.by_username('test-user-3').disabled is True
+ assert M.User.by_username('test-user-3').pending is True
r = self.app.get('/nf/admin/user/test-user-3')
form = r.forms[0]
assert form['username'].value == 'test-user-3'
@@ -601,16 +601,16 @@ class TestUserDetails(TestController):
r = form.submit()
assert M.AuditLog.query.find().count() == 1
assert 'User enabled' in self.webflash(r)
- assert M.User.by_username('test-user-3').disabled == False
- assert M.User.by_username('test-user-3').pending == False
+ assert M.User.by_username('test-user-3').disabled is False
+ assert M.User.by_username('test-user-3').pending is False
def test_set_pending(self):
# user was disabled
user = M.User.by_username('test-user-3')
user.disabled = True
ThreadLocalORMSession.flush_all()
- assert M.User.by_username('test-user-3').disabled == True
- assert M.User.by_username('test-user-3').pending == False
+ assert M.User.by_username('test-user-3').disabled is True
+ assert M.User.by_username('test-user-3').pending is False
r = self.app.get('/nf/admin/user/test-user-3')
form = r.forms[0]
assert form['username'].value == 'test-user-3'
@@ -620,16 +620,16 @@ class TestUserDetails(TestController):
r = form.submit()
assert M.AuditLog.query.find().count() == 1
assert 'Set user status to pending' in self.webflash(r)
- assert M.User.by_username('test-user-3').disabled == False
- assert M.User.by_username('test-user-3').pending == True
+ assert M.User.by_username('test-user-3').disabled is False
+ assert M.User.by_username('test-user-3').pending is True
# user was enabled
user = M.User.by_username('test-user-3')
user.pending = False
user.disabled = False
ThreadLocalORMSession.flush_all()
- assert M.User.by_username('test-user-3').disabled == False
- assert M.User.by_username('test-user-3').pending == False
+ assert M.User.by_username('test-user-3').disabled is False
+ assert M.User.by_username('test-user-3').pending is False
r = self.app.get('/nf/admin/user/test-user-3')
form = r.forms[0]
assert form['username'].value == 'test-user-3'
@@ -639,8 +639,8 @@ class TestUserDetails(TestController):
r = form.submit()
assert M.AuditLog.query.find().count() == 1
assert 'Set user status to pending' in self.webflash(r)
- assert M.User.by_username('test-user-3').disabled == False
- assert M.User.by_username('test-user-3').pending == True
+ assert M.User.by_username('test-user-3').disabled is False
+ assert M.User.by_username('test-user-3').pending is True
def test_emails(self):
# add test@example.com
@@ -654,7 +654,7 @@ class TestUserDetails(TestController):
r = self.app.get('/nf/admin/user/test-user')
assert 'test@example.com' in r
em = M.EmailAddress.get(email='test@example.com')
- assert em.confirmed == True
+ assert em.confirmed is True
user = M.User.query.get(username='test-user')
assert user.get_pref('email_address') == 'test@example.com'
@@ -669,7 +669,7 @@ class TestUserDetails(TestController):
r = self.app.get('/nf/admin/user/test-user')
assert 'test2@example.com' in r
em = M.EmailAddress.get(email='test2@example.com')
- assert em.confirmed == True
+ assert em.confirmed is True
user = M.User.query.get(username='test-user')
assert user.get_pref('email_address') == 'test@example.com'
diff --git a/Allura/allura/tests/functional/test_user_profile.py b/Allura/allura/tests/functional/test_user_profile.py
index 0b93bdd42..bfa920a81 100644
--- a/Allura/allura/tests/functional/test_user_profile.py
+++ b/Allura/allura/tests/functional/test_user_profile.py
@@ -291,12 +291,12 @@ class TestUserProfileHasAccessAPI(TestRestApiBase):
'/rest/u/test-admin/profile/has_access?user=babadook&perm=read',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
r = self.api_get(
'/rest/u/test-admin/profile/has_access?user=test-user&perm=jump',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
@td.with_user_project('test-admin')
def test_has_access_not_admin(self):
@@ -315,9 +315,9 @@ class TestUserProfileHasAccessAPI(TestRestApiBase):
'/rest/u/test-admin/profile/has_access?user=test-admin&perm=admin',
user='root')
assert r.status_int == 200
- assert r.json['result'] == True
+ assert r.json['result'] is True
r = self.api_get(
'/rest/u/test-admin/profile/has_access?user=test-user&perm=admin',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
diff --git a/Allura/allura/tests/model/test_project.py b/Allura/allura/tests/model/test_project.py
index c4daf9474..48297a6e8 100644
--- a/Allura/allura/tests/model/test_project.py
+++ b/Allura/allura/tests/model/test_project.py
@@ -101,7 +101,7 @@ class TestProjectModel:
for v in [None, '', 'bad@email']:
with td.raises(ToolError):
c.project.install_app('Tickets', 'test-tickets', **{name: v})
- assert c.project.app_instance('test-tickets') == None
+ assert c.project.app_instance('test-tickets') is None
c.project.install_app('Tickets', 'test-tickets', **{name: 'e@e.com'})
app = c.project.app_instance('test-tickets')
assert app.config.options[name] == 'e@e.com'
diff --git a/Allura/allura/tests/model/test_repo.py b/Allura/allura/tests/model/test_repo.py
index 9b89a6805..85fa9b9fb 100644
--- a/Allura/allura/tests/model/test_repo.py
+++ b/Allura/allura/tests/model/test_repo.py
@@ -707,13 +707,13 @@ class TestMergeRequest:
def test_get_can_merge_cache(self):
key = self.mr.can_merge_cache_key()
- assert self.mr.get_can_merge_cache() == None
+ assert self.mr.get_can_merge_cache() is None
self.mr.can_merge_cache[key] = True
- assert self.mr.get_can_merge_cache() == True
+ assert self.mr.get_can_merge_cache() is True
self.mr.can_merge_cache_key = lambda: '123-123'
self.mr.can_merge_cache['123-123'] = False
- assert self.mr.get_can_merge_cache() == False
+ assert self.mr.get_can_merge_cache() is False
def test_set_can_merge_cache(self):
key = self.mr.can_merge_cache_key()
@@ -727,7 +727,7 @@ class TestMergeRequest:
def test_can_merge_merged(self):
self.mr.status = 'merged'
- assert self.mr.can_merge() == True
+ assert self.mr.can_merge() is True
@mock.patch('allura.tasks.repo_tasks.can_merge', autospec=True)
def test_can_merge_cached(self, can_merge_task):
@@ -737,22 +737,22 @@ class TestMergeRequest:
self.mr.set_can_merge_cache(False)
self.mr = self._reload_mr_from_db(self.mr)
- assert self.mr.can_merge() == False
+ assert self.mr.can_merge() is False
self.mr.set_can_merge_cache(True)
self.mr = self._reload_mr_from_db(self.mr)
- assert self.mr.can_merge() == True
+ assert self.mr.can_merge() is True
assert can_merge_task.post.call_count == 0
@mock.patch('allura.tasks.repo_tasks.can_merge', autospec=True)
def test_can_merge_not_cached(self, can_merge_task):
- assert self.mr.can_merge() == None
+ assert self.mr.can_merge() is None
can_merge_task.post.assert_called_once_with(self.mr._id)
@mock.patch('allura.tasks.repo_tasks.can_merge', autospec=True)
def test_can_merge_disabled(self, can_merge_task):
self.mr.merge_allowed.return_value = False
- assert self.mr.can_merge() == None
+ assert self.mr.can_merge() is None
assert can_merge_task.post.call_count == 0
@mock.patch('allura.tasks.repo_tasks.merge', autospec=True)
@@ -764,11 +764,11 @@ class TestMergeRequest:
merge_task.reset_mock()
self.mr.merge_task_status = lambda: 'ready'
self.mr.merge()
- assert merge_task.post.called == False
+ assert merge_task.post.called is False
def test_merge_task_status(self):
from allura.tasks import repo_tasks
- assert self.mr.merge_task_status() == None
+ assert self.mr.merge_task_status() is None
repo_tasks.merge.post(self.mr._id)
assert self.mr.merge_task_status() == 'ready'
M.MonQTask.run_ready()
@@ -776,7 +776,7 @@ class TestMergeRequest:
def test_can_merge_task_status(self):
from allura.tasks import repo_tasks
- assert self.mr.can_merge_task_status() == None
+ assert self.mr.can_merge_task_status() is None
repo_tasks.can_merge.post(self.mr._id)
assert self.mr.can_merge_task_status() == 'ready'
with mock.patch('allura.model.repository.MergeRequest.set_can_merge_cache'):
diff --git a/Allura/allura/tests/test_app.py b/Allura/allura/tests/test_app.py
index 997dd13f8..a23274168 100644
--- a/Allura/allura/tests/test_app.py
+++ b/Allura/allura/tests/test_app.py
@@ -63,7 +63,7 @@ class TestApp:
def test_config_option_without_validator(self):
opt = app.ConfigOption('test1', str, None)
- assert opt.validate(None) == None
+ assert opt.validate(None) is None
assert opt.validate('') == ''
assert opt.validate('val') == 'val'
diff --git a/Allura/allura/tests/test_helpers.py b/Allura/allura/tests/test_helpers.py
index 21926356c..9e2ef3f88 100644
--- a/Allura/allura/tests/test_helpers.py
+++ b/Allura/allura/tests/test_helpers.py
@@ -310,18 +310,18 @@ def test_get_tool_packages():
def test_get_first():
- assert h.get_first({}, 'title') == None
- assert h.get_first({'title': None}, 'title') == None
+ assert h.get_first({}, 'title') is None
+ assert h.get_first({'title': None}, 'title') is None
assert h.get_first({'title': 'Value'}, 'title') == 'Value'
assert h.get_first({'title': ['Value']}, 'title') == 'Value'
- assert h.get_first({'title': []}, 'title') == None
+ assert h.get_first({'title': []}, 'title') is None
assert h.get_first({'title': ['Value']}, 'title') == 'Value'
@patch('allura.lib.search.c')
def test_inject_user(context):
user = Mock(username='user01')
- assert inject_user(None, user) == None
+ assert inject_user(None, user) is None
assert inject_user('', user) == ''
assert inject_user('query', user) == 'query'
result = inject_user('reported_by_s:$USER OR assigned_to_s:$USER', user)
@@ -357,8 +357,8 @@ def test_split_select_field_options():
def test_notifications_disabled():
project = Mock(notifications_disabled=False)
with h.notifications_disabled(project):
- assert project.notifications_disabled == True
- assert project.notifications_disabled == False
+ assert project.notifications_disabled is True
+ assert project.notifications_disabled is False
@skipIf(module_not_available('html2text'), 'html2text required')
@@ -664,7 +664,7 @@ class TestRateLimit(TestCase):
def test_hide_private_info():
- assert h.hide_private_info(None) == None
+ assert h.hide_private_info(None) is None
assert h.hide_private_info('') == ''
assert h.hide_private_info('foo bar baz@bing.com') == 'foo bar baz@...'
assert h.hide_private_info('some <1...@2.com>\nor asdf+asdf.f@g.f.x') == 'some <1...@...>\nor asdf+asdf.f@...'
diff --git a/Allura/allura/tests/test_multifactor.py b/Allura/allura/tests/test_multifactor.py
index 42b8c6ce9..8ba2454bc 100644
--- a/Allura/allura/tests/test_multifactor.py
+++ b/Allura/allura/tests/test_multifactor.py
@@ -56,8 +56,8 @@ class TestGoogleAuthenticatorFile:
gaf = GoogleAuthenticatorFile.load(self.sample)
assert gaf.key == b'\xf8\x97\xbb/\xfd\xf2%\x01S\xa7\x8dZ\x07\x0c\\\xe4'
assert gaf.options['RATE_LIMIT'] == '3 30'
- assert gaf.options['DISALLOW_REUSE'] == None
- assert gaf.options['TOTP_AUTH'] == None
+ assert gaf.options['DISALLOW_REUSE'] is None
+ assert gaf.options['TOTP_AUTH'] is None
assert gaf.recovery_codes == [
'43504045',
'16951331',
@@ -274,7 +274,7 @@ class TestAnyRecoveryCodeServiceImplementation:
]
recovery.replace_codes(user, codes)
result = recovery.verify_and_remove_code(user, '12345')
- assert result == True
+ assert result is True
assert recovery.get_codes(user) == ['67890']
def test_rate_limiting(self):
diff --git a/Allura/allura/tests/test_plugin.py b/Allura/allura/tests/test_plugin.py
index c6c78fc77..f1dfaf53e 100644
--- a/Allura/allura/tests/test_plugin.py
+++ b/Allura/allura/tests/test_plugin.py
@@ -286,7 +286,7 @@ class TestThemeProvider:
@patch('allura.lib.plugin.g')
def test_app_icon_str_invalid(self, g):
g.entry_points = {'tool': {'testapp': Mock()}}
- assert ThemeProvider().app_icon_url('invalid', 24) == None
+ assert ThemeProvider().app_icon_url('invalid', 24) is None
@patch('allura.app.g')
def test_app_icon_app(self, g):
@@ -676,7 +676,7 @@ class TestLocalAuthenticationProvider:
with audits('Account enabled', user=True, actor='test-admin'):
self.provider.enable_user(user)
ThreadLocalORMSession.flush_all()
- assert user.disabled == False
+ assert user.disabled is False
def test_disable_user(self):
user = Mock(disabled=False, __ming__=Mock(), is_anonymous=lambda: False, _id=ObjectId())
@@ -684,7 +684,7 @@ class TestLocalAuthenticationProvider:
with audits('Account disabled', user=True, actor='test-admin'):
self.provider.disable_user(user)
ThreadLocalORMSession.flush_all()
- assert user.disabled == True
+ assert user.disabled is True
def test_login_details_from_auditlog(self):
user = M.User(username='asfdasdf')
@@ -695,11 +695,11 @@ class TestLocalAuthenticationProvider:
detail = self.provider.login_details_from_auditlog(M.AuditLog(message='IP Address: 1.2.3.4\nFoo', user=user))
assert detail.user_id == user._id
assert detail.ip == '1.2.3.4'
- assert detail.ua == None
+ assert detail.ua is None
detail = self.provider.login_details_from_auditlog(M.AuditLog(message='Foo\nIP Address: 1.2.3.4\nFoo', user=user))
assert detail.ip == '1.2.3.4'
- assert detail.ua == None
+ assert detail.ua is None
assert (self.provider.login_details_from_auditlog(M.AuditLog(
message='blah blah IP Address: 1.2.3.4\nFoo', user=user)) ==
@@ -707,7 +707,7 @@ class TestLocalAuthenticationProvider:
detail = self.provider.login_details_from_auditlog(M.AuditLog(
message='User-Agent: Mozilla/Firefox\nFoo', user=user))
- assert detail.ip == None
+ assert detail.ip is None
assert detail.ua == 'Mozilla/Firefox'
detail = self.provider.login_details_from_auditlog(M.AuditLog(
@@ -719,8 +719,8 @@ class TestLocalAuthenticationProvider:
user = M.User(username='foobarbaz')
detail = self.provider.get_login_detail(Request.blank('/'), user)
assert detail.user_id == user._id
- assert detail.ip == None
- assert detail.ua == None
+ assert detail.ip is None
+ assert detail.ua is None
detail = self.provider.get_login_detail(Request.blank('/',
headers={'User-Agent': 'mybrowser'},
diff --git a/Allura/allura/tests/test_tasks.py b/Allura/allura/tests/test_tasks.py
index 3acd939b9..bb61cb95a 100644
--- a/Allura/allura/tests/test_tasks.py
+++ b/Allura/allura/tests/test_tasks.py
@@ -66,7 +66,7 @@ class TestRepoTasks(unittest.TestCase):
repo_tasks.clone(None, None, fake_source_url)
assert post_event.call_args[0][0] == 'repo_clone_task_failed'
assert post_event.call_args[0][1] == fake_source_url
- assert post_event.call_args[0][2] == None
+ assert post_event.call_args[0][2] is None
# ignore args[3] which is a traceback string
@mock.patch('allura.tasks.repo_tasks.session', autospec=True)
@@ -653,7 +653,7 @@ class TestExportTasks(unittest.TestCase):
assert 'Sample instructions for test' in text
def test_bulk_export_status(self):
- assert c.project.bulk_export_status() == None
+ assert c.project.bulk_export_status() is None
export_tasks.bulk_export.post(['wiki'])
assert c.project.bulk_export_status() == 'busy'
diff --git a/Allura/allura/tests/test_utils.py b/Allura/allura/tests/test_utils.py
index d9f5229a9..5165082a3 100644
--- a/Allura/allura/tests/test_utils.py
+++ b/Allura/allura/tests/test_utils.py
@@ -339,7 +339,7 @@ def test_empty_cursor():
"""EmptyCursors conforms to specification of Ming's ODMCursor"""
cursor = utils.EmptyCursor()
assert cursor.count() == 0
- assert cursor.first() == None
+ assert cursor.first() is None
assert cursor.all() == []
assert cursor.limit(10) == cursor
assert cursor.skip(10) == cursor
diff --git a/Allura/allura/tests/test_webhooks.py b/Allura/allura/tests/test_webhooks.py
index d0785343a..90523beb8 100644
--- a/Allura/allura/tests/test_webhooks.py
+++ b/Allura/allura/tests/test_webhooks.py
@@ -593,16 +593,16 @@ class TestRepoPushWebhookSender(TestWebhookBase):
sender = RepoPushWebhookSender()
# default
- assert sender.enforce_limit(self.git) == True
+ assert sender.enforce_limit(self.git) is True
add_webhooks('one', 3)
- assert sender.enforce_limit(self.git) == False
+ assert sender.enforce_limit(self.git) is False
# config
limit = json.dumps({'git': 5})
with h.push_config(config, **{'webhook.repo_push.max_hooks': limit}):
- assert sender.enforce_limit(self.git) == True
+ assert sender.enforce_limit(self.git) is True
add_webhooks('two', 3)
- assert sender.enforce_limit(self.git) == False
+ assert sender.enforce_limit(self.git) is False
def test_before(self):
sender = RepoPushWebhookSender()
@@ -630,24 +630,24 @@ class TestModels(TestWebhookBase):
def test_webhook_enforce_limit(self):
self.wh.last_sent = None
- assert self.wh.enforce_limit() == True
+ assert self.wh.enforce_limit() is True
# default value
self.wh.last_sent = dt.datetime.utcnow() - dt.timedelta(seconds=31)
- assert self.wh.enforce_limit() == True
+ assert self.wh.enforce_limit() is True
self.wh.last_sent = dt.datetime.utcnow() - dt.timedelta(seconds=15)
- assert self.wh.enforce_limit() == False
+ assert self.wh.enforce_limit() is False
# value from config
with h.push_config(config, **{'webhook.repo_push.limit': 100}):
self.wh.last_sent = dt.datetime.utcnow() - dt.timedelta(seconds=101)
- assert self.wh.enforce_limit() == True
+ assert self.wh.enforce_limit() is True
self.wh.last_sent = dt.datetime.utcnow() - dt.timedelta(seconds=35)
- assert self.wh.enforce_limit() == False
+ assert self.wh.enforce_limit() is False
@patch('allura.model.webhook.dt', autospec=True)
def test_update_limit(self, dt_mock):
_now = dt.datetime(2015, 2, 2, 13, 39)
dt_mock.datetime.utcnow.return_value = _now
- assert self.wh.last_sent == None
+ assert self.wh.last_sent is None
self.wh.update_limit()
session(self.wh).expunge(self.wh)
assert M.Webhook.query.get(_id=self.wh._id).last_sent == _now
@@ -884,7 +884,7 @@ class TestWebhookRestController(TestRestApiBase):
r = self.api_delete(url, status=200)
assert r.json == {'result': 'ok'}
assert M.Webhook.query.find().count() == 2
- assert M.Webhook.query.get(_id=webhook._id) == None
+ assert M.Webhook.query.get(_id=webhook._id) is None
def test_permissions(self):
self.api_get(self.url, user='test-user', status=403)
diff --git a/Allura/allura/tests/unit/controllers/test_discussion_moderation_controller.py b/Allura/allura/tests/unit/controllers/test_discussion_moderation_controller.py
index f689fa5f7..4f7f61d78 100644
--- a/Allura/allura/tests/unit/controllers/test_discussion_moderation_controller.py
+++ b/Allura/allura/tests/unit/controllers/test_discussion_moderation_controller.py
@@ -59,7 +59,7 @@ class TestWhenModerating(WithDatabase):
def test_that_it_can_be_deleted(self):
self.moderate_post(delete=True)
- assert self.get_post() == None
+ assert self.get_post() is None
def moderate_post(self, **kwargs):
with patch('allura.controllers.discuss.flash'):
diff --git a/Allura/allura/tests/unit/spam/test_spam_filter.py b/Allura/allura/tests/unit/spam/test_spam_filter.py
index ad32d690a..a00847ab9 100644
--- a/Allura/allura/tests/unit/spam/test_spam_filter.py
+++ b/Allura/allura/tests/unit/spam/test_spam_filter.py
@@ -88,7 +88,7 @@ class TestSpamFilterFunctional:
results = SpamCheckResult.query.find().all()
assert len(results) == 1
- assert results[0].result == True
+ assert results[0].result is True
assert results[0].user.username == 'test-user'
diff --git a/Allura/allura/tests/unit/test_ldap_auth_provider.py b/Allura/allura/tests/unit/test_ldap_auth_provider.py
index a480be211..1b0967dfc 100644
--- a/Allura/allura/tests/unit/test_ldap_auth_provider.py
+++ b/Allura/allura/tests/unit/test_ldap_auth_provider.py
@@ -115,11 +115,11 @@ class TestLdapAuthenticationProvider:
ldap.dn.escape_dn_chars = lambda x: x
self.provider._encode_password = Mock(return_value=b'new-password-hash')
- assert M.User.query.get(username=user_doc['username']) == None
+ assert M.User.query.get(username=user_doc['username']) is None
with h.push_config(config, **{'auth.ldap.autoregister': 'false'}):
self.provider.register_user(user_doc)
ThreadLocalORMSession.flush_all()
- assert M.User.query.get(username=user_doc['username']) != None
+ assert M.User.query.get(username=user_doc['username']) is not None
dn = 'uid=%s,ou=people,dc=localdomain' % user_doc['username']
ldap.initialize.assert_called_once_with('ldaps://localhost/')
diff --git a/Allura/allura/tests/unit/test_repo.py b/Allura/allura/tests/unit/test_repo.py
index 47945e24f..5f9756ea7 100644
--- a/Allura/allura/tests/unit/test_repo.py
+++ b/Allura/allura/tests/unit/test_repo.py
@@ -104,40 +104,40 @@ class TestBlob(unittest.TestCase):
def test_pypeline_view(self):
blob = M.repository.Blob(MagicMock(), 'INSTALL.mdown', 'blob1')
- assert blob.has_pypeline_view == True
+ assert blob.has_pypeline_view is True
def test_has_html_view_text_mime(self):
blob = M.repository.Blob(MagicMock(), 'INSTALL', 'blob1')
blob.content_type = 'text/plain'
- assert blob.has_html_view == True
+ assert blob.has_html_view is True
def test_has_html_view_text_ext(self):
blob = M.repository.Blob(MagicMock(), 'INSTALL.txt', 'blob1')
blob.content_type = 'foo/bar'
- assert blob.has_html_view == True
+ assert blob.has_html_view is True
def test_has_html_view_text_contents(self):
blob = M.repository.Blob(MagicMock(), 'INSTALL', 'blob1')
blob.content_type = 'foo/bar'
blob.text = b'hello world, this is text here'
- assert blob.has_html_view == True
+ assert blob.has_html_view is True
def test_has_html_view_bin_ext(self):
blob = M.repository.Blob(MagicMock(), 'INSTALL.zip', 'blob1')
- assert blob.has_html_view == False
+ assert blob.has_html_view is False
def test_has_html_view_bin_content(self):
blob = M.repository.Blob(MagicMock(), 'myfile', 'blob1')
blob.content_type = 'whatever'
blob.text = b'\0\0\0\0'
- assert blob.has_html_view == False
+ assert blob.has_html_view is False
def test_has_html_view__local_setting_override_bin(self):
blob = M.repository.Blob(MagicMock(), 'myfile.dat', 'blob1')
blob.content_type = 'whatever'
blob.text = b'\0\0\0\0'
blob.repo._additional_viewable_extensions = ['.dat']
- assert blob.has_html_view == True
+ assert blob.has_html_view is True
class TestCommit(unittest.TestCase):
@@ -167,13 +167,13 @@ class TestCommit(unittest.TestCase):
tree = commit.get_tree(create=False)
assert not commit.repo.compute_tree_new.called
assert not c.model_cache.get.called
- assert tree == None
+ assert tree is None
commit.tree_id = 'tree'
tree = commit.get_tree(create=False)
assert not commit.repo.compute_tree_new.called
c.model_cache.get.assert_called_with(M.repository.Tree, dict(_id='tree'))
- assert tree == None
+ assert tree is None
_tree = Mock()
c.model_cache.get.return_value = _tree
@@ -194,7 +194,7 @@ class TestCommit(unittest.TestCase):
commit.repo.compute_tree_new.assert_called_once_with(commit)
assert not c.model_cache.get.called
assert not tree_get.called
- assert tree == None
+ assert tree is None
commit.repo.compute_tree_new.reset_mock()
commit.repo.compute_tree_new.return_value = 'tree'
diff --git a/Allura/allura/tests/unit/test_solr.py b/Allura/allura/tests/unit/test_solr.py
index c24bfdb35..588830804 100644
--- a/Allura/allura/tests/unit/test_solr.py
+++ b/Allura/allura/tests/unit/test_solr.py
@@ -127,7 +127,7 @@ class TestSearchIndexable(unittest.TestCase):
def test_solarize_empty_index(self):
self.obj.index = lambda: None
- assert self.obj.solarize() == None
+ assert self.obj.solarize() is None
def test_solarize_doc_without_text(self):
self.obj.index = lambda: dict()
diff --git a/ForgeActivity/forgeactivity/tests/functional/test_rest.py b/ForgeActivity/forgeactivity/tests/functional/test_rest.py
index 39db63a9c..453fd2e7d 100644
--- a/ForgeActivity/forgeactivity/tests/functional/test_rest.py
+++ b/ForgeActivity/forgeactivity/tests/functional/test_rest.py
@@ -41,12 +41,12 @@ class TestActivityHasAccessAPI(TestRestApiBase):
'/rest/p/test/activity/has_access?user=babadook&perm=read',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
r = self.api_get(
'/rest/p/test/activity/has_access?user=test-user&perm=jump',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
def test_has_access_not_admin(self):
"""
@@ -63,12 +63,12 @@ class TestActivityHasAccessAPI(TestRestApiBase):
'/rest/p/test/activity/has_access?user=test-admin&perm=admin',
user='root')
assert r.status_int == 200
- assert r.json['result'] == True
+ assert r.json['result'] is True
r = self.api_get(
'/rest/p/test/activity/has_access?user=test-user&perm=admin',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
def test_user_api(self):
diff --git a/ForgeBlog/forgeblog/tests/functional/test_rest.py b/ForgeBlog/forgeblog/tests/functional/test_rest.py
index 59c06d5ad..76855cdc7 100644
--- a/ForgeBlog/forgeblog/tests/functional/test_rest.py
+++ b/ForgeBlog/forgeblog/tests/functional/test_rest.py
@@ -222,12 +222,12 @@ class TestBlogApi(TestRestApiBase):
'/rest/p/test/blog/has_access?user=babadook&perm=read',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
r = self.api_get(
'/rest/p/test/blog/has_access?user=test-user&perm=jump',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
def test_has_access_not_admin(self):
"""
@@ -244,12 +244,12 @@ class TestBlogApi(TestRestApiBase):
'/rest/p/test/blog/has_access?user=test-admin&perm=post&access_token=ABCDEF',
user='root')
assert r.status_int == 200
- assert r.json['result'] == True
+ assert r.json['result'] is True
r = self.api_get(
'/rest/p/test/blog/has_access?user=*anonymous&perm=admin',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
def test_create_post_limit_by_project(self):
data = {
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py b/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
index cebce6467..5e6508728 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
@@ -80,7 +80,7 @@ class TestRootRestController(TestDiscussionApiBase):
assert forums[1]['num_topics'] == 0
assert (
forums[1]['url'] == 'http://localhost/rest/p/test/discussion/h%C3%A9llo/')
- assert forums[1]['last_post'] == None
+ assert forums[1]['last_post'] is None
def test_forum(self):
forum = self.api_get('/rest/p/test/discussion/general/')
@@ -255,12 +255,12 @@ class TestRootRestController(TestDiscussionApiBase):
'/rest/p/test/discussion/has_access?user=babadook&perm=read',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
r = self.api_get(
'/rest/p/test/discussion/has_access?user=test-user&perm=jump',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
def test_has_access_not_admin(self):
"""
@@ -277,9 +277,9 @@ class TestRootRestController(TestDiscussionApiBase):
'/rest/p/test/discussion/has_access?user=test-admin&perm=post',
user='root')
assert r.status_int == 200
- assert r.json['result'] == True
+ assert r.json['result'] is True
r = self.api_get(
'/rest/p/test/discussion/has_access?user=*anonymous&perm=admin',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
diff --git a/ForgeFiles/forgefiles/tests/functional/test_root.py b/ForgeFiles/forgefiles/tests/functional/test_root.py
index 75acf6fa2..fb38b7924 100644
--- a/ForgeFiles/forgefiles/tests/functional/test_root.py
+++ b/ForgeFiles/forgefiles/tests/functional/test_root.py
@@ -73,7 +73,7 @@ class TestFiles(TestController):
data1 = {'folder_id': str(folder_object._id), 'remarks': 'Publishing new Version'}
self.app.post('/p/test/files/publish_folder', data1)
resp = self.app.get('/files/')
- assert folder_object.published == True
+ assert folder_object.published is True
def test_link_file(self):
file_object = upload_file(self)
diff --git a/ForgeGit/forgegit/tests/functional/test_controllers.py b/ForgeGit/forgegit/tests/functional/test_controllers.py
index a906bea91..2d6b333df 100644
--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -432,7 +432,7 @@ class TestRootController(_TestCase):
r = self.app.get(ci + 'tree/',
extra_environ={'username': str(user.username)})
opts = self.subscription_options(r)
- assert opts['subscribed'] == False
+ assert opts['subscribed'] is False
# subscribe
r = self.app.post(str(ci + 'tree/subscribe'),
@@ -444,7 +444,7 @@ class TestRootController(_TestCase):
r = self.app.get(ci + 'tree/',
extra_environ={'username': str(user.username)})
opts = self.subscription_options(r)
- assert opts['subscribed'] == True
+ assert opts['subscribed'] is True
# unsubscribe
r = self.app.post(str(ci + 'tree/subscribe'),
@@ -456,7 +456,7 @@ class TestRootController(_TestCase):
r = self.app.get(ci + 'tree/',
extra_environ={'username': str(user.username)})
opts = self.subscription_options(r)
- assert opts['subscribed'] == False
+ assert opts['subscribed'] is False
def test_timezone(self):
ci = self._get_ci()
@@ -537,7 +537,7 @@ class TestRootController(_TestCase):
# for some reason c.app.config.options has old values still
app_config = M.AppConfig.query.get(_id=c.app.config._id)
assert app_config.options['external_checkout_url'] == 'http://foo.bar/baz'
- assert app_config.options['merge_disabled'] == True
+ assert app_config.options['merge_disabled'] is True
def test_refresh(self):
r = self.app.get('/p/test/src-git/refresh')
@@ -587,12 +587,12 @@ class TestHasAccessAPI(TestRestApiBase):
'/rest/p/test/src-git/has_access?user=babadook&perm=read',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
r = self.api_get(
'/rest/p/test/src-git/has_access?user=test-user&perm=jump',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
def test_has_access_not_admin(self):
"""
@@ -609,12 +609,12 @@ class TestHasAccessAPI(TestRestApiBase):
'/rest/p/test/src-git/has_access?user=test-admin&perm=create',
user='root')
assert r.status_int == 200
- assert r.json['result'] == True
+ assert r.json['result'] is True
r = self.api_get(
'/rest/p/test/src-git/has_access?user=test-user&perm=create',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
class TestFork(_TestCase):
@@ -1124,13 +1124,13 @@ class TestIncludeMacro(_TestCase):
setup_global_objects()
def test_parse_repo(self):
- assert macro.parse_repo('app') == None
- assert macro.parse_repo('proj:app') == None
- assert macro.parse_repo('nbhd:test:src-git') == None
- assert macro.parse_repo('a:b:c:d:e:f') == None
- assert macro.parse_repo('src-git') != None
- assert macro.parse_repo('test:src-git') != None
- assert macro.parse_repo('p:test:src-git') != None
+ assert macro.parse_repo('app') is None
+ assert macro.parse_repo('proj:app') is None
+ assert macro.parse_repo('nbhd:test:src-git') is None
+ assert macro.parse_repo('a:b:c:d:e:f') is None
+ assert macro.parse_repo('src-git') is not None
+ assert macro.parse_repo('test:src-git') is not None
+ assert macro.parse_repo('p:test:src-git') is not None
def test_include_file_no_repo(self):
expected = '[[include repo %s (not found)]]'
diff --git a/ForgeGit/forgegit/tests/model/test_repository.py b/ForgeGit/forgegit/tests/model/test_repository.py
index 8011ef145..afcb1b3ac 100644
--- a/ForgeGit/forgegit/tests/model/test_repository.py
+++ b/ForgeGit/forgegit/tests/model/test_repository.py
@@ -107,8 +107,8 @@ class TestNewGit(unittest.TestCase):
'/p/test/src-git/ci/'
'1e146e67985dcd71c74de79613719bef7bddca4a/')
- assert self.rev.authored_user == None
- assert self.rev.committed_user == None
+ assert self.rev.authored_user is None
+ assert self.rev.committed_user is None
user = M.User.upsert('rick')
email = user.claim_address('rcopeland@geek.net')
email.confirmed = True
@@ -558,10 +558,10 @@ By Dave Brondsema''' in text_body
os.remove(
os.path.join(tmpdir, "git/t/te/test/testgit.git/test-src-git-HEAD.zip"))
- assert self.repo.get_tarball_status('HEAD') == None
+ assert self.repo.get_tarball_status('HEAD') is None
def test_tarball_status_task(self):
- assert self.repo.get_tarball_status('HEAD') == None
+ assert self.repo.get_tarball_status('HEAD') is None
# create tarball task in MonQTask and check get_tarball_status
tarball.post('HEAD', '')
@@ -583,7 +583,7 @@ By Dave Brondsema''' in text_body
# when state is complete, but file don't exists, then status is None
task.state = 'complete'
task.query.session.flush_all()
- assert self.repo.get_tarball_status('HEAD') == None
+ assert self.repo.get_tarball_status('HEAD') is None
def test_is_empty(self):
assert not self.repo.is_empty()
@@ -715,7 +715,7 @@ By Dave Brondsema''' in text_body
git = mock.Mock()
git.merge_tree.return_value = 'clean merge'
self.repo._impl._git.git = git
- assert self.repo.can_merge(mr) == True
+ assert self.repo.can_merge(mr) is True
git.fetch.assert_called_once_with('downstream-url', 'source-branch')
git.merge_base.assert_called_once_with('cid', 'target-branch')
git.merge_tree.assert_called_once_with(
@@ -723,7 +723,7 @@ By Dave Brondsema''' in text_body
'target-branch',
'cid')
git.merge_tree.return_value = '+<<<<<<<'
- assert self.repo.can_merge(mr) == False
+ assert self.repo.can_merge(mr) is False
@mock.patch('forgegit.model.git_repo.tempfile', autospec=True)
@mock.patch('forgegit.model.git_repo.git', autospec=True)
diff --git a/ForgeImporters/forgeimporters/github/tests/test_wiki.py b/ForgeImporters/forgeimporters/github/tests/test_wiki.py
index 1ddd56d6c..3b7a7a05d 100644
--- a/ForgeImporters/forgeimporters/github/tests/test_wiki.py
+++ b/ForgeImporters/forgeimporters/github/tests/test_wiki.py
@@ -535,7 +535,7 @@ some text and **[Tips n\u2019 Tricks]**
def test_has_wiki_repo(self, repo, rmtree, mkdtemp):
mkdtemp.return_value = 'fake path'
i = GitHubWikiImporter()
- assert i.has_wiki_repo('fake url') == True
+ assert i.has_wiki_repo('fake url') is True
repo.clone_from.assert_called_once_with(
'fake url', to_path='fake path', bare=True)
rmtree.assert_called_once_with('fake path')
@@ -543,7 +543,7 @@ some text and **[Tips n\u2019 Tricks]**
def raise_error(*args, **kw):
raise git.GitCommandError('bam', 'bam', 'bam')
repo.clone_from.side_effect = raise_error
- assert i.has_wiki_repo('fake url') == False
+ assert i.has_wiki_repo('fake url') is False
class TestGitHubWikiImportController(TestController, TestCase):
diff --git a/ForgeImporters/forgeimporters/tests/github/functional/test_github.py b/ForgeImporters/forgeimporters/tests/github/functional/test_github.py
index 90f605522..f6404d758 100644
--- a/ForgeImporters/forgeimporters/tests/github/functional/test_github.py
+++ b/ForgeImporters/forgeimporters/tests/github/functional/test_github.py
@@ -61,7 +61,7 @@ class TestGitHubOAuth(TestController):
oauth.return_value = oauth_instance
user = M.User.by_username('test-admin')
- assert user.get_tool_data('GitHubProjectImport', 'token') == None
+ assert user.get_tool_data('GitHubProjectImport', 'token') is None
r = self.app.get('/p/import_project/github/')
assert r.status_int == 302
assert r.location == redirect
diff --git a/ForgeLink/forgelink/tests/functional/test_rest.py b/ForgeLink/forgelink/tests/functional/test_rest.py
index 2be487255..9747afe28 100644
--- a/ForgeLink/forgelink/tests/functional/test_rest.py
+++ b/ForgeLink/forgelink/tests/functional/test_rest.py
@@ -33,7 +33,7 @@ class TestLinkApi(TestRestApiBase):
def test_rest_link(self):
r = self.api_get('/rest/p/test/link')
- assert r.json['url'] == None
+ assert r.json['url'] is None
r = self.api_post('/rest/p/test/link',
url='http://google.com')
@@ -98,12 +98,12 @@ class TestLinkHasAccess(TestRestApiBase):
'/rest/p/test/link/has_access?user=babadook&perm=read',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
r = self.api_get(
'/rest/p/test/link/has_access?user=test-user&perm=jump',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
def test_has_access_not_admin(self):
"""
@@ -120,9 +120,9 @@ class TestLinkHasAccess(TestRestApiBase):
'/rest/p/test/link/has_access?user=test-admin&perm=configure',
user='root')
assert r.status_int == 200
- assert r.json['result'] == True
+ assert r.json['result'] is True
r = self.api_get(
'/rest/p/test/link/has_access?user=test-user&perm=configure',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
diff --git a/ForgeLink/forgelink/tests/functional/test_root.py b/ForgeLink/forgelink/tests/functional/test_root.py
index ac2d716cb..4748225f5 100644
--- a/ForgeLink/forgelink/tests/functional/test_root.py
+++ b/ForgeLink/forgelink/tests/functional/test_root.py
@@ -94,7 +94,7 @@ class TestConfigOptions(TestController):
assert flash['status'] == 'error'
assert flash['message'] == 'ToolError: url: That is not a valid URL'
app = self.project.app_instance('link-google')
- assert app == None
+ assert app is None
@td.with_link
def test_sets_url_on_config(self):
diff --git a/ForgeSVN/forgesvn/tests/functional/test_controllers.py b/ForgeSVN/forgesvn/tests/functional/test_controllers.py
index 99cc242ea..a337014c6 100644
--- a/ForgeSVN/forgesvn/tests/functional/test_controllers.py
+++ b/ForgeSVN/forgesvn/tests/functional/test_controllers.py
@@ -269,7 +269,7 @@ class TestRootController(SVNTestController):
assert form.find('input', attrs=dict(name='path')).get('value') == '/tags/tag-1.0'
r = self.app.get('/p/test/svn-tags/19/tarball_status?path=/tags/tag-1.0')
- assert r.json['status'] == None
+ assert r.json['status'] is None
r = self.app.post('/p/test/svn-tags/19/tarball',
dict(path='/tags/tag-1.0')).follow()
assert 'Generating snapshot...' in r
@@ -278,7 +278,7 @@ class TestRootController(SVNTestController):
assert r.json['status'] == 'complete'
r = self.app.get('/p/test/svn-tags/19/tarball_status?path=/trunk')
- assert r.json['status'] == None
+ assert r.json['status'] is None
r = self.app.post('/p/test/svn-tags/19/tarball',
dict(path='/trunk/')).follow()
assert 'Generating snapshot...' in r
@@ -287,7 +287,7 @@ class TestRootController(SVNTestController):
assert r.json['status'] == 'complete'
r = self.app.get('/p/test/svn-tags/19/tarball_status?path=/branches/aaa/')
- assert r.json['status'] == None
+ assert r.json['status'] is None
# this is is the same as trunk snapshot, so it's ready already
r = self.app.get('/p/test/svn-tags/19/tarball_status')
diff --git a/ForgeSVN/forgesvn/tests/model/test_repository.py b/ForgeSVN/forgesvn/tests/model/test_repository.py
index 707d7b52a..fcd1f6656 100644
--- a/ForgeSVN/forgesvn/tests/model/test_repository.py
+++ b/ForgeSVN/forgesvn/tests/model/test_repository.py
@@ -94,8 +94,8 @@ class TestNewRepo(unittest.TestCase):
assert self.rev.tree['a']['b']['c'].ls() == []
self.assertRaises(KeyError, lambda: self.rev.tree['a']['b']['d'])
- assert self.rev.authored_user == None
- assert self.rev.committed_user == None
+ assert self.rev.authored_user is None
+ assert self.rev.committed_user is None
assert (
sorted(self.rev.webhook_info.keys()) ==
sorted(['id', 'url', 'timestamp', 'message', 'author',
diff --git a/ForgeTracker/forgetracker/tests/functional/test_rest.py b/ForgeTracker/forgetracker/tests/functional/test_rest.py
index 6dfa4c9eb..85cfc77eb 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_rest.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_rest.py
@@ -88,13 +88,13 @@ class TestRestNewTicket(TestTrackerApiBase):
summary = 'Second ticket'
self.create_ticket(summary=summary)
t = TM.Ticket.query.get(summary=summary)
- assert t != None
+ assert t is not None
# Set rate limit to 1 in first hour of project
with h.push_config(config, **{'forgetracker.rate_limits': '{"3600": 1}'}):
summary = 'Third ticket'
self.create_ticket(summary=summary, status=429)
t = TM.Ticket.query.get(summary=summary)
- assert t == None
+ assert t is None
class TestRestUpdateTicket(TestTrackerApiBase):
@@ -252,12 +252,12 @@ class TestRestHasAccess(TestTrackerApiBase):
'/rest/p/test/bugs/has_access?user=babadook&perm=read',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
r = self.api_get(
'/rest/p/test/bugs/has_access?user=test-user&perm=jump',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
def test_has_access_not_admin(self):
"""
@@ -274,9 +274,9 @@ class TestRestHasAccess(TestTrackerApiBase):
'/rest/p/test/bugs/has_access?user=test-admin&perm=delete',
user='root')
assert r.status_int == 200
- assert r.json['result'] == True
+ assert r.json['result'] is True
r = self.api_get(
'/rest/p/test/bugs/has_access?user=test-user&perm=delete',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
diff --git a/ForgeTracker/forgetracker/tests/functional/test_root.py b/ForgeTracker/forgetracker/tests/functional/test_root.py
index 129198ae6..28d2c0742 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -296,7 +296,7 @@ class TestFunctionalController(TrackerTestController):
ticket_view = self.new_ticket(summary=summary).follow()
assert summary in ticket_view
opts = self.subscription_options(ticket_view)
- assert opts['subscribed'] == False
+ assert opts['subscribed'] is False
def test_ticket_get_markdown(self):
self.new_ticket(summary='my ticket', description='my description')
@@ -406,7 +406,7 @@ class TestFunctionalController(TrackerTestController):
assert form['ticket_form.assigned_to'].value == 'test-user'
assert form['ticket_form._milestone'].value == '2.0'
assert form['ticket_form.status'].value == 'pending'
- assert form['ticket_form.private'].checked == True
+ assert form['ticket_form.private'].checked is True
def test_mass_edit(self):
self.new_ticket(summary='First Ticket').follow()
@@ -515,8 +515,8 @@ class TestFunctionalController(TrackerTestController):
'summary': 'First Custom'}).first()
ticket2 = tm.Ticket.query.find({
'summary': 'Second Custom'}).first()
- assert ticket1.custom_fields._major == False
- assert ticket2.custom_fields._major == False
+ assert ticket1.custom_fields._major is False
+ assert ticket2.custom_fields._major is False
self.app.post('/p/test/bugs/update_tickets', {
'__search': '',
@@ -533,8 +533,8 @@ class TestFunctionalController(TrackerTestController):
assert '<li><strong>Major</strong>: False --> True</li>' in r
ticket1 = tm.Ticket.query.find({'summary': 'First Custom'}).first()
ticket2 = tm.Ticket.query.find({'summary': 'Second Custom'}).first()
- assert ticket1.custom_fields._major == True
- assert ticket2.custom_fields._major == True
+ assert ticket1.custom_fields._major is True
+ assert ticket2.custom_fields._major is True
self.app.post('/p/test/bugs/update_tickets', {
'__search': '',
@@ -545,7 +545,7 @@ class TestFunctionalController(TrackerTestController):
M.MonQTask.run_ready()
ticket2 = tm.Ticket.query.find({
'summary': 'Second Custom'}).first()
- assert ticket2.custom_fields._major == False
+ assert ticket2.custom_fields._major is False
self.app.post('/p/test/bugs/update_tickets', {
'__search': '',
'__ticket_ids': (
@@ -557,8 +557,8 @@ class TestFunctionalController(TrackerTestController):
M.MonQTask.run_ready()
ticket1 = tm.Ticket.query.find({'summary': 'First Custom'}).first()
ticket2 = tm.Ticket.query.find({'summary': 'Second Custom'}).first()
- assert ticket1.custom_fields._major == True
- assert ticket2.custom_fields._major == False
+ assert ticket1.custom_fields._major is True
+ assert ticket2.custom_fields._major is False
def test_mass_edit_select_options_split(self):
params = dict(
@@ -604,8 +604,8 @@ class TestFunctionalController(TrackerTestController):
assert '<li><strong>Private</strong>: No --> Yes</li>' not in r
ticket1 = tm.Ticket.query.find({'summary': 'First'}).first()
ticket2 = tm.Ticket.query.find({'summary': 'Second'}).first()
- assert ticket1.private == False
- assert ticket2.private == False
+ assert ticket1.private is False
+ assert ticket2.private is False
self.app.post('/p/test/bugs/update_tickets', {
'__search': '',
@@ -621,8 +621,8 @@ class TestFunctionalController(TrackerTestController):
assert '<li><strong>Private</strong>: No --> Yes</li>' in r
ticket1 = tm.Ticket.query.find({'summary': 'First'}).first()
ticket2 = tm.Ticket.query.find({'summary': 'Second'}).first()
- assert ticket1.private == True
- assert ticket2.private == True
+ assert ticket1.private is True
+ assert ticket2.private is True
ticket2.private = False
self.app.post('/p/test/bugs/update_tickets', {
@@ -635,8 +635,8 @@ class TestFunctionalController(TrackerTestController):
M.MonQTask.run_ready()
ticket1 = tm.Ticket.query.find({'summary': 'First'}).first()
ticket2 = tm.Ticket.query.find({'summary': 'Second'}).first()
- assert ticket1.private == True
- assert ticket2.private == False
+ assert ticket1.private is True
+ assert ticket2.private is False
def test_private_ticket(self):
ticket_view = self.new_ticket(summary='Public Ticket').follow()
@@ -2568,7 +2568,7 @@ class TestFunctionalController(TrackerTestController):
r = self.app.post('/bugs/save_ticket', post_data).follow()
assert summary in r
t = tm.Ticket.query.get(summary=summary)
- assert t != None
+ assert t is not None
# Set rate limit to 1 in first hour of project
with h.push_config(config, **{'forgetracker.rate_limits': '{"3600": 1}'}):
summary = 'Ticket with limit'
@@ -2583,7 +2583,7 @@ class TestFunctionalController(TrackerTestController):
'Ticket creation rate limit exceeded. Please try again later.')
assert summary not in r.follow()
t = tm.Ticket.query.get(summary=summary)
- assert t == None
+ assert t is None
def test_user_missing(self):
# add test-user to project so it can be assigned the ticket
@@ -3307,7 +3307,7 @@ class TestNotificationEmailGrouping(TrackerTestController):
email = M.MonQTask.query.find(dict(task_name='allura.tasks.mail_tasks.sendmail')).first()
ticket = tm.Ticket.query.get(ticket_num=1)
assert email.kwargs.message_id == ticket.message_id()
- assert email.kwargs.in_reply_to == None
+ assert email.kwargs.in_reply_to is None
assert email.kwargs.references == []
def test_comments(self):
diff --git a/ForgeTracker/forgetracker/tests/test_app.py b/ForgeTracker/forgetracker/tests/test_app.py
index f5542b602..66d8af6e5 100644
--- a/ForgeTracker/forgetracker/tests/test_app.py
+++ b/ForgeTracker/forgetracker/tests/test_app.py
@@ -64,7 +64,7 @@ class TestApp:
c.app.handle_message('6789', msg)
# no new message
post = M.Post.query.get(_id=message_id)
- assert post == None
+ assert post is None
@td.with_tracker
def test_uninstall(self):
diff --git a/ForgeTracker/forgetracker/tests/unit/test_globals_model.py b/ForgeTracker/forgetracker/tests/unit/test_globals_model.py
index 2e7c591a3..0b508fc60 100644
--- a/ForgeTracker/forgetracker/tests/unit/test_globals_model.py
+++ b/ForgeTracker/forgetracker/tests/unit/test_globals_model.py
@@ -132,7 +132,7 @@ class TestGlobalsModel(TrackerTestWithModel):
forgetracker.model.Ticket, 'bar', rows=0, short_timeout=False, fq=['-deleted_b:true'])
assert gbl._bin_counts_data == [{'summary': 'foo', 'hits': 5}]
assert gbl._bin_counts_expire == now + timedelta(minutes=60)
- assert gbl._bin_counts_invalidated == None
+ assert gbl._bin_counts_invalidated is None
def test_append_new_labels(self):
gbl = Globals()
diff --git a/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py b/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
index 940525363..100b1fe7f 100644
--- a/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
+++ b/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
@@ -294,7 +294,7 @@ class TestTicketModel(TrackerTestWithModel):
ticket.assigned_to_id = User.by_username('test-user-0')._id
t = ticket.move(app2.config)
- assert t.assigned_to_id == None
+ assert t.assigned_to_id is None
assert t.custom_fields['_user_field'] == 'test-user'
assert t.custom_fields['_user_field_2'] == ''
post = Post.query.find(
@@ -359,4 +359,4 @@ class TestTicketModel(TrackerTestWithModel):
assert idx['summary_t'] == 'ticket2'
assert idx['labels_t'] == 'mylabel other'
assert idx['reported_by_s'] == 'test-user'
- assert idx['assigned_to_s'] == None # must exist at least
+ assert idx['assigned_to_s'] is None # must exist at least
diff --git a/ForgeWiki/forgewiki/tests/functional/test_rest.py b/ForgeWiki/forgewiki/tests/functional/test_rest.py
index 0703f7e39..e75a911a5 100644
--- a/ForgeWiki/forgewiki/tests/functional/test_rest.py
+++ b/ForgeWiki/forgewiki/tests/functional/test_rest.py
@@ -94,12 +94,12 @@ class TestWikiApi(TestRestApiBase):
with h.push_config(tg.config, **{'forgewiki.rate_limits': '{}'}):
r = self.api_post('/rest/p/test/wiki/page1/', status=200, **data)
p = Page.query.get(title='page1')
- assert p != None
+ assert p is not None
# Set rate limit to 1 in first hour of project
with h.push_config(tg.config, **{'forgewiki.rate_limits': '{"3600": 1}'}):
r = self.api_post('/rest/p/test/wiki/page2/', status=429, **data)
p = Page.query.get(title='page2')
- assert p == None
+ assert p is None
# http://blog.watchfire.com/wfblog/2011/10/json-based-xss-exploitation.html
def test_json_encoding_security(self):
@@ -139,12 +139,12 @@ class TestWikiHasAccess(TestRestApiBase):
'/rest/p/test/wiki/has_access?user=babadook&perm=read',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
r = self.api_get(
'/rest/p/test/wiki/has_access?user=test-user&perm=jump',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
def test_has_access_not_admin(self):
"""
@@ -161,9 +161,9 @@ class TestWikiHasAccess(TestRestApiBase):
'/rest/p/test/wiki/has_access?user=test-admin&perm=create',
user='root')
assert r.status_int == 200
- assert r.json['result'] == True
+ assert r.json['result'] is True
r = self.api_get(
'/rest/p/test/wiki/has_access?user=test-user&perm=create',
user='root')
assert r.status_int == 200
- assert r.json['result'] == False
+ assert r.json['result'] is False
diff --git a/ForgeWiki/forgewiki/tests/functional/test_root.py b/ForgeWiki/forgewiki/tests/functional/test_root.py
index 8a5e5eee2..b4c20af97 100644
--- a/ForgeWiki/forgewiki/tests/functional/test_root.py
+++ b/ForgeWiki/forgewiki/tests/functional/test_root.py
@@ -900,7 +900,7 @@ class TestRootController(TestController):
dict(text='Some text', title='page1')).follow()
assert 'Some text' in r
p = model.Page.query.get(title='page1')
- assert p != None
+ assert p is not None
# Set rate limit to 1 in first hour of project
with h.push_config(config, **{'forgewiki.rate_limits': '{"3600": 1}'}):
r = self.app.post(
@@ -914,7 +914,7 @@ class TestRootController(TestController):
wf['message'] ==
'Page create/edit rate limit exceeded. Please try again later.')
p = model.Page.query.get(title='page2')
- assert p == None
+ assert p is None
def test_rate_limit_by_user(self):
# also test that multiple edits to a page counts as one page towards the limit
@@ -960,7 +960,7 @@ class TestRootController(TestController):
env = {'username': str(username)}
r = self.app.get('/p/test/wiki/Home/', extra_environ=env)
menu = r.html.find('div', {'id': 'sidebar-admin-menu'})
- assert menu == None
+ assert menu is None
assert_invisible_for('*anonymous')
assert_invisible_for('test-user')