From 10d60b35ce384d4b73fd63939aa65b07e9032a12 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Mon, 20 May 2013 11:10:43 -0400 Subject: fixed unit tests --- src/lib/Bcfg2/Server/Core.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/lib/Bcfg2/Server/Core.py') diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py index e356a0b4d..d61543256 100644 --- a/src/lib/Bcfg2/Server/Core.py +++ b/src/lib/Bcfg2/Server/Core.py @@ -140,7 +140,7 @@ class BaseCore(object): # enable debugging on the core now. debugging is enabled on # everything else later if self.setup['debug']: - self.set_core_debug(None, setup['debug']) + self.set_core_debug(None, self.setup['debug']) if 'ignore' not in self.setup: self.setup.add_option('ignore', SERVER_FAM_IGNORE) @@ -149,10 +149,7 @@ class BaseCore(object): famargs = dict(filemonitor=self.setup['filemonitor'], debug=self.setup['debug'], ignore=self.setup['ignore']) - try: - filemonitor = \ - Bcfg2.Server.FileMonitor.available[setup['filemonitor']] - except KeyError: + if self.setup['filemonitor'] not in Bcfg2.Server.FileMonitor.available: self.logger.error("File monitor driver %s not available; " "forcing to default" % self.setup['filemonitor']) famargs['filemonitor'] = 'default' -- cgit v1.2.3-1-g7c22