From: Sage Weil <sage@inktank.com>
Date: Tue, 20 Aug 2013 18:23:46 +0000 (-0700)
Subject: pybind: fix Rados.conf_parse_env test
X-Git-Tag: v0.68~34
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6ef1970340c57d6e02f947348fb38882b51d131c;p=ceph.git

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

diff --git a/src/test/pybind/test_rados.py b/src/test/pybind/test_rados.py
index a8df299c879f..9be4c1eb815e 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):