Merge pull request #1416 from ldoktor/root-crash

avocado: Remote and html bugfixes

avocado/core/html.py

@@ -182,9 +182,9 @@ class ReportModel(object):
                     sysinfo_dict['contents'] = sysinfo_file.read()
                     sysinfo_dict['element_id'] = '%s_heading_%s' % (phase, s_id)
                     sysinfo_dict['collapse_id'] = '%s_collapse_%s' % (phase, s_id)
-            except OSError:
-                sysinfo_dict[s_f] = ('Error reading sysinfo file %s' %
-                                     sysinfo_path)
+            except (OSError, UnicodeDecodeError) as details:
+                sysinfo_dict[s_f] = ('Error reading sysinfo file %s: %s' %
+                                     (sysinfo_path, details))
             sysinfo_list.append(sysinfo_dict)
             s_id += 1
         return sysinfo_list

avocado/core/remote/runner.py

@@ -42,7 +42,7 @@ class RemoteTestRunner(TestRunner):
 
     # Let's use re.MULTILINE because sometimes servers might have MOTD
     # that will introduce a line break on output.
-    remote_version_re = re.compile(r'^Avocado (\d+)\.(\d+)$',
+    remote_version_re = re.compile(r'^Avocado (\d+)\.(\d+)\r?$',
                                    re.MULTILINE)
 
     def __init__(self, job, test_result):