openstack/castellan
Code Issues Proposed changes

Merge "Update hacking for Python3"

Browse Source
This commit is contained in:
Zuul 2020-04-14 13:21:01 +00:00 committed by Gerrit Code Review
commit 2ae27479f8
11 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
castellan/tests/unit/credentials/test_keystone_password.py
View File

@ -117,7 +117,7 @@ class KeystonePasswordTestCase(base.TestCase):
self.ks_password_credential) self.ks_password_credential)
self.assertFalse(self.ks_password_credential is None) self.assertFalse(self.ks_password_credential is None)
self.assertFalse(None == self.ks_password_credential) self.assertFalse(None == self.ks_password_credential) # noqa: E711
other_ks_password_credential = keystone_password.KeystonePassword( other_ks_password_credential = keystone_password.KeystonePassword(
self.password, self.password,
@ -140,7 +140,7 @@ class KeystonePasswordTestCase(base.TestCase):
def test___ne___none(self): def test___ne___none(self):
self.assertTrue(self.ks_password_credential is not None) self.assertTrue(self.ks_password_credential is not None)
self.assertTrue(None != self.ks_password_credential) self.assertTrue(None != self.ks_password_credential) # noqa: E711
def test___ne___password(self): def test___ne___password(self):
other_password = "wheresmyCat??" other_password = "wheresmyCat??"

4
castellan/tests/unit/credentials/test_keystone_token.py
View File

@ -93,7 +93,7 @@ class KeystoneTokenTestCase(base.TestCase):
self.ks_token_credential) self.ks_token_credential)
self.assertFalse(self.ks_token_credential is None) self.assertFalse(self.ks_token_credential is None)
self.assertFalse(None == self.ks_token_credential) self.assertFalse(None == self.ks_token_credential) # noqa: E711
other_ks_token_credential = keystone_token.KeystoneToken( other_ks_token_credential = keystone_token.KeystoneToken(
self.token, self.token,
@ -112,7 +112,7 @@ class KeystoneTokenTestCase(base.TestCase):
def test___ne___none(self): def test___ne___none(self):
self.assertTrue(self.ks_token_credential is not None) self.assertTrue(self.ks_token_credential is not None)
self.assertTrue(None != self.ks_token_credential) self.assertTrue(None != self.ks_token_credential) # noqa: E711
def test___ne___token(self): def test___ne___token(self):
other_token = "5c59e3217d3d4dd297589b297aee2a6f" other_token = "5c59e3217d3d4dd297589b297aee2a6f"

4
castellan/tests/unit/credentials/test_password.py
View File

@ -46,7 +46,7 @@ class PasswordTestCase(base.TestCase):
self.assertTrue(self.password_credential is self.password_credential) self.assertTrue(self.password_credential is self.password_credential)
self.assertFalse(self.password_credential is None) self.assertFalse(self.password_credential is None)
self.assertFalse(None == self.password_credential) self.assertFalse(None == self.password_credential) # noqa: E711
other_password_credential = password.Password(self.username, other_password_credential = password.Password(self.username,
self.password) self.password)
@ -55,7 +55,7 @@ class PasswordTestCase(base.TestCase):
def test___ne___none(self): def test___ne___none(self):
self.assertTrue(self.password_credential is not None) self.assertTrue(self.password_credential is not None)
self.assertTrue(None != self.password_credential) self.assertTrue(None != self.password_credential) # noqa: E711
def test___ne___username(self): def test___ne___username(self):
other_username = "service" other_username = "service"

4
castellan/tests/unit/credentials/test_token.py
View File

@ -39,7 +39,7 @@ class TokenTestCase(base.TestCase):
self.assertTrue(self.token_credential is self.token_credential) self.assertTrue(self.token_credential is self.token_credential)
self.assertFalse(self.token_credential is None) self.assertFalse(self.token_credential is None)
self.assertFalse(None == self.token_credential) self.assertFalse(None == self.token_credential) # noqa: E711
other_token_credential = token.Token(self.token) other_token_credential = token.Token(self.token)
self.assertTrue(self.token_credential == other_token_credential) self.assertTrue(self.token_credential == other_token_credential)
@ -47,7 +47,7 @@ class TokenTestCase(base.TestCase):
def test___ne___none(self): def test___ne___none(self):
self.assertTrue(self.token_credential is not None) self.assertTrue(self.token_credential is not None)
self.assertTrue(None != self.token_credential) self.assertTrue(None != self.token_credential) # noqa: E711
def test___ne___token(self): def test___ne___token(self):
other_token = "fe32af1fe47e4744a48254e60ae80012" other_token = "fe32af1fe47e4744a48254e60ae80012"

4
castellan/tests/unit/objects/test_opaque.py
View File

@ -67,7 +67,7 @@ class OpaqueDataTestCase(base.TestCase):
self.assertTrue(self.opaque_data is self.opaque_data) self.assertTrue(self.opaque_data is self.opaque_data)
self.assertFalse(self.opaque_data is None) self.assertFalse(self.opaque_data is None)
self.assertFalse(None == self.opaque_data) self.assertFalse(None == self.opaque_data) # noqa: E711
other_opaque_data = opaque_data.OpaqueData(self.data) other_opaque_data = opaque_data.OpaqueData(self.data)
self.assertTrue(self.opaque_data == other_opaque_data) self.assertTrue(self.opaque_data == other_opaque_data)
@ -75,7 +75,7 @@ class OpaqueDataTestCase(base.TestCase):
def test___ne___none(self): def test___ne___none(self):
self.assertTrue(self.opaque_data is not None) self.assertTrue(self.opaque_data is not None)
self.assertTrue(None != self.opaque_data) self.assertTrue(None != self.opaque_data) # noqa: E711
def test___ne___data(self): def test___ne___data(self):
other_opaque = opaque_data.OpaqueData(b'other data', self.name) other_opaque = opaque_data.OpaqueData(b'other data', self.name)

4
castellan/tests/unit/objects/test_passphrase.py
View File

@ -67,7 +67,7 @@ class PassphraseTestCase(base.TestCase):
self.assertTrue(self.passphrase is self.passphrase) self.assertTrue(self.passphrase is self.passphrase)
self.assertFalse(self.passphrase is None) self.assertFalse(self.passphrase is None)
self.assertFalse(None == self.passphrase) self.assertFalse(None == self.passphrase) # noqa: E711
other_passphrase = passphrase.Passphrase(self.passphrase_data) other_passphrase = passphrase.Passphrase(self.passphrase_data)
self.assertTrue(self.passphrase == other_passphrase) self.assertTrue(self.passphrase == other_passphrase)
@ -75,7 +75,7 @@ class PassphraseTestCase(base.TestCase):
def test___ne___none(self): def test___ne___none(self):
self.assertTrue(self.passphrase is not None) self.assertTrue(self.passphrase is not None)
self.assertTrue(None != self.passphrase) self.assertTrue(None != self.passphrase) # noqa: E711
def test___ne___data(self): def test___ne___data(self):
other_phrase = passphrase.Passphrase(b"other passphrase", self.name) other_phrase = passphrase.Passphrase(b"other passphrase", self.name)

4
castellan/tests/unit/objects/test_private_key.py
View File

@ -83,7 +83,7 @@ class PrivateKeyTestCase(base.KeyTestCase):
self.assertTrue(self.key is self.key) self.assertTrue(self.key is self.key)
self.assertFalse(self.key is None) self.assertFalse(self.key is None)
self.assertFalse(None == self.key) self.assertFalse(None == self.key) # noqa: E711
other_key = private_key.PrivateKey(self.algorithm, other_key = private_key.PrivateKey(self.algorithm,
self.bit_length, self.bit_length,
@ -93,7 +93,7 @@ class PrivateKeyTestCase(base.KeyTestCase):
def test___ne___none(self): def test___ne___none(self):
self.assertTrue(self.key is not None) self.assertTrue(self.key is not None)
self.assertTrue(None != self.key) self.assertTrue(None != self.key) # noqa: E711
def test___ne___algorithm(self): def test___ne___algorithm(self):
other_key = private_key.PrivateKey('DSA', other_key = private_key.PrivateKey('DSA',

4
castellan/tests/unit/objects/test_public_key.py
View File

@ -83,7 +83,7 @@ class PublicKeyTestCase(base.KeyTestCase):
self.assertTrue(self.key is self.key) self.assertTrue(self.key is self.key)
self.assertFalse(self.key is None) self.assertFalse(self.key is None)
self.assertFalse(None == self.key) self.assertFalse(None == self.key) # noqa: E711
other_key = public_key.PublicKey(self.algorithm, other_key = public_key.PublicKey(self.algorithm,
self.bit_length, self.bit_length,
@ -93,7 +93,7 @@ class PublicKeyTestCase(base.KeyTestCase):
def test___ne___none(self): def test___ne___none(self):
self.assertTrue(self.key is not None) self.assertTrue(self.key is not None)
self.assertTrue(None != self.key) self.assertTrue(None != self.key) # noqa: E711
def test___ne___algorithm(self): def test___ne___algorithm(self):
other_key = public_key.PublicKey('DSA', other_key = public_key.PublicKey('DSA',

4
castellan/tests/unit/objects/test_symmetric_key.py
View File

@ -82,7 +82,7 @@ class SymmetricKeyTestCase(base.KeyTestCase):
self.assertTrue(self.key is self.key) self.assertTrue(self.key is self.key)
self.assertFalse(self.key is None) self.assertFalse(self.key is None)
self.assertFalse(None == self.key) self.assertFalse(None == self.key) # noqa: E711
other_key = sym_key.SymmetricKey(self.algorithm, other_key = sym_key.SymmetricKey(self.algorithm,
self.bit_length, self.bit_length,
@ -92,7 +92,7 @@ class SymmetricKeyTestCase(base.KeyTestCase):
def test___ne___none(self): def test___ne___none(self):
self.assertTrue(self.key is not None) self.assertTrue(self.key is not None)
self.assertTrue(None != self.key) self.assertTrue(None != self.key) # noqa: E711
def test___ne___algorithm(self): def test___ne___algorithm(self):
other_key = sym_key.SymmetricKey('DES', other_key = sym_key.SymmetricKey('DES',

4
castellan/tests/unit/objects/test_x_509.py
View File

@ -67,7 +67,7 @@ class X509TestCase(base.CertificateTestCase):
self.assertTrue(self.cert is self.cert) self.assertTrue(self.cert is self.cert)
self.assertFalse(self.cert is None) self.assertFalse(self.cert is None)
self.assertFalse(None == self.cert) self.assertFalse(None == self.cert) # noqa: E711
other_x_509 = x_509.X509(self.data) other_x_509 = x_509.X509(self.data)
self.assertTrue(self.cert == other_x_509) self.assertTrue(self.cert == other_x_509)
@ -75,7 +75,7 @@ class X509TestCase(base.CertificateTestCase):
def test___ne___none(self): def test___ne___none(self):
self.assertTrue(self.cert is not None) self.assertTrue(self.cert is not None)
self.assertTrue(None != self.cert) self.assertTrue(None != self.cert) # noqa: E711
def test___ne___data(self): def test___ne___data(self):
other_x509 = x_509.X509(b'\x00\x00\x00', self.name) other_x509 = x_509.X509(b'\x00\x00\x00', self.name)

2
test-requirements.txt
View File

@ -1,7 +1,7 @@
# The order of packages is significant, because pip processes them in the order # The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 hacking>=3.0,<3.1.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0
python-barbicanclient>=4.5.2 # Apache-2.0 python-barbicanclient>=4.5.2 # Apache-2.0