From: Josh Durgin <josh.durgin@inktank.com>
Date: Thu, 21 Nov 2013 02:35:34 +0000 (-0800)
Subject: test: use older names for module setup/teardown
X-Git-Tag: v0.67.8~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=60b7aa96abfe09f7e9a263fa3f9b72c556dee8cb;p=ceph.git

test: use older names for module setup/teardown

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)
---

diff --git a/src/test/pybind/test_rbd.py b/src/test/pybind/test_rbd.py
index 123d0bff457..e098805b615 100644
--- a/src/test/pybind/test_rbd.py
+++ b/src/test/pybind/test_rbd.py
@@ -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