Use timestamped logger in Updater & SlapOSControler.

slapos/recipe/erp5testnode/SlapOSControler.py

@@ -3,7 +3,12 @@ from xml_marshaller import xml_marshaller
 
 class SlapOSControler(object):
 
-  def __init__(self, config, process_group_pid_set=None):
+  def log(self, message):
+    print message
+
+  def __init__(self, config, process_group_pid_set=None, log=None):
+    if log is not None:
+      self.log = log
     self.config = config
     # By erasing everything, we make sure that we are able to "update"
     # existing profiles. This is quite dirty way to do updates...
@@ -48,7 +53,7 @@ class SlapOSControler(object):
 
   def runSoftwareRelease(self, config, environment, process_group_pid_set=None,
                          stdout=None, stderr=None):
-    print "SlapOSControler.runSoftwareRelease"
+    self.log("SlapOSControler.runSoftwareRelease")
     cpu_count = os.sysconf("SC_NPROCESSORS_ONLN")
     os.putenv('MAKEFLAGS', '-j%s' % cpu_count)
     os.environ['PATH'] = environment['PATH']
@@ -72,7 +77,7 @@ class SlapOSControler(object):
   def runComputerPartition(self, config, environment,
                            process_group_pid_set=None,
                            stdout=None, stderr=None):
-    print "SlapOSControler.runComputerPartition"
+    self.log("SlapOSControler.runComputerPartition")
     slap = slapos.slap.slap()
     slap.registerOpenOrder().request(self.software_profile,
         partition_reference='testing partition',

slapos/recipe/erp5testnode/Updater.py

@@ -53,7 +53,13 @@ class Updater(object):
   realtime_output = True
   stdin = file(os.devnull)
 
-  def __init__(self, repository_path, revision=None, git_binary=None):
+  def log(self, message):
+    print message
+
+  def __init__(self, repository_path, revision=None, git_binary=None,
+      log=None):
+    if log is not None:
+      self.log = log
     self.revision = revision
     self._path_list = []
     self.repository_path = repository_path
@@ -94,7 +100,7 @@ class Updater(object):
     quiet = kw.pop('quiet', False)
     env = kw and dict(os.environ, **kw) or None
     command = format_command(*args, **kw)
-    print '\n$ ' + command
+    self.log('\n$ ' + command)
     sys.stdout.flush()
     p = subprocess.Popen(args, stdin=self.stdin, stdout=subprocess.PIPE,
                          stderr=subprocess.PIPE, env=env,

slapos/recipe/erp5testnode/testnode.py

@@ -169,7 +169,8 @@ branch = %(branch)s
             parameter_list.append(repository_path)
             subprocess.check_call(parameter_list)
           # Make sure we have local repository
-          updater = Updater(repository_path, git_binary=config['git_binary'])
+          updater = Updater(repository_path, git_binary=config['git_binary'],
+            log=log)
           updater.checkout()
           revision = "-".join(updater.getRevision())
           full_revision_list.append('%s=%s' % (repository_id, revision))
@@ -212,7 +213,7 @@ branch = %(branch)s
 
           # Now prepare the installation of SlapOS and create instance
           slapos_controler = SlapOSControler(config,
-            process_group_pid_set=process_group_pid_set)
+            process_group_pid_set=process_group_pid_set, log=log)
           for method_name in ("runSoftwareRelease", "runComputerPartition"):
             stdout, stderr = getInputOutputFileList(config, method_name)
             slapos_method = getattr(slapos_controler, method_name)