summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-08-20 11:23:46 -0700
committerSage Weil <sage@inktank.com>2013-08-20 11:24:11 -0700
commitf6fe74ff51f679e7245b02462822d9ef1e15d28c (patch)
tree3a0d5f40cda94988668980131ad90a3ffb95d8a8
parent47c89497b7f69cbf1557cd05b89837c388e2ba2f (diff)
downloadceph-f6fe74ff51f679e7245b02462822d9ef1e15d28c.tar.gz
pybind: fix Rados.conf_parse_env test
This happens after we connect, which means we get ENOSYS always. Instead, parse_env inside the normal setup method, which had the added benefit of being able to debug these tests. Backport: dumpling Signed-off-by: Sage Weil <sage@inktank.com> (cherry picked from commit 6ef1970340c57d6e02f947348fb38882b51d131c)
-rw-r--r--src/test/pybind/test_rados.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/test/pybind/test_rados.py b/src/test/pybind/test_rados.py
index a8df299c879..9be4c1eb815 100644
--- a/src/test/pybind/test_rados.py
+++ b/src/test/pybind/test_rados.py
@@ -31,12 +31,6 @@ def test_rados_init():
with Rados(conffile='', name='client.admin'):
pass
-def test_rados_parse_conf():
- with Rados(conffile='', rados_id='admin') as rados:
- rados.parse_env()
- rados.parse_env('FOO_DOES_NOT_EXIST_BLAHBLAH')
- pass
-
def test_ioctx_context_manager():
with Rados(conffile='', rados_id='admin') as conn:
with conn.open_ioctx('data') as ioctx:
@@ -46,6 +40,8 @@ class TestRados(object):
def setUp(self):
self.rados = Rados(conffile='')
+ self.rados.conf_parse_env('FOO_DOES_NOT_EXIST_BLAHBLAH')
+ self.rados.conf_parse_env()
self.rados.connect()
def tearDown(self):