Bug 1127457 - Fix check for zip in devicemanagerADB.py; r=armenzg

mozilla-spidermonkey · Jan 30, 2015 · 27a6017 · 27a6017
1 parent ca8ff78
commit 27a6017
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py b/testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py
@@ -693,8 +693,13 @@ def _isUnzipAvailable(self):
         return False
 
     def _isLocalZipAvailable(self):
+        def _noOutput(line):
+            # suppress output from zip ProcessHandler
+            pass
         try:
-            self._checkCmd(["zip", "-?"])
+            proc = ProcessHandler(["zip", "-?"], storeOutput=False, processOutputLine=_noOutput)
+            proc.run()
+            proc.wait()
         except:
             return False
         return True