Skip to content
This repository
Browse code

Fix tests to go along with changes to conf locations.

  • Loading branch information...
commit ea329f0c47cc7a3074786efc76a35782a3c21f9d 1 parent cf05fda
Patrick Armstrong authored July 18, 2011

Showing 1 changed file with 3 additions and 3 deletions. Show diff stats Hide diff stats

  1. 6  src/python/tests/test_epumgmt_api.py
6  src/python/tests/test_epumgmt_api.py
@@ -14,7 +14,7 @@ class FakeOpts:
14 14
         self.opts.name = "testname"
15 15
 
16 16
         self.epu_home = tempfile.mkdtemp()
17  
-        conf_dir = os.path.join(self.epu_home, "etc/epumgmt")
  17
+        conf_dir = os.path.join(self.epu_home, "etc/")
18 18
         os.makedirs(conf_dir)
19 19
         self.main_conf = os.path.join(conf_dir, "main.conf")
20 20
         self.dirs_conf = os.path.join(conf_dir, "dirs.conf")
@@ -45,7 +45,7 @@ def test_get_default_config(self):
45 45
         from epumgmt.api import get_default_config
46 46
 
47 47
         epumgmt_home = "/path/to/epumgmt"
48  
-        default_conf_rel = "etc/epumgmt/main.conf"
  48
+        default_conf_rel = "etc/main.conf"
49 49
         default_config = os.path.join(epumgmt_home, default_conf_rel)
50 50
         os.environ["EPUMGMT_HOME"] = epumgmt_home
51 51
 
@@ -95,7 +95,7 @@ def test_get_common(self):
95 95
 
96 96
         try:
97 97
             get_common()
98  
-        except Exception:
  98
+        except:
99 99
             no_opts_nor_p_exception = True
100 100
 
101 101
         assert no_opts_nor_p_exception

0 notes on commit ea329f0

Please sign in to comment.
Something went wrong with that request. Please try again.