diff options
| author | Loic Dachary <loic@dachary.org> | 2013-09-27 03:58:23 -0700 |
|---|---|---|
| committer | Loic Dachary <loic@dachary.org> | 2013-09-27 03:58:23 -0700 |
| commit | 6347fcf7ddfabf64a7392f8b00ee04cf1c357bfa (patch) | |
| tree | 5ab9afea1508a2cb49d424e6dc38c06711ed9a44 | |
| parent | 0bfda470367e9a5d6be931e31d6e0e74616b3c77 (diff) | |
| parent | e6e8cb8ddd2ca2c058447c0cb93d92cce3275f4a (diff) | |
| download | ceph-6347fcf7ddfabf64a7392f8b00ee04cf1c357bfa.tar.gz | |
Merge pull request #650 from dachary/wip-6425-2
pybind: update osd blacklist tests for nonce
| -rwxr-xr-x | src/test/pybind/test_ceph_argparse.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/test/pybind/test_ceph_argparse.py b/src/test/pybind/test_ceph_argparse.py index fe7c9bacccc..34bcf698e5a 100755 --- a/src/test/pybind/test_ceph_argparse.py +++ b/src/test/pybind/test_ceph_argparse.py @@ -834,20 +834,24 @@ class TestOSD(TestArgparse): def test_blackist(self): for action in ('add', 'rm'): self.assert_valid_command(['osd', 'blacklist', action, - '1.2.3.4/nonce']) + '1.2.3.4/567']) self.assert_valid_command(['osd', 'blacklist', action, - '1.2.3.4/nonce', '600.40']) + '1.2.3.4']) + self.assert_valid_command(['osd', 'blacklist', action, + '1.2.3.4/567', '600.40']) + self.assert_valid_command(['osd', 'blacklist', action, + '1.2.3.4', '600.40']) assert_equal({}, validate_command(sigdict, ['osd', 'blacklist', action, 'invalid', '600.40'])) assert_equal({}, validate_command(sigdict, ['osd', 'blacklist', action, - '1.2.3.4/nonce', + '1.2.3.4/567', '-1.0'])) assert_equal({}, validate_command(sigdict, ['osd', 'blacklist', action, - '1.2.3.4/nonce', + '1.2.3.4/567', '600.40', 'toomany'])) |