fancsali/cdist-backup
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

testcases emulator.OverrideTestCase, with some minor bugfixes to make

Browse source 
test work as expected ...
This commit is contained in:
Daniel Heule 2014-02-07 14:24:12 +01:00
commit 60c53e213c
4 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cdist/emulator.py
View file

@ -130,7 +130,6 @@ class Emulator(object):
self.args = parser.parse_args(self.argv[1:])
self.log.debug('Args: %s' % self.args)
def setup_object(self):
# Setup object_id - FIXME: unset / do not setup anymore!
if not self.cdist_type.is_singleton:
@ -146,7 +145,7 @@ class Emulator(object):
if value is not None:
self.parameters[key] = value
if self.cdist_object.exists and not 'CDIST_OVERRIDE' in os.environ:
if self.cdist_object.exists and not 'CDIST_OVERRIDE' in self.env:
if self.cdist_object.parameters != self.parameters:
raise cdist.Error("Object %s already exists with conflicting parameters:\n%s: %s\n%s: %s"
% (self.cdist_object.name, " ".join(self.cdist_object.source), self.cdist_object.parameters, self.object_source, self.parameters)