From b56925d24a7cfd197df358d9226f830f78900dd2 Mon Sep 17 00:00:00 2001 From: Steven Armstrong Date: Wed, 19 Oct 2011 15:15:05 +0200 Subject: [PATCH] /__object_fq/__object_name/ Signed-off-by: Steven Armstrong --- lib/cdist/test/code/__init__.py | 6 ++++-- .../fixtures/conf/type/__dump_environment/gencode-local | 3 ++- lib/cdist/test/manifest/__init__.py | 4 ++-- .../manifest/fixtures/conf/type/__dump_environment/manifest | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/cdist/test/code/__init__.py b/lib/cdist/test/code/__init__.py index c177f49c..68e8a41d 100644 --- a/lib/cdist/test/code/__init__.py +++ b/lib/cdist/test/code/__init__.py @@ -85,7 +85,8 @@ class CodeTestCase(unittest.TestCase): self.assertEqual(output_dict['__type'], self.cdist_type.absolute_path) 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_fq'], self.cdist_object.path) + 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) @@ -100,7 +101,8 @@ class CodeTestCase(unittest.TestCase): self.assertEqual(output_dict['__type'], self.cdist_type.absolute_path) 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_fq'], self.cdist_object.path) + 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) diff --git a/lib/cdist/test/code/fixtures/conf/type/__dump_environment/gencode-local b/lib/cdist/test/code/fixtures/conf/type/__dump_environment/gencode-local index ac292546..ed1265c9 100755 --- a/lib/cdist/test/code/fixtures/conf/type/__dump_environment/gencode-local +++ b/lib/cdist/test/code/fixtures/conf/type/__dump_environment/gencode-local @@ -5,4 +5,5 @@ echo "echo __global: $__global" echo "echo __type: $__type" echo "echo __object: $__object" echo "echo __object_id: $__object_id" -echo "echo __object_fq: $__object_fq" +echo "echo __object_name: $__object_name" +echo "echo __self: $__self" diff --git a/lib/cdist/test/manifest/__init__.py b/lib/cdist/test/manifest/__init__.py index bf573a9c..257311d7 100644 --- a/lib/cdist/test/manifest/__init__.py +++ b/lib/cdist/test/manifest/__init__.py @@ -104,9 +104,9 @@ class ManifestTestCase(unittest.TestCase): self.assertEqual(output_dict['__cdist_type_base_path'], self.local.type_path) self.assertEqual(output_dict['__type'], cdist_type.absolute_path) self.assertEqual(output_dict['__object'], cdist_object.absolute_path) - self.assertEqual(output_dict['__self'], cdist_object.name) self.assertEqual(output_dict['__object_id'], cdist_object.object_id) - self.assertEqual(output_dict['__object_fq'], cdist_object.path) + 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) diff --git a/lib/cdist/test/manifest/fixtures/conf/type/__dump_environment/manifest b/lib/cdist/test/manifest/fixtures/conf/type/__dump_environment/manifest index 212de64d..e135de35 100755 --- a/lib/cdist/test/manifest/fixtures/conf/type/__dump_environment/manifest +++ b/lib/cdist/test/manifest/fixtures/conf/type/__dump_environment/manifest @@ -9,5 +9,5 @@ __type: $__type __self: $__self __object: $__object __object_id: $__object_id -__object_fq: $__object_fq +__object_name: $__object_name DONE