From e346c288866d10727df075933ff62abcd84253df Mon Sep 17 00:00:00 2001
From: Adrian Sampson <adrian@radbox.org>
Date: Fri, 10 Jun 2016 15:29:13 -0700
Subject: [PATCH] ImageMagick check uses `convert`, not `identify`

See #670 for details. This reverts a change from
a0c38a07a6d99ae8bb7461f1122ee34d70d2cd65. This caused problems on
Windows, but the fundamental problem is more general.
---
 beets/util/artresizer.py | 8 +++++---
 test/test_embedart.py    | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/beets/util/artresizer.py b/beets/util/artresizer.py
index 11a1fac28..8f7ae7514 100644
--- a/beets/util/artresizer.py
+++ b/beets/util/artresizer.py
@@ -231,9 +231,10 @@ class ArtResizer(object):
 
 def get_im_version():
     """Return Image Magick version or None if it is unavailable
-    Try invoking ImageMagick's "convert"."""
+    Try invoking ImageMagick's "convert".
+    """
     try:
-        out = util.command_output([b'identify', b'--version'])
+        out = util.command_output([b'convert', b'--version'])
 
         if b'imagemagick' in out.lower():
             pattern = br".+ (\d+)\.(\d+)\.(\d+).*"
@@ -244,7 +245,8 @@ def get_im_version():
                         int(match.group(3)))
             return (0,)
 
-    except (subprocess.CalledProcessError, OSError):
+    except (subprocess.CalledProcessError, OSError) as exc:
+        log.debug(u'ImageMagick check `convert --version` failed: {}', exc)
         return None
 
 
diff --git a/test/test_embedart.py b/test/test_embedart.py
index dbad87968..27939112b 100644
--- a/test/test_embedart.py
+++ b/test/test_embedart.py
@@ -35,7 +35,7 @@ def require_artresizer_compare(test):
 
     def wrapper(*args, **kwargs):
         if not ArtResizer.shared.can_compare:
-            raise unittest.SkipTest()
+            raise unittest.SkipTest("compare not available")
         else:
             return test(*args, **kwargs)