x
/
almanach
Code Issues Proposed changes

Remove all remaining usages of hamcrest 

Change-Id: Ia6ebcf8be699c378c812c3a4771d20d62e7c8235
This commit is contained in:
Paul Millette 2017-01-12 13:40:12 -05:00
parent 00ff775da4
commit 308a04d678
4 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
almanach/tests/unit/api/auth/test_private_key_auth.py
View File

@ -12,11 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from hamcrest import assert_that
from hamcrest import calling
from hamcrest import equal_to
from hamcrest import raises
from almanach.api.auth import private_key_auth
from almanach.core import exception
from almanach.tests.unit import base
@ -29,12 +24,10 @@ class TestPrivateKeyAuthentication(base.BaseTestCase):
self.auth_backend = private_key_auth.PrivateKeyAuthentication("my token")
def test_with_correct_token(self):
assert_that(self.auth_backend.validate("my token"), equal_to(True))
self.assertEqual(self.auth_backend.validate("my token"), True)
def test_with_invalid_token(self):
assert_that(calling(self.auth_backend.validate)
.with_args("bad token"), raises(exception.AuthenticationFailureException))
self.assertRaises(exception.AuthenticationFailureException, self.auth_backend.validate, "bad token")
def test_with_empty_token(self):
assert_that(calling(self.auth_backend.validate)
.with_args(None), raises(exception.AuthenticationFailureException))
self.assertRaises(exception.AuthenticationFailureException, self.auth_backend.validate, None)

9
almanach/tests/unit/api/test_auth_adapter.py
View File

@ -12,9 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from hamcrest import assert_that
from hamcrest import instance_of
from almanach.api.auth import keystone_auth
from almanach.api.auth import mixed_auth
from almanach.api.auth import private_key_auth
@ -30,14 +27,14 @@ class TestAuthenticationAdapter(base.BaseTestCase):
def test_assert_that_the_default_backend_is_private_key(self):
adapter = self.auth_adapter.get_authentication_adapter()
assert_that(adapter, instance_of(private_key_auth.PrivateKeyAuthentication))
self.assertIsInstance(adapter, private_key_auth.PrivateKeyAuthentication)
def test_get_keystone_auth_backend(self):
self.config_fixture.config(strategy='keystone', group='auth')
adapter = self.auth_adapter.get_authentication_adapter()
assert_that(adapter, instance_of(keystone_auth.KeystoneAuthentication))
self.assertIsInstance(adapter, keystone_auth.KeystoneAuthentication)
def test_get_mixed_auth_backend(self):
self.config_fixture.config(strategy='token,keystone', group='auth')
adapter = self.auth_adapter.get_authentication_adapter()
assert_that(adapter, instance_of(mixed_auth.MixedAuthentication))
self.assertIsInstance(adapter, mixed_auth.MixedAuthentication)

71
almanach/tests/unit/validators/test_instance_validator.py
View File

@ -14,11 +14,6 @@
import unittest
from hamcrest import assert_that
from hamcrest import calling
from hamcrest import is_
from hamcrest import raises
from almanach.core import exception
from almanach.validators.instance_validator import InstanceValidator
@ -28,62 +23,76 @@ class TestInstanceValidator(unittest.TestCase):
def test_validate_update_with_invalid_attribute(self):
instance_validator = InstanceValidator()
payload = {"invalid attribute": ".."}
assert_that(calling(instance_validator.validate_update).with_args(payload),
raises(exception.InvalidAttributeException))
self.assertRaises(
exception.InvalidAttributeException,
instance_validator.validate_update,
payload
)
def test_validate_update_with_valid_name_attribute(self):
instance_validator = InstanceValidator()
payload = {"name": u"instance name"}
assert_that(instance_validator.validate_update(payload), is_(payload))
self.assertEqual(instance_validator.validate_update(payload), payload)
def test_validate_update_with_invalid_name_attribute(self):
instance_validator = InstanceValidator()
payload = {"name": 123}
assert_that(calling(instance_validator.validate_update).with_args(payload),
raises(exception.InvalidAttributeException))
self.assertRaises(
exception.InvalidAttributeException,
instance_validator.validate_update,
payload
)
def test_validate_update_with_valid_flavor_attribute(self):
instance_validator = InstanceValidator()
payload = {"flavor": u"flavor"}
assert_that(instance_validator.validate_update(payload), is_(payload))
self.assertEqual(instance_validator.validate_update(payload), payload)
def test_validate_update_with_invalid_flavor_attribute(self):
instance_validator = InstanceValidator()
payload = {"flavor": 123}
assert_that(calling(instance_validator.validate_update).with_args(payload),
raises(exception.InvalidAttributeException))
self.assertRaises(
exception.InvalidAttributeException,
instance_validator.validate_update,
payload
)
def test_validate_update_with_valid_start_date(self):
instance_validator = InstanceValidator()
payload = {"start_date": "2015-10-21T16:25:00.000000Z"}
assert_that(instance_validator.validate_update(payload),
is_(payload))
self.assertEqual(instance_validator.validate_update(payload), payload)
def test_validate_update_with_invalid_start_date(self):
instance_validator = InstanceValidator()
payload = {"start_date": "2015-10-21"}
assert_that(calling(instance_validator.validate_update).with_args(payload),
raises(exception.InvalidAttributeException))
self.assertRaises(
exception.InvalidAttributeException,
instance_validator.validate_update,
payload
)
def test_validate_update_with_valid_end_date(self):
instance_validator = InstanceValidator()
payload = {"end_date": "2015-10-21T16:25:00.000000Z"}
assert_that(instance_validator.validate_update(payload),
is_(payload))
self.assertEqual(instance_validator.validate_update(payload), payload)
def test_validate_update_with_invalid_end_date(self):
instance_validator = InstanceValidator()
payload = {"end_date": "2016"}
assert_that(calling(instance_validator.validate_update).with_args(payload),
raises(exception.InvalidAttributeException))
self.assertRaises(
exception.InvalidAttributeException,
instance_validator.validate_update,
payload
)
def test_validate_update_with_valid_os_attribute(self):
instance_validator = InstanceValidator()
@ -95,7 +104,7 @@ class TestInstanceValidator(unittest.TestCase):
}
}
assert_that(instance_validator.validate_update(payload), is_(payload))
self.assertEqual(instance_validator.validate_update(payload), payload)
def test_validate_update_with_invalid_os_attribute(self):
instance_validator = InstanceValidator()
@ -106,8 +115,11 @@ class TestInstanceValidator(unittest.TestCase):
}
}
assert_that(calling(instance_validator.validate_update).with_args(payload),
raises(exception.InvalidAttributeException))
self.assertRaises(
exception.InvalidAttributeException,
instance_validator.validate_update,
payload
)
def test_validate_update_with_valid_metadata_attribute(self):
instance_validator = InstanceValidator()
@ -117,14 +129,14 @@ class TestInstanceValidator(unittest.TestCase):
}
}
assert_that(instance_validator.validate_update(payload), is_(payload))
self.assertEqual(instance_validator.validate_update(payload), payload)
instance_validator = InstanceValidator()
payload = {
"metadata": {}
}
assert_that(instance_validator.validate_update(payload), is_(payload))
self.assertEqual(instance_validator.validate_update(payload), payload)
def test_validate_update_with_invalid_metadata_attribute(self):
instance_validator = InstanceValidator()
@ -132,5 +144,8 @@ class TestInstanceValidator(unittest.TestCase):
"metadata": "foobar"
}
assert_that(calling(instance_validator.validate_update).with_args(payload),
raises(exception.InvalidAttributeException))
self.assertRaises(
exception.InvalidAttributeException,
instance_validator.validate_update,
payload
)

1
test-requirements.txt
View File

@ -1,6 +1,5 @@
flexmock==0.9.4
mongomock==2.0.0
PyHamcrest==1.8.5
nose # LGPL
setuptools>=16.0,!=24.0.0 # PSF/ZPL
sphinx>=1.2.1,!=1.3b1,<1.3 # BSD