From b14a8a4aa12ea924dc66d99381a6a9747d58f367 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Tue, 24 Oct 2017 12:05:15 -0700 Subject: [PATCH] qa: update test_ceph_argparse to test fs cmds Signed-off-by: Patrick Donnelly --- src/test/pybind/test_ceph_argparse.py | 83 +++++++++------------------ 1 file changed, 26 insertions(+), 57 deletions(-) diff --git a/src/test/pybind/test_ceph_argparse.py b/src/test/pybind/test_ceph_argparse.py index 9759b87d73dfa..09fd83c6b26ba 100755 --- a/src/test/pybind/test_ceph_argparse.py +++ b/src/test/pybind/test_ceph_argparse.py @@ -335,9 +335,6 @@ class TestMDS(TestArgparse): def test_stat(self): self.check_no_arg('mds', 'stat') - def test_dump(self): - self.check_0_or_1_natural_arg('mds', 'dump') - def test_tell(self): self.assert_valid_command(['mds', 'tell', 'someone', @@ -356,21 +353,12 @@ class TestMDS(TestArgparse): assert_equal({}, validate_command(sigdict, ['mds', 'compat', 'show', 'toomany'])) - def test_stop(self): - self.assert_valid_command(['mds', 'stop', 'someone']) - assert_equal({}, validate_command(sigdict, ['mds', 'stop'])) - assert_equal({}, validate_command(sigdict, ['mds', 'stop', - 'someone', 'toomany'])) - def test_deactivate(self): self.assert_valid_command(['mds', 'deactivate', 'someone']) assert_equal({}, validate_command(sigdict, ['mds', 'deactivate'])) assert_equal({}, validate_command(sigdict, ['mds', 'deactivate', 'someone', 'toomany'])) - def test_set_max_mds(self): - self.check_1_natural_arg('mds', 'set_max_mds') - def test_set_state(self): self.assert_valid_command(['mds', 'set_state', '1', '2']) assert_equal({}, validate_command(sigdict, ['mds', 'set_state'])) @@ -399,12 +387,6 @@ class TestMDS(TestArgparse): '--yes-i-really-mean-it', 'toomany'])) - def test_cluster_down(self): - self.check_no_arg('mds', 'cluster_down') - - def test_cluster_up(self): - self.check_no_arg('mds', 'cluster_up') - def test_compat_rm_compat(self): self.assert_valid_command(['mds', 'compat', 'rm_compat', '1']) assert_equal({}, validate_command(sigdict, ['mds', @@ -429,45 +411,6 @@ class TestMDS(TestArgparse): 'compat', 'rm_incompat', '1', '1'])) - def test_mds_set(self): - self.assert_valid_command(['mds', 'set', 'max_mds', '2']) - self.assert_valid_command(['mds', 'set', 'max_file_size', '2']) - self.assert_valid_command(['mds', 'set', 'allow_new_snaps', 'no']) - assert_equal({}, validate_command(sigdict, ['mds', - 'set', - 'invalid'])) - - def test_add_data_pool(self): - self.assert_valid_command(['mds', 'add_data_pool', '1']) - self.assert_valid_command(['mds', 'add_data_pool', 'foo']) - - def test_remove_data_pool(self): - self.assert_valid_command(['mds', 'remove_data_pool', '1']) - self.assert_valid_command(['mds', 'remove_data_pool', 'foo']) - - def test_newfs(self): - self.assert_valid_command(['mds', 'newfs', '1', '2', - '--yes-i-really-mean-it']) - self.assert_valid_command(['mds', 'newfs', '1', '2']) - assert_equal({}, validate_command(sigdict, ['mds', 'newfs'])) - assert_equal({}, validate_command(sigdict, ['mds', 'newfs', '1'])) - assert_equal({}, validate_command(sigdict, ['mds', - 'newfs', - '1', - '2', - '--yes-i-really-mean-it', - 'toomany'])) - assert_equal({}, validate_command(sigdict, ['mds', - 'newfs', - '-1', - '2', - '--yes-i-really-mean-it'])) - assert_equal({}, validate_command(sigdict, ['mds', - 'newfs', - '1', - '-1', - '--yes-i-really-mean-it'])) - class TestFS(TestArgparse): @@ -477,6 +420,31 @@ class TestFS(TestArgparse): def test_fs_new(self): self.assert_valid_command(['fs', 'new', 'default', 'metadata', 'data']) + def test_fs_set_max_mds(self): + self.assert_valid_command(['fs', 'set', 'default', 'max_mds', '1']) + self.assert_valid_command(['fs', 'set', 'default', 'max_mds', '2']) + + def test_fs_set_cluster_down(self): + self.assert_valid_command(['fs', 'set', 'default', 'cluster_down', 'true']) + + def test_fs_set_cluster_up(self): + self.assert_valid_command(['fs', 'set', 'default', 'cluster_down', 'false']) + + def test_fs_set(self): + self.assert_valid_command(['fs', 'set', 'default', 'max_file_size', '2']) + self.assert_valid_command(['fs', 'set', 'default', 'allow_new_snaps', 'no']) + assert_equal({}, validate_command(sigdict, ['fs', + 'set', + 'invalid'])) + + def test_fs_add_data_pool(self): + self.assert_valid_command(['fs', 'add_data_pool', 'default', '1']) + self.assert_valid_command(['fs', 'add_data_pool', 'default', 'foo']) + + def test_fs_remove_data_pool(self): + self.assert_valid_command(['fs', 'rm_data_pool', 'default', '1']) + self.assert_valid_command(['fs', 'rm_data_pool', 'default', 'foo']) + def test_fs_rm(self): self.assert_valid_command(['fs', 'rm', 'default']) self.assert_valid_command(['fs', 'rm', 'default', '--yes-i-really-mean-it']) @@ -491,6 +459,7 @@ class TestFS(TestArgparse): assert_equal({}, validate_command(sigdict, ['fs', 'set-default'])) assert_equal({}, validate_command(sigdict, ['fs', 'set-default', 'cephfs', 'toomany'])) + class TestMon(TestArgparse): def test_dump(self): -- 2.39.5