diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-05 13:26:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-05 13:26:37 +0000 |
| commit | 1a83c02299dc9331ec5e973145ff22ebb6efcd22 (patch) | |
| tree | dcef42c5f44ea3ea9c731ec1a9bb6f4ba300cc5a /nova/tests | |
| parent | 899d518aec818bc7609f523baa6bc1dfd45d2ece (diff) | |
| parent | 481c314d6a54965fe6e0972995c6ad9afa86a908 (diff) | |
Merge "Standarize ip validation along the code"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/api/test_validator.py | 8 | ||||
| -rw-r--r-- | nova/tests/test_utils.py | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/nova/tests/api/test_validator.py b/nova/tests/api/test_validator.py index 132e67e95..93a7deb66 100644 --- a/nova/tests/api/test_validator.py +++ b/nova/tests/api/test_validator.py @@ -73,14 +73,6 @@ class ValidatorTestCase(test.TestCase): self.assertFalse(validator.validate_ec2_id(1234)) self.assertTrue(validator.validate_ec2_id('i-284f3a41')) - def test_validate_ipv4(self): - self.assertTrue(validator.validate_ipv4('4.2.2.4')) - self.assertFalse(validator.validate_ipv4('foobar')) - self.assertFalse( - validator.validate_ipv4('2001:5a8:4:68e0:e6ce:8fff:fe27:d116')) - self.assertFalse(validator.validate_ipv4(123)) - self.assertFalse(validator.validate_ipv4('')) - def test_validate_url_path(self): self.assertTrue(validator.validate_url_path('/path/to/file')) self.assertFalse(validator.validate_url_path('path/to/file')) diff --git a/nova/tests/test_utils.py b/nova/tests/test_utils.py index 2c2c58db9..e71090ceb 100644 --- a/nova/tests/test_utils.py +++ b/nova/tests/test_utils.py @@ -515,6 +515,8 @@ class GenericUtilsTestCase(test.TestCase): self.assertTrue(utils.is_valid_ipv4('127.0.0.1')) self.assertFalse(utils.is_valid_ipv4('::1')) self.assertFalse(utils.is_valid_ipv4('bacon')) + self.assertFalse(utils.is_valid_ipv4("")) + self.assertFalse(utils.is_valid_ipv4(10)) def test_is_valid_ipv6(self): self.assertTrue(utils.is_valid_ipv6("::1")) @@ -524,6 +526,8 @@ class GenericUtilsTestCase(test.TestCase): "0000:0000:0000:0000:0000:0000:0000:0001")) self.assertFalse(utils.is_valid_ipv6("foo")) self.assertFalse(utils.is_valid_ipv6("127.0.0.1")) + self.assertFalse(utils.is_valid_ipv6("")) + self.assertFalse(utils.is_valid_ipv6(10)) def test_is_valid_ipv6_cidr(self): self.assertTrue(utils.is_valid_ipv6_cidr("2600::/64")) |