[GNUnet-SVN] r28274 - in gnunet-planetlab/gplmt: contrib/tasklists/planetlab gplmt

[gnunet]

Author: wachs
Date: 2013-07-23 17:25:16 +0200 (Tue, 23 Jul 2013)
New Revision: 28274

Modified:
   
gnunet-planetlab/gplmt/contrib/tasklists/planetlab/planetlab_check_libgcrypt_version.xml
   gnunet-planetlab/gplmt/gplmt/Worker.py
Log:
fix


Modified: 
gnunet-planetlab/gplmt/contrib/tasklists/planetlab/planetlab_check_libgcrypt_version.xml
===================================================================
--- 
gnunet-planetlab/gplmt/contrib/tasklists/planetlab/planetlab_check_libgcrypt_version.xml
    2013-07-23 15:20:46 UTC (rev 28273)
+++ 
gnunet-planetlab/gplmt/contrib/tasklists/planetlab/planetlab_check_libgcrypt_version.xml
    2013-07-23 15:25:16 UTC (rev 28274)
@@ -21,7 +21,7 @@
                    <arguments></arguments> 
                    <timeout>0</timeout> 
                    <expected_return_code>0</expected_return_code>
-                   <expected_output>1.6.0-</expected_output>
+                   <expected_output>1.6.0</expected_output>
                    <stop_on_fail>true</stop_on_fail>
                </run>  
     </sequence>

Modified: gnunet-planetlab/gplmt/gplmt/Worker.py
===================================================================
--- gnunet-planetlab/gplmt/gplmt/Worker.py      2013-07-23 15:20:46 UTC (rev 
28273)
+++ gnunet-planetlab/gplmt/gplmt/Worker.py      2013-07-23 15:25:16 UTC (rev 
28274)
@@ -447,7 +447,7 @@
                 if (output_contained == True):
                     g_logger.log (self.node.hostname + " : Task '"+ task.name 
+ "' expected output '"+task.expected_output+"' was found")
                 else:
-                    g_logger.log (self.node.hostname + " : Task '"+ task.name 
+ "' expected output '"+task.expected_output+"' was not found")
+                    g_logger.log (self.node.hostname + " : Task '"+ task.name 
+ "' expected output '"+task.expected_output+"' was not found in '" + 
output.rstrip() + "'")
                     result = Tasks.Taskresult.output_did_not_match
                     
         if (result == Tasks.Taskresult.success):