Skip to content
Browse files

Fix tests to go along with changes to conf locations.

  • Loading branch information...
1 parent cf05fda commit ea329f0c47cc7a3074786efc76a35782a3c21f9d @oldpatricka oldpatricka committed Jul 18, 2011
Showing with 3 additions and 3 deletions.
  1. +3 −3 src/python/tests/test_epumgmt_api.py
View
6 src/python/tests/test_epumgmt_api.py
@@ -14,7 +14,7 @@ class FakeOpts:
self.opts.name = "testname"
self.epu_home = tempfile.mkdtemp()
- conf_dir = os.path.join(self.epu_home, "etc/epumgmt")
+ conf_dir = os.path.join(self.epu_home, "etc/")
os.makedirs(conf_dir)
self.main_conf = os.path.join(conf_dir, "main.conf")
self.dirs_conf = os.path.join(conf_dir, "dirs.conf")
@@ -45,7 +45,7 @@ def test_get_default_config(self):
from epumgmt.api import get_default_config
epumgmt_home = "/path/to/epumgmt"
- default_conf_rel = "etc/epumgmt/main.conf"
+ default_conf_rel = "etc/main.conf"
default_config = os.path.join(epumgmt_home, default_conf_rel)
os.environ["EPUMGMT_HOME"] = epumgmt_home
@@ -95,7 +95,7 @@ def test_get_common(self):
try:
get_common()
- except Exception:
+ except:
no_opts_nor_p_exception = True
assert no_opts_nor_p_exception

0 comments on commit ea329f0

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