summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-10-15 10:12:07 -0700
committerSage Weil <sage@inktank.com>2013-10-15 10:12:07 -0700
commit0ad33423f0e6e6823c805d90a531535e04386519 (patch)
tree52bb33481f5dc84b00aaefd0a76feafe590cfe7b
parenta3368cfc5f18fe7e383d70c041e3318adf1ddd01 (diff)
parent08327fed8213a5d24cd642e12b38a171b98924cb (diff)
downloadceph-0ad33423f0e6e6823c805d90a531535e04386519.tar.gz
Merge pull request #717 from dachary/master
mon: osd pool set syntax relaxed, modify unit tests Reviewed-by: Sage Weil <sage@inktank.com>
-rwxr-xr-xsrc/test/pybind/test_ceph_argparse.py13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/test/pybind/test_ceph_argparse.py b/src/test/pybind/test_ceph_argparse.py
index 34bcf698e5a..9b16d91108d 100755
--- a/src/test/pybind/test_ceph_argparse.py
+++ b/src/test/pybind/test_ceph_argparse.py
@@ -941,22 +941,17 @@ class TestOSD(TestArgparse):
def test_pool_set(self):
for var in ('size', 'min_size', 'crash_replay_interval',
- 'pg_num', 'pgp_num', 'crush_ruleset'):
+ 'pg_num', 'pgp_num', 'crush_ruleset',
+ 'hashpspool'):
self.assert_valid_command(['osd', 'pool',
- 'set', 'poolname', var, '-1'])
+ 'set', 'poolname', var, 'value'])
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', 'invalid']))
- assert_equal({}, validate_command(sigdict, ['osd', 'pool',
- 'set', 'poolname',
- 'invalid', '-1']))
- assert_equal({}, validate_command(sigdict, ['osd', 'pool',
- 'set', 'poolname',
- 'size', '-1',
+ 'size', 'value',
'toomany']))
def test_pool_set_quota(self):