From 9c96e5f87785b5a44c7b269933bbc657b900290e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 11 May 2016 09:09:42 +0530
Subject: [PATCH] Remove obsolete build test for win_pnp_drives

---
 src/calibre/test_build.py | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/calibre/test_build.py b/src/calibre/test_build.py
index ed99d09bf6..de3182bd8b 100644
--- a/src/calibre/test_build.py
+++ b/src/calibre/test_build.py
@@ -101,17 +101,12 @@ def test_fsevents():
     fprint('macfsevents OK!')
 
 def test_winutil():
-    from calibre.devices.scanner import win_pnp_drives
     from calibre.constants import plugins
     winutil = plugins['winutil'][0]
-    try:
-        matches = win_pnp_drives.scanner()
-    except winutil.DriveError:
-        fprint('No removable drives found, skipping win_pnp_drives test!')
-        return
-    if len(matches) < 1:
-        raise RuntimeError('win_pnp_drives returned no drives')
-    fprint('win_pnp_drives OK!')
+    for x in winutil.argv():
+        if not isinstance(x, unicode):
+            raise ValueError('argv() not returning unicode string')
+    fprint('winutil OK!')
 
 def test_sqlite():
     import sqlite3