mark/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

Remove __self variable

Browse source 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
Nico Schottelius 2012-09-21 20:25:37 +02:00
commit 57ed946414
7 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/cdist/core/code.py
View file

@ -103,7 +103,6 @@ class Code(object):
'__object': cdist_object.absolute_path,
'__object_id': cdist_object.object_id,
'__object_name': cdist_object.name,
'__self': cdist_object.name,
})
return self.local.run_script(script, env=env, return_output=True)

1
lib/cdist/core/manifest.py
View file

@ -96,7 +96,6 @@ class Manifest(object):
'__object': cdist_object.absolute_path,
'__object_id': cdist_object.object_id,
'__object_name': cdist_object.name,
'__self': cdist_object.name,
'__type': cdist_object.cdist_type.absolute_path,
'__cdist_manifest': script,
})

2
lib/cdist/test/code/__init__.py
View file

@ -78,7 +78,6 @@ class CodeTestCase(test.CdistTestCase):
self.assertEqual(output_dict['__object'], self.cdist_object.absolute_path)
self.assertEqual(output_dict['__object_id'], self.cdist_object.object_id)
self.assertEqual(output_dict['__object_name'], self.cdist_object.name)
self.assertEqual(output_dict['__self'], self.cdist_object.name)
def test_run_gencode_remote_environment(self):
output_string = self.code.run_gencode_remote(self.cdist_object)
@ -94,7 +93,6 @@ class CodeTestCase(test.CdistTestCase):
self.assertEqual(output_dict['__object'], self.cdist_object.absolute_path)
self.assertEqual(output_dict['__object_id'], self.cdist_object.object_id)
self.assertEqual(output_dict['__object_name'], self.cdist_object.name)
self.assertEqual(output_dict['__self'], self.cdist_object.name)
def test_transfer_code_remote(self):
self.cdist_object.code_remote = self.code.run_gencode_remote(self.cdist_object)

1
lib/cdist/test/code/fixtures/conf/type/__dump_environment/gencode-local
View file

@ -6,4 +6,3 @@ echo "echo __type: $__type"
echo "echo __object: $__object"
echo "echo __object_id: $__object_id"
echo "echo __object_name: $__object_name"
echo "echo __self: $__self"

1
lib/cdist/test/manifest/__init__.py
View file

@ -101,7 +101,6 @@ class ManifestTestCase(test.CdistTestCase):
self.assertEqual(output_dict['__object'], cdist_object.absolute_path)
self.assertEqual(output_dict['__object_id'], cdist_object.object_id)
self.assertEqual(output_dict['__object_name'], cdist_object.name)
self.assertEqual(output_dict['__self'], cdist_object.name)
def test_debug_env_setup(self):
self.log.setLevel(logging.DEBUG)