Changes in tests/pybin/tools.py [f866d15:09bbe78]

File:

• tests/pybin/tools.py (modified) (1 diff)

tests/pybin/tools.py

@@ -88 +88 @@
                 raise
 
-def is_empty(fname):
-        if not os.path.isfile(fname):
-                return True
-
-        if os.stat(fname).st_size == 0:
-                return True
-
-        return False
-
 def is_ascii(fname):
         if settings.dry_run:
                 print("is_ascii: %s" % fname)
-                return (True, "")
+                return True
 
         if not os.path.isfile(fname):
-                return (False, "No file")
-
-        code, out = sh("file", fname, output_file=subprocess.PIPE)
+                return False
+
+        code, out = sh("file %s" % fname, output_file=subprocess.PIPE)
         if code != 0:
-                return (False, "'file EXPECT' failed with code {}".format(code))
+                return False
 
         match = re.search(".*: (.*)", out)
 
         if not match:
-                return (False, "Unreadable file type: '{}'".format(out))
-
-        if "ASCII text" in match.group(1):
-                return (True, "")
-
-        return (False, "File type should be 'ASCII text', was '{}'".format(match.group(1)))
+                return False
+
+        return match.group(1).startswith("ASCII text")
 
 def is_exe(fname):