Codebase list python-castellan / 0c877d4
Merge "Update managed object __eq__ and __ne__" Jenkins authored 8 years ago Gerrit Code Review committed 8 years ago
8 changed file(s) with 124 addition(s) and 22 deletion(s). Raw diff Collapse all Expand all
+1
-0
castellan/common/objects/private_key.py less more
5757 def __eq__(self, other):
5858 if isinstance(other, PrivateKey):
5959 return (self._alg == other._alg and
60 self._bit_length == other._bit_length and
6061 self._key == other._key and
6162 self._name == other._name)
6263 else:
+1
-0
castellan/common/objects/public_key.py less more
5858 def __eq__(self, other):
5959 if isinstance(other, PublicKey):
6060 return (self._alg == other._alg and
61 self._bit_length == other._bit_length and
6162 self._key == other._key and
6263 self._name == other._name)
6364 else:
+10
-4
castellan/tests/unit/objects/test_opaque.py less more
4343
4444 def test___eq__(self):
4545 self.assertTrue(self.opaque_data == self.opaque_data)
46 self.assertTrue(self.opaque_data is self.opaque_data)
4647
4748 self.assertFalse(self.opaque_data is None)
4849 self.assertFalse(None == self.opaque_data)
4950
50 def test___ne__(self):
51 self.assertFalse(self.opaque_data != self.opaque_data)
52 self.assertFalse(self.name != self.name)
51 other_opaque_data = opaque_data.OpaqueData(self.data, self.name)
52 self.assertTrue(self.opaque_data == other_opaque_data)
53 self.assertFalse(self.opaque_data is other_opaque_data)
5354
55 def test___ne___none(self):
5456 self.assertTrue(self.opaque_data is not None)
5557 self.assertTrue(None != self.opaque_data)
5658
57 def test___ne__name(self):
59 def test___ne___data(self):
60 other_opaque = opaque_data.OpaqueData(b'other data', self.name)
61 self.assertTrue(self.opaque_data != other_opaque)
62
63 def test___ne___name(self):
5864 other_opaque = opaque_data.OpaqueData(self.data, "other opaque")
5965 self.assertTrue(self.opaque_data != other_opaque)
+11
-4
castellan/tests/unit/objects/test_passphrase.py less more
4444
4545 def test___eq__(self):
4646 self.assertTrue(self.passphrase == self.passphrase)
47 self.assertTrue(self.passphrase is self.passphrase)
4748
4849 self.assertFalse(self.passphrase is None)
4950 self.assertFalse(None == self.passphrase)
5051
51 def test___ne__(self):
52 self.assertFalse(self.passphrase != self.passphrase)
53 self.assertFalse(self.name != self.name)
52 other_passphrase = passphrase.Passphrase(self.passphrase_data,
53 self.name)
54 self.assertTrue(self.passphrase == other_passphrase)
55 self.assertFalse(self.passphrase is other_passphrase)
5456
57 def test___ne___none(self):
5558 self.assertTrue(self.passphrase is not None)
5659 self.assertTrue(None != self.passphrase)
60
61 def test___ne___data(self):
62 other_phrase = passphrase.Passphrase(b"other passphrase", self.name)
63 self.assertTrue(self.passphrase != other_phrase)
5764
5865 def test___ne__name(self):
5966 other_phrase = passphrase.Passphrase(self.passphrase_data,
6067 "other phrase")
61 self.assertTrue(self.passphrase_data != other_phrase)
68 self.assertTrue(self.passphrase != other_phrase)
+31
-4
castellan/tests/unit/objects/test_private_key.py less more
5454
5555 def test___eq__(self):
5656 self.assertTrue(self.key == self.key)
57 self.assertTrue(self.key is self.key)
5758
5859 self.assertFalse(self.key is None)
5960 self.assertFalse(None == self.key)
6061
61 def test___ne__(self):
62 self.assertFalse(self.key != self.key)
63 self.assertFalse(self.name != self.name)
62 other_key = private_key.PrivateKey(self.algorithm,
63 self.length,
64 self.encoded,
65 self.name)
66 self.assertTrue(self.key == other_key)
67 self.assertFalse(self.key is other_key)
6468
69 def test___ne___none(self):
6570 self.assertTrue(self.key is not None)
6671 self.assertTrue(None != self.key)
6772
68 def test___ne__name(self):
73 def test___ne___algorithm(self):
74 other_key = private_key.PrivateKey('DSA',
75 self.length,
76 self.encoded,
77 self.name)
78 self.assertTrue(self.key != other_key)
79
80 def test___ne___length(self):
81 other_key = private_key.PrivateKey(self.algorithm,
82 4096,
83 self.encoded,
84 self.name)
85 self.assertTrue(self.key != other_key)
86
87 def test___ne___encoded(self):
88 different_encoded = bytes(utils.get_private_key_der()) + b'\x00'
89 other_key = private_key.PrivateKey(self.algorithm,
90 self.length,
91 different_encoded,
92 self.name)
93 self.assertTrue(self.key != other_key)
94
95 def test___ne___name(self):
6996 other_key = private_key.PrivateKey(self.algorithm,
7097 self.length,
7198 self.encoded,
+30
-3
castellan/tests/unit/objects/test_public_key.py less more
5454
5555 def test___eq__(self):
5656 self.assertTrue(self.key == self.key)
57 self.assertTrue(self.key is self.key)
5758
5859 self.assertFalse(self.key is None)
5960 self.assertFalse(None == self.key)
6061
61 def test___ne__(self):
62 self.assertFalse(self.key != self.key)
63 self.assertFalse(self.name != self.name)
62 other_key = public_key.PublicKey(self.algorithm,
63 self.length,
64 self.encoded,
65 self.name)
66 self.assertTrue(self.key == other_key)
67 self.assertFalse(self.key is other_key)
6468
69 def test___ne___none(self):
6570 self.assertTrue(self.key is not None)
6671 self.assertTrue(None != self.key)
72
73 def test___ne___algorithm(self):
74 other_key = public_key.PublicKey('DSA',
75 self.length,
76 self.encoded,
77 self.name)
78 self.assertTrue(self.key != other_key)
79
80 def test___ne___length(self):
81 other_key = public_key.PublicKey(self.algorithm,
82 4096,
83 self.encoded,
84 self.name)
85 self.assertTrue(self.key != other_key)
86
87 def test___ne___encoded(self):
88 different_encoded = bytes(utils.get_public_key_der()) + b'\x00'
89 other_key = public_key.PublicKey(self.algorithm,
90 self.length,
91 different_encoded,
92 self.name)
93 self.assertTrue(self.key != other_key)
6794
6895 def test___ne__name(self):
6996 other_key = public_key.PublicKey(self.algorithm,
+31
-4
castellan/tests/unit/objects/test_symmetric_key.py less more
5353
5454 def test___eq__(self):
5555 self.assertTrue(self.key == self.key)
56 self.assertTrue(self.key is self.key)
5657
5758 self.assertFalse(self.key is None)
5859 self.assertFalse(None == self.key)
5960
60 def test___ne__(self):
61 self.assertFalse(self.key != self.key)
62 self.assertFalse(self.name != self.name)
61 other_key = sym_key.SymmetricKey(self.algorithm,
62 self.bit_length,
63 self.encoded,
64 self.name)
65 self.assertTrue(self.key == other_key)
66 self.assertFalse(self.key is other_key)
6367
68 def test___ne___none(self):
6469 self.assertTrue(self.key is not None)
6570 self.assertTrue(None != self.key)
6671
67 def test___ne__name(self):
72 def test___ne___algorithm(self):
73 other_key = sym_key.SymmetricKey('DES',
74 self.bit_length,
75 self.encoded,
76 self.name)
77 self.assertTrue(self.key != other_key)
78
79 def test___ne___length(self):
80 other_key = sym_key.SymmetricKey(self.algorithm,
81 self.bit_length * 2,
82 self.encoded,
83 self.name)
84 self.assertTrue(self.key != other_key)
85
86 def test___ne___encoded(self):
87 different_encoded = self.encoded * 2
88 other_key = sym_key.SymmetricKey(self.algorithm,
89 self.bit_length,
90 different_encoded,
91 self.name)
92 self.assertTrue(self.key != other_key)
93
94 def test___ne___name(self):
6895 other_key = sym_key.SymmetricKey(self.algorithm,
6996 self.bit_length,
7097 self.encoded,
+9
-3
castellan/tests/unit/objects/test_x_509.py less more
4343
4444 def test___eq__(self):
4545 self.assertTrue(self.cert == self.cert)
46 self.assertTrue(self.cert is self.cert)
4647
4748 self.assertFalse(self.cert is None)
4849 self.assertFalse(None == self.cert)
4950
50 def test___ne__(self):
51 self.assertFalse(self.cert != self.cert)
52 self.assertFalse(self.name != self.name)
51 other_x_509 = x_509.X509(self.data, self.name)
52 self.assertTrue(self.cert == other_x_509)
53 self.assertFalse(self.cert is other_x_509)
5354
55 def test___ne___none(self):
5456 self.assertTrue(self.cert is not None)
5557 self.assertTrue(None != self.cert)
58
59 def test___ne___data(self):
60 other_x509 = x_509.X509(b'\x00\x00\x00', self.name)
61 self.assertTrue(self.cert != other_x509)
5662
5763 def test___ne__name(self):
5864 other_x509 = x_509.X509(self.data, "other x509")