mozilla-central: changeset 418400:e4ce7b97291627f2186dc23be0dadd3c56dfe938

author	Gregory Szorc <gps@mozilla.com>
	Tue, 15 May 2018 12:02:46 -0700
changeset 418400	e4ce7b97291627f2186dc23be0dadd3c56dfe938
parent 418399	f288a2c9c4390898a17ad9f964218b52b87d8028
child 418401	f093c57bcc024ad7fbc29b1d00f8352643bfea19
push id	34000
push user	ebalazs@mozilla.com
push date	Wed, 16 May 2018 09:59:58 +0000
treeherder	mozilla-central@dedd25bfd279 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	mshal
bugs	1461221
milestone	62.0a1
first release with	nightly linux32 dedd25bfd279 / 62.0a1 / 20180516100125 / files nightly linux64 dedd25bfd279 / 62.0a1 / 20180516100125 / files nightly mac dedd25bfd279 / 62.0a1 / 20180516100125 / files nightly win32 dedd25bfd279 / 62.0a1 / 20180516100125 / files nightly win64 dedd25bfd279 / 62.0a1 / 20180516100125 / files
last release without	nightly linux32 cf3ee1402348 / 62.0a1 / 20180515100038 / files nightly linux64 cf3ee1402348 / 62.0a1 / 20180515100038 / files nightly mac cf3ee1402348 / 62.0a1 / 20180515100038 / files nightly win32 cf3ee1402348 / 62.0a1 / 20180515100038 / files nightly win64 cf3ee1402348 / 62.0a1 / 20180515100038 / files

--- a/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py
+++ b/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py
@@ -60,16 +60,19 @@ except Exception:
         psutil = None
 
     have_psutil = False
 
 
 def get_disk_io_counters():
     try:
         io_counters = psutil.disk_io_counters()
+
+        if io_counters is None:
+            return PsutilStub().disk_io_counters()
     except RuntimeError:
         io_counters = PsutilStub().disk_io_counters()
 
     return io_counters
 
 
 def _collect(pipe, poll_interval):
     """Collects system metrics.