From 5443db97c4d7199c04dfac5d15d37345d6caa7f1 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Tue, 11 Oct 2011 12:54:55 +0200
Subject: [PATCH] always setup __debug if debug is set

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 doc/dev/todo/tests          | 44 ++++++++++++++++++++++++++++++++-----
 lib/cdist/config_install.py | 28 ++++++++++-------------
 2 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/doc/dev/todo/tests b/doc/dev/todo/tests
index 6fcd1a04..27bca3b6 100644
--- a/doc/dev/todo/tests
+++ b/doc/dev/todo/tests
@@ -1,11 +1,43 @@
-Tests needed:
+Tests needed for config_install:
 
-   - Fail if cache_dir from previous run cannot be deleted
-   - Fail if cache_dir cannot be created from current out_dir
-   - transfer_type_explorers: Explorers are not transferred twice
-   - transfer_type_explorers: No transfer tried if there are no type_explorers
+   __init__():
+      - sets up env: __target_host
+
+   cleanup()
+      - Fail if cache_dir from previous run cannot be deleted
+      - Fail if cache_dir cannot be created from current out_dir
+
+   filter()
+      - ensure logformat is changed: target host is prefixed:
+         LOGLEVEL: target_host: MESSAGE
+
+   run_initial_manifest():
+      - parameter is actually used (from __init__)
+      - ensure changing the manifest actually runs a different manifest
+      -> give ConfigInstall Constructor different manifest
+         -> different manifest is executed.
+      - test all submitted (from core to type manifest) variables:
+         - ENVIRONMENT
+         - they are set
+         - they contain the correct values
+
+   run_type_manifest():
+      - test all submitted (from core to type manifest) variables:
+         - ENVIRONMENT
+         - they are set
+         - they contain the correct values
+   run_manifest():
+      - test all submitted variables:
+         - ENVIRONMENT
+            - including __debug, if debug
+         - they are set
+         - they contain the correct values
+      - does $require work?
+
+   transfer_type_explorers():
+      - Explorers are not transferred twice
+      - No transfer tried if there are no type_explorers
 
-   - does $require work?
    - $whatever should fail if there is no global explorer directory
    - emulator may only be called with __ as prefix - fail otherwise!
 
diff --git a/lib/cdist/config_install.py b/lib/cdist/config_install.py
index 2f1adecd..a286472b 100644
--- a/lib/cdist/config_install.py
+++ b/lib/cdist/config_install.py
@@ -49,20 +49,16 @@ class ConfigInstall:
 
         self.debug          = debug
 
-        # Required for testing
+        # Only required for testing
         self.exec_path      = exec_path
 
         # Configure logging
         log.addFilter(self)
 
         # Base and Temp Base 
-        if base_path:
-            self.base_path = base_path
-        else:
-            self.base_path = os.path.abspath(
-                os.path.join(os.path.dirname(__file__),
-                    os.pardir,
-                    os.pardir))
+        self.base_path = (base_path or
+            self.base_path = os.path.abspath(os.path.join(
+                os.path.dirname(__file__), os.pardir, os.pardir))
 
         # Local input
         self.cache_path             = os.path.join(self.base_path, "cache", 
@@ -74,10 +70,8 @@ class ConfigInstall:
         self.type_base_path         = os.path.join(self.conf_path, "type")
         self.lib_path               = os.path.join(self.base_path, "lib")
 
-        if initial_manifest:
-            self.initial_manifest = initial_manifest
-        else:
-            self.initial_manifest = os.path.join(self.manifest_path, "init")
+        self.initial_manifest = (initial_manifest or
+            os.path.join(self.manifest_path, "init"))
 
         # Local output
         if '__cdist_out_dir' in os.environ:
@@ -108,7 +102,6 @@ class ConfigInstall:
         self.__init_remote_paths()
 
 
-
     def __init_remote_paths(self):
         """Initialise remote directory structure"""
         self.remove_remote_path(self.remote_base_path)
@@ -122,6 +115,7 @@ class ConfigInstall:
         if not os.path.isdir(self.base_path):
             os.mkdir(self.base_path)
             
+        # FIXME: raise more beautiful exception / Steven: handle exception
         os.mkdir(self.out_path)
         os.mkdir(self.global_explorer_out_path)
         os.mkdir(self.bin_path)
@@ -129,6 +123,9 @@ class ConfigInstall:
     def __init_env(self):
         """Environment usable for other stuff"""
         os.environ['__target_host'] = self.target_host
+        if self.debug:
+            os.environ['__debug'] = "yes"
+
 
     def cleanup(self):
         # Do not use in __del__:
@@ -137,6 +134,7 @@ class ConfigInstall:
         # or in the process of being torn down (e.g. the import machinery shutting down)"
         #
         log.debug("Saving " + self.out_path + " to " + self.cache_path)
+        # FIXME: raise more beautiful exception / Steven: handle exception
         # Remove previous cache
         if os.path.exists(self.cache_path):
             shutil.rmtree(self.cache_path)
@@ -182,10 +180,6 @@ class ConfigInstall:
         env['__target_host']            = self.target_host
         env['__global']                 = self.out_path
         
-        # Submit debug flag to manifest, can be used by emulator and types
-        if self.debug:
-            env['__debug']              = "yes"
-
         # Required for recording source in emulator
         env['__cdist_manifest']         = manifest_path