Merge remote-tracking branch 'pandawei/runner-undefined-name'

avocado/core/remote/runner.py

@@ -150,7 +150,7 @@ class RemoteTestRunner(TestRunner):
                 break
         else:
             raise ValueError("Could not find the beginning of the remote JSON"
-                             " output:\n%s" % result.stdout)
+                             " output:\n%s" % output)
         if json_result.endswith('}'):   # probably single-line
             try:
                 response = json.loads(json_result)
@@ -168,7 +168,7 @@ class RemoteTestRunner(TestRunner):
                         pass
         if not response:
             raise ValueError("Could not find the end of the remote JSON "
-                             "output:\n%s" % result.stdout)
+                             "output:\n%s" % output)
         return response
 
     def run_test(self, urls, timeout):

avocado/utils/archive.py

@@ -175,8 +175,11 @@ class ArchiveFile(object):
         for path, info in self._engine.NameToInfo.iteritems():
             dst = os.path.join(dst_dir, path)
             if not os.path.exists(dst):
-                LOG.warn("Paths in this zip file are stored in unsupported "
-                         "format, not updating the attributes. (%s)", msg)
+                LOG.warn("One or more files in the ZIP archive '%s' could "
+                         "not be found after extraction. Their paths are "
+                         "probably stored in unsupported format and their "
+                         "attributes are not going to be updated",
+                         self.filename)
                 return
             attr = info.external_attr >> 16
             if attr & stat.S_IFLNK == stat.S_IFLNK: