From: Greg Farnum <greg@inktank.com>
Date: Wed, 11 Dec 2013 22:17:25 +0000 (-0800)
Subject: Revert "Partial revert "mon: osd pool set syntax relaxed, modify unit tests""
X-Git-Tag: v0.75~123
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bb50276f2faca0cb37c42477759e666d2e0a557e;p=ceph.git

Revert "Partial revert "mon: osd pool set syntax relaxed, modify unit tests""

This reverts commit e80ab94bf44e102fcd87d16dc11e38ca4c0eeadb.

We accept non-CephInt arguments again, now that we've got the monitors
handling differing APIs intelligently.

Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
---

diff --git a/src/test/pybind/test_ceph_argparse.py b/src/test/pybind/test_ceph_argparse.py
index 37ae0cd746aa..9cd0cd5eb77b 100755
--- a/src/test/pybind/test_ceph_argparse.py
+++ b/src/test/pybind/test_ceph_argparse.py
@@ -948,20 +948,14 @@ class TestOSD(TestArgparse):
                     '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):