Merge branch 'travis_errors'

Signed-off-by: NCleber Rosa <crosa@redhat.com>

avocado/utils/astring.py

@@ -302,7 +302,7 @@ def is_text(data):
     each character.
     """
     if sys.version_info[0] < 3:
-        return isinstance(data, unicode)
+        return isinstance(data, unicode)   # pylint: disable=E0602
     return isinstance(data, str)
 
 

selftests/unit/test_utils_process.py

@@ -172,6 +172,7 @@ class TestProcessRun(unittest.TestCase):
         p = process.run(cmd='ls -l', ignore_status=True)
         self.assertEqual(p.command, expected_command)
 
+    @unittest.skipUnless(os.path.exists('/bin/sudo'))
     @mock.patch.object(path, 'find_command',
                        mock.Mock(return_value='/bin/sudo'))
     @mock.patch.object(os, 'getuid', mock.Mock(return_value=1000))