]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
test: use older names for module setup/teardown
authorJosh Durgin <josh.durgin@inktank.com>
Thu, 21 Nov 2013 02:35:34 +0000 (18:35 -0800)
committerJosh Durgin <josh.durgin@inktank.com>
Wed, 2 Apr 2014 20:54:10 +0000 (13:54 -0700)
setUp and tearDown require nosetests 0.11, but 0.10.4 is the latest on
centos. Rename to use the older aliases, which still work with newer
versions of nosetests as well.

Fixes: #6368
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
(cherry picked from commit f753d56a9edba6ce441520ac9b52b93bd8f1b5b4)

src/test/pybind/test_rbd.py

index 123d0bff457ff67f5066b5e5e077db0c675fc162..e098805b6157149fcd366b8e2d555635612c440e 100644 (file)
@@ -19,7 +19,7 @@ IMG_NAME = 'foo'
 IMG_SIZE = 8 << 20 # 8 MiB
 IMG_ORDER = 22 # 4 MiB objects
 
-def setUp():
+def setup_module():
     global rados
     rados = Rados(conffile='')
     rados.connect()
@@ -31,7 +31,7 @@ def setUp():
     if features is not None:
         features = int(features)
 
-def tearDown():
+def teardown_module():
     global ioctx
     ioctx.__del__()
     global rados