expand @DATE@

[tests.git] / system / Substrate.py

diff --git a/system/Substrate.py b/system/Substrate.py
index 14cb0ee..8da463c 100644 (file)
--- a/system/Substrate.py
+++ b/system/Substrate.py
@@ -317,7 +317,10 @@ class BuildBox (Box):
         for line in ps_lines:
             if not line.strip() or line.find('PID')>=0: continue
             m=BuildBox.matcher.match(line)
-            if m: self.add_build (m.group('buildname'),m.group('pid'))
+            if m: 
+                date=time.strftime('%Y-%m-%d',time.localtime(time.time()))
+                buildname=m.group('buildname').replace('@DATE@',date)
+                self.add_build (buildname,m.group('pid'))
             else: header('command %r returned line that failed to match'%command)
 
 ############################################################
@@ -719,12 +722,6 @@ class Substrate:
                 freed_vplc_hostname=plc_instance_to_kill.vplcname()
                 message='killing oldest plc instance = %s on %s'%(plc_instance_to_kill.line(),
                                                                   freed_plc_boxname)
-                print '--------------------'
-                for instance in all_plc_instances: print instance.line()
-                print '--------------------'
-                import readline
-                raw_input (message+ " ? ")
-                
                 plc_instance_to_kill.kill()
                 # use this new plcbox if that was the problem
                 if not plc_boxname:
@@ -820,8 +817,6 @@ class Substrate:
                     # kill it
                     message='killing oldest qemu node = %s on %s'%(qemu_instance_to_kill.line(),
                                                                    freed_qemu_boxname)
-                    import readline
-                    raw_input(message+ " ? ")
                     qemu_instance_to_kill.kill()
                     # use these freed resources where needed
                     if not qemu_boxname: