sparrowhawk/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cleanup some logging stuff

Browse source 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
Nico Schottelius 2012-11-07 11:47:26 +01:00
parent 7d57d1df79
commit 1bb3c82d72
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cdist/test/code/__init__.py
View file

@ -20,10 +20,9 @@
# #
# #
import getpass
import os import os
import shutil import shutil
import getpass
import logging
import cdist import cdist
from cdist import core from cdist import core
@ -63,8 +62,6 @@ class CodeTestCase(test.CdistTestCase):
self.cdist_object = core.CdistObject(self.cdist_type, self.local.object_path, 'whatever') self.cdist_object = core.CdistObject(self.cdist_type, self.local.object_path, 'whatever')
self.cdist_object.create() self.cdist_object.create()
self.log = logging.getLogger("cdist")
def tearDown(self): def tearDown(self):
shutil.rmtree(self.out_path) shutil.rmtree(self.out_path)
shutil.rmtree(self.remote_base_path) shutil.rmtree(self.remote_base_path)

3
cdist/test/explorer/__init__.py
View file

@ -23,7 +23,6 @@
import os import os
import shutil import shutil
import getpass import getpass
import logging
import cdist import cdist
from cdist import core from cdist import core
@ -67,8 +66,6 @@ class ExplorerClassTestCase(test.CdistTestCase):
self.local, self.local,
self.remote) self.remote)
self.log = logging.getLogger(self.target_host)
def tearDown(self): def tearDown(self):
shutil.rmtree(self.temp_dir) shutil.rmtree(self.temp_dir)

2
cdist/test/manifest/__init__.py
View file

@ -107,6 +107,8 @@ class ManifestTestCase(test.CdistTestCase):
self.assertEqual(output_dict['__object_name'], cdist_object.name) self.assertEqual(output_dict['__object_name'], cdist_object.name)
def test_debug_env_setup(self): def test_debug_env_setup(self):
current_level = self.log.getEffectiveLevel()
self.log.setLevel(logging.DEBUG) self.log.setLevel(logging.DEBUG)
manifest = cdist.core.manifest.Manifest(self.target_host, self.local) manifest = cdist.core.manifest.Manifest(self.target_host, self.local)
self.assertTrue("__cdist_debug" in manifest.env) self.assertTrue("__cdist_debug" in manifest.env)
self.log.setLevel(current_level)