From eb5dd5506817f282abc6dece06e6e1cb844b4a58 Mon Sep 17 00:00:00 2001 From: huangjun Date: Tue, 22 Oct 2013 19:16:57 +0800 Subject: [PATCH] test_ceph_argparse.py: No assert_not_in and assert_in in nose.tools Signed-off-by: huangjun --- src/test/pybind/test_ceph_argparse.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/test/pybind/test_ceph_argparse.py b/src/test/pybind/test_ceph_argparse.py index fd680e854e80..f44adf778909 100755 --- a/src/test/pybind/test_ceph_argparse.py +++ b/src/test/pybind/test_ceph_argparse.py @@ -41,7 +41,8 @@ class TestArgparse: def assert_valid_command(self, args): result = validate_command(sigdict, args) - assert_not_in(result, [None, {}]) + assert_not_equal(result,None) + assert_not_equal(result,{}) def check_1_natural_arg(self, prefix, command): self.assert_valid_command([prefix, command, '1']) @@ -621,11 +622,11 @@ class TestOSD(TestArgparse): assert_equal({}, validate_command(sigdict, ['osd', 'crush', setter, 'osd.0'])) - assert_in(validate_command(sigdict, ['osd', 'crush', + ret = validate_command(sigdict, ['osd', 'crush', setter, 'osd.0', - '-1.0']), - [None, {}]) + '-1.0']) + assert ret in [None, {}] assert_equal({}, validate_command(sigdict, ['osd', 'crush', setter, 'osd.0', -- 2.47.3