Skip to content

Commit

Permalink
Use builtin unittest methods assertIsNone & assertIsNotNone
Browse files Browse the repository at this point in the history 
These methods were introduced in Python 2.7 and 3.1. Available in all
supported environments. Can remove the local reimplementation.

https://docs.python.org/3/library/unittest.html#unittest.TestCase.assertIsNone
https://docs.python.org/2/library/unittest.html#unittest.TestCase.assertIsNone
  • Loading branch information
Jon Dufresne authored and Petr Viktorin committed May 25, 2018
1 parent 5faff53 commit 68a6db6
Show file tree
Hide file tree
Showing 4 changed files with 80 additions and 90 deletions.
132 changes: 63 additions & 69 deletions Tests/t_cext.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,6 @@ def _open_conn(self, bind=True):
self.assertEqual(type(msgid), type(0))
return l

def assertNotNone(self, expr, msg=None):
self.assertFalse(expr is None, msg or repr(expr))

def assertNone(self, expr, msg=None):
self.assertFalse(expr is not None, msg or repr(expr))

# Test for the existence of a whole bunch of constants
# that the C module is supposed to export
def test_constants(self):
Expand All @@ -128,88 +122,88 @@ def test_constants(self):
self.assertEqual(_ldap.RES_SEARCH_REFERENCE, 0x73) # v3
self.assertEqual(_ldap.RES_EXTENDED, 0x78) # v3
#self.assertEqual(_ldap.RES_INTERMEDIATE, 0x79) # v3
self.assertNotNone(_ldap.RES_ANY)
self.assertNotNone(_ldap.RES_UNSOLICITED)
self.assertIsNotNone(_ldap.RES_ANY)
self.assertIsNotNone(_ldap.RES_UNSOLICITED)

self.assertNotNone(_ldap.AUTH_NONE)
self.assertNotNone(_ldap.AUTH_SIMPLE)
self.assertIsNotNone(_ldap.AUTH_NONE)
self.assertIsNotNone(_ldap.AUTH_SIMPLE)

self.assertNotNone(_ldap.SCOPE_BASE)
self.assertNotNone(_ldap.SCOPE_ONELEVEL)
self.assertNotNone(_ldap.SCOPE_SUBTREE)
self.assertIsNotNone(_ldap.SCOPE_BASE)
self.assertIsNotNone(_ldap.SCOPE_ONELEVEL)
self.assertIsNotNone(_ldap.SCOPE_SUBTREE)

self.assertNotNone(_ldap.MOD_ADD)
self.assertNotNone(_ldap.MOD_DELETE)
self.assertNotNone(_ldap.MOD_REPLACE)
self.assertNotNone(_ldap.MOD_INCREMENT)
self.assertNotNone(_ldap.MOD_BVALUES)
self.assertIsNotNone(_ldap.MOD_ADD)
self.assertIsNotNone(_ldap.MOD_DELETE)
self.assertIsNotNone(_ldap.MOD_REPLACE)
self.assertIsNotNone(_ldap.MOD_INCREMENT)
self.assertIsNotNone(_ldap.MOD_BVALUES)

# for result4()
self.assertNotNone(_ldap.MSG_ONE)
self.assertNotNone(_ldap.MSG_ALL)
self.assertNotNone(_ldap.MSG_RECEIVED)
self.assertIsNotNone(_ldap.MSG_ONE)
self.assertIsNotNone(_ldap.MSG_ALL)
self.assertIsNotNone(_ldap.MSG_RECEIVED)

# for OPT_DEFEF
self.assertNotNone(_ldap.DEREF_NEVER)
self.assertNotNone(_ldap.DEREF_SEARCHING)
self.assertNotNone(_ldap.DEREF_FINDING)
self.assertNotNone(_ldap.DEREF_ALWAYS)
self.assertIsNotNone(_ldap.DEREF_NEVER)
self.assertIsNotNone(_ldap.DEREF_SEARCHING)
self.assertIsNotNone(_ldap.DEREF_FINDING)
self.assertIsNotNone(_ldap.DEREF_ALWAYS)

# for OPT_SIZELIMIT, OPT_TIMELIMIT
self.assertNotNone(_ldap.NO_LIMIT)
self.assertIsNotNone(_ldap.NO_LIMIT)

# standard options
self.assertNotNone(_ldap.OPT_API_INFO)
self.assertNotNone(_ldap.OPT_DEREF)
self.assertNotNone(_ldap.OPT_SIZELIMIT)
self.assertNotNone(_ldap.OPT_TIMELIMIT)
self.assertNotNone(_ldap.OPT_REFERRALS)
self.assertNotNone(_ldap.OPT_RESTART)
self.assertNotNone(_ldap.OPT_PROTOCOL_VERSION)
self.assertNotNone(_ldap.OPT_SERVER_CONTROLS)
self.assertNotNone(_ldap.OPT_CLIENT_CONTROLS)
self.assertNotNone(_ldap.OPT_API_FEATURE_INFO)
self.assertNotNone(_ldap.OPT_HOST_NAME)
self.assertNotNone(_ldap.OPT_ERROR_NUMBER) # = OPT_RESULT_CODE
self.assertNotNone(_ldap.OPT_ERROR_STRING) # = OPT_DIAGNOSITIC_MESSAGE
self.assertNotNone(_ldap.OPT_MATCHED_DN)
self.assertIsNotNone(_ldap.OPT_API_INFO)
self.assertIsNotNone(_ldap.OPT_DEREF)
self.assertIsNotNone(_ldap.OPT_SIZELIMIT)
self.assertIsNotNone(_ldap.OPT_TIMELIMIT)
self.assertIsNotNone(_ldap.OPT_REFERRALS)
self.assertIsNotNone(_ldap.OPT_RESTART)
self.assertIsNotNone(_ldap.OPT_PROTOCOL_VERSION)
self.assertIsNotNone(_ldap.OPT_SERVER_CONTROLS)
self.assertIsNotNone(_ldap.OPT_CLIENT_CONTROLS)
self.assertIsNotNone(_ldap.OPT_API_FEATURE_INFO)
self.assertIsNotNone(_ldap.OPT_HOST_NAME)
self.assertIsNotNone(_ldap.OPT_ERROR_NUMBER) # = OPT_RESULT_CODE
self.assertIsNotNone(_ldap.OPT_ERROR_STRING) # = OPT_DIAGNOSITIC_MESSAGE
self.assertIsNotNone(_ldap.OPT_MATCHED_DN)

# OpenLDAP specific
self.assertNotNone(_ldap.OPT_DEBUG_LEVEL)
self.assertNotNone(_ldap.OPT_TIMEOUT)
self.assertNotNone(_ldap.OPT_REFHOPLIMIT)
self.assertNotNone(_ldap.OPT_NETWORK_TIMEOUT)
self.assertNotNone(_ldap.OPT_URI)
#self.assertNotNone(_ldap.OPT_REFERRAL_URLS)
#self.assertNotNone(_ldap.OPT_SOCKBUF)
#self.assertNotNone(_ldap.OPT_DEFBASE)
#self.assertNotNone(_ldap.OPT_CONNECT_ASYNC)
self.assertIsNotNone(_ldap.OPT_DEBUG_LEVEL)
self.assertIsNotNone(_ldap.OPT_TIMEOUT)
self.assertIsNotNone(_ldap.OPT_REFHOPLIMIT)
self.assertIsNotNone(_ldap.OPT_NETWORK_TIMEOUT)
self.assertIsNotNone(_ldap.OPT_URI)
#self.assertIsNotNone(_ldap.OPT_REFERRAL_URLS)
#self.assertIsNotNone(_ldap.OPT_SOCKBUF)
#self.assertIsNotNone(_ldap.OPT_DEFBASE)
#self.assertIsNotNone(_ldap.OPT_CONNECT_ASYNC)

# str2dn()
self.assertNotNone(_ldap.DN_FORMAT_LDAP)
self.assertNotNone(_ldap.DN_FORMAT_LDAPV3)
self.assertNotNone(_ldap.DN_FORMAT_LDAPV2)
self.assertNotNone(_ldap.DN_FORMAT_DCE)
self.assertNotNone(_ldap.DN_FORMAT_UFN)
self.assertNotNone(_ldap.DN_FORMAT_AD_CANONICAL)
self.assertNotNone(_ldap.DN_FORMAT_MASK)
self.assertNotNone(_ldap.DN_PRETTY)
self.assertNotNone(_ldap.DN_SKIP)
self.assertNotNone(_ldap.DN_P_NOLEADTRAILSPACES)
self.assertNotNone(_ldap.DN_P_NOSPACEAFTERRDN)
self.assertNotNone(_ldap.DN_PEDANTIC)
self.assertNotNone(_ldap.AVA_NULL)
self.assertNotNone(_ldap.AVA_STRING)
self.assertNotNone(_ldap.AVA_BINARY)
self.assertNotNone(_ldap.AVA_NONPRINTABLE)
self.assertIsNotNone(_ldap.DN_FORMAT_LDAP)
self.assertIsNotNone(_ldap.DN_FORMAT_LDAPV3)
self.assertIsNotNone(_ldap.DN_FORMAT_LDAPV2)
self.assertIsNotNone(_ldap.DN_FORMAT_DCE)
self.assertIsNotNone(_ldap.DN_FORMAT_UFN)
self.assertIsNotNone(_ldap.DN_FORMAT_AD_CANONICAL)
self.assertIsNotNone(_ldap.DN_FORMAT_MASK)
self.assertIsNotNone(_ldap.DN_PRETTY)
self.assertIsNotNone(_ldap.DN_SKIP)
self.assertIsNotNone(_ldap.DN_P_NOLEADTRAILSPACES)
self.assertIsNotNone(_ldap.DN_P_NOSPACEAFTERRDN)
self.assertIsNotNone(_ldap.DN_PEDANTIC)
self.assertIsNotNone(_ldap.AVA_NULL)
self.assertIsNotNone(_ldap.AVA_STRING)
self.assertIsNotNone(_ldap.AVA_BINARY)
self.assertIsNotNone(_ldap.AVA_NONPRINTABLE)

# these two constants are pointless? XXX
self.assertEqual(_ldap.OPT_ON, 1)
self.assertEqual(_ldap.OPT_OFF, 0)

# these constants useless after ldap_url_parse() was dropped XXX
self.assertNotNone(_ldap.URL_ERR_BADSCOPE)
self.assertNotNone(_ldap.URL_ERR_MEM)
self.assertIsNotNone(_ldap.URL_ERR_BADSCOPE)
self.assertIsNotNone(_ldap.URL_ERR_MEM)

def test_test_flags(self):
# test flag, see slapdtest and tox.ini
Expand Down Expand Up @@ -263,7 +257,7 @@ def test_anon_rootdse_search(self):
def test_unbind(self):
l = self._open_conn()
m = l.unbind_ext()
self.assertNone(m)
self.assertIsNone(m)
# Second attempt to unbind should yield an exception
try:
l.unbind_ext()
Expand Down Expand Up @@ -301,7 +295,7 @@ def test_abandon(self):
l = self._open_conn()
m = l.search_ext(self.server.suffix, _ldap.SCOPE_SUBTREE, '(objectClass=*)')
ret = l.abandon_ext(m)
self.assertNone(ret)
self.assertIsNone(ret)
try:
r = l.result4(m, _ldap.MSG_ALL, 0.3) # (timeout /could/ be longer)
except _ldap.TIMEOUT as e:
Expand Down
2 changes: 1 addition & 1 deletion Tests/t_cidict.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def test_cidict(self):
cix = ldap.cidict.cidict(data)
self.assertEqual(cix["ABCDEF"], 123)
self.assertEqual(cix.get("ABCDEF", None), 123)
self.assertEqual(cix.get("not existent", None), None)
self.assertIsNone(cix.get("not existent", None))
cix["xYZ"] = 987
self.assertEqual(cix["XyZ"], 987)
self.assertEqual(cix.get("xyz", None), 987)
Expand Down
12 changes: 6 additions & 6 deletions Tests/t_ldap_options.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ def _test_timeout(self, option):
old = self.get_option(option)
try:
self.set_option(option, None)
self.assertEqual(self.get_option(option), None)
self.assertIsNone(self.get_option(option))
self.set_option(option, -1)
self.assertEqual(self.get_option(option), None)
self.assertIsNone(self.get_option(option))
finally:
self.set_option(option, old)

Expand Down Expand Up @@ -168,16 +168,16 @@ def test_network_timeout_attribute(self):
self.assertEqual(self.get_option(option), 5)

self.conn.network_timeout = -1
self.assertEqual(self.conn.network_timeout, None)
self.assertEqual(self.get_option(option), None)
self.assertIsNone(self.conn.network_timeout)
self.assertIsNone(self.get_option(option))

self.conn.network_timeout = 10.5
self.assertEqual(self.conn.network_timeout, 10.5)
self.assertEqual(self.get_option(option), 10.5)

self.conn.network_timeout = None
self.assertEqual(self.conn.network_timeout, None)
self.assertEqual(self.get_option(option), None)
self.assertIsNone(self.conn.network_timeout)
self.assertIsNone(self.get_option(option))
finally:
self.set_option(option, old)

Expand Down
24 changes: 10 additions & 14 deletions Tests/t_ldapurl.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,10 +183,6 @@ def test_ldapurl(self):


class TestLDAPUrl(unittest.TestCase):

def assertNone(self, expr, msg=None):
self.assertFalse(expr is not None, msg or ("%r" % expr))

def test_combo(self):
u = MyLDAPUrl(
"ldap://127.0.0.1:1234/dc=example,dc=com"
Expand Down Expand Up @@ -223,15 +219,15 @@ def test_parse_empty_dn(self):

def test_parse_default_attrs(self):
u = LDAPUrl("ldap://")
self.assertNone(u.attrs)
self.assertIsNone(u.attrs)

def test_parse_default_scope(self):
u = LDAPUrl("ldap://")
self.assertNone(u.scope) # RFC4516 s3
self.assertIsNone(u.scope) # RFC4516 s3

def test_parse_default_filter(self):
u = LDAPUrl("ldap://")
self.assertNone(u.filterstr) # RFC4516 s3
self.assertIsNone(u.filterstr) # RFC4516 s3

def test_parse_default_extensions(self):
u = LDAPUrl("ldap://")
Expand Down Expand Up @@ -285,9 +281,9 @@ def test_parse_dn(self):

def test_parse_attrs(self):
u = LDAPUrl("ldap:///?")
self.assertEqual(u.attrs, None)
self.assertIsNone(u.attrs)
u = LDAPUrl("ldap:///??")
self.assertEqual(u.attrs, None)
self.assertIsNone(u.attrs)
u = LDAPUrl("ldap:///?*?")
self.assertEqual(u.attrs, ['*'])
u = LDAPUrl("ldap:///?*,*?")
Expand All @@ -303,9 +299,9 @@ def test_parse_attrs(self):

def test_parse_scope_default(self):
u = LDAPUrl("ldap:///??")
self.assertNone(u.scope) # on opposite to RFC4516 s3 for referral chasing
self.assertIsNone(u.scope) # on opposite to RFC4516 s3 for referral chasing
u = LDAPUrl("ldap:///???")
self.assertNone(u.scope) # on opposite to RFC4516 s3 for referral chasing
self.assertIsNone(u.scope) # on opposite to RFC4516 s3 for referral chasing

def test_parse_scope(self):
u = LDAPUrl("ldap:///??sub")
Expand Down Expand Up @@ -355,8 +351,8 @@ def test_parse_filter(self):

def test_parse_extensions(self):
u = LDAPUrl("ldap:///????")
self.assertNone(u.extensions)
self.assertNone(u.who)
self.assertIsNone(u.extensions)
self.assertIsNone(u.who)
u = LDAPUrl("ldap:///????bindname=cn=root")
self.assertEqual(len(u.extensions), 1)
self.assertEqual(u.who, "cn=root")
Expand All @@ -380,7 +376,7 @@ def test_parse_extensions_5questions(self):
def test_parse_extensions_novalue(self):
u = LDAPUrl("ldap:///????bindname")
self.assertEqual(len(u.extensions), 1)
self.assertNone(u.who)
self.assertIsNone(u.who)

@unittest.expectedFailure
def test_bad_urls(self):
Expand Down

0 comments on commit 68a6db6

Please sign in to comment.