From: huangjun <hjwsm1989@gmail.com>
Date: Tue, 22 Oct 2013 11:16:57 +0000 (+0800)
Subject:   test_ceph_argparse.py: No assert_not_in and assert_in in nose.tools
X-Git-Tag: v0.73~80^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F756%2Fhead;p=ceph.git

  test_ceph_argparse.py: No assert_not_in and assert_in in nose.tools
  Signed-off-by: huangjun  <hjwsm1989@gmail.com>
---

diff --git a/src/test/pybind/test_ceph_argparse.py b/src/test/pybind/test_ceph_argparse.py
index fd680e854e8..f44adf77890 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',