From c044b218cb32d7ef2f2aa5db81ebf38ad0dc1049 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sun, 1 Dec 2013 22:21:31 -0800 Subject: [PATCH] Partial revert "mon: osd pool set syntax relaxed, modify unit tests" This reverts commit 08327fed8213a5d24cd642e12b38a171b98924cb, except for the hashpspool bit. We switched back to an integer argument in commit 337195f04653eed8e8f153a5b074f3bd48408998. Signed-off-by: Sage Weil (cherry picked from commit e80ab94bf44e102fcd87d16dc11e38ca4c0eeadb) Reviewed-by: Greg Farnum --- src/test/pybind/test_ceph_argparse.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/test/pybind/test_ceph_argparse.py b/src/test/pybind/test_ceph_argparse.py index 540f690472b02..f8e3f49fb3380 100755 --- a/src/test/pybind/test_ceph_argparse.py +++ b/src/test/pybind/test_ceph_argparse.py @@ -946,14 +946,20 @@ class TestOSD(TestArgparse): 'pg_num', 'pgp_num', 'crush_ruleset', 'hashpspool'): self.assert_valid_command(['osd', 'pool', - 'set', 'poolname', var, 'value']) + 'set', 'poolname', var, '-1']) assert_equal({}, validate_command(sigdict, ['osd', 'pool', 'set'])) assert_equal({}, validate_command(sigdict, ['osd', 'pool', 'set', 'poolname'])) assert_equal({}, validate_command(sigdict, ['osd', 'pool', 'set', 'poolname', - 'size', 'value', + 'size', 'invalid'])) + assert_equal({}, validate_command(sigdict, ['osd', 'pool', + 'set', 'poolname', + 'invalid', '-1'])) + assert_equal({}, validate_command(sigdict, ['osd', 'pool', + 'set', 'poolname', + 'size', '-1', 'toomany'])) def test_pool_set_quota(self): -- 2.39.5