Bug 1596590 - remove unnecessary psutil 5.4.3 specification from desktop_unittest.py r=gbrown
authorEdwin Takahashi <egao@mozilla.com>
Sat, 16 Nov 2019 04:58:02 +0000
changeset 502330 7a28e398b881cca9b105fff733bf72205ec5782f
parent 502329 3e4d6ff8aa5e8c719453d5f3a2b1e67a333f7b5a
child 502331 4fe43f4966b277eb66d5dfcf534329c92d166afb
push id100762
push useregao@mozilla.com
push dateSat, 16 Nov 2019 07:13:56 +0000
treeherderautoland@7a28e398b881 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgbrown
bugs1596590
milestone72.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1596590 - remove unnecessary psutil 5.4.3 specification from desktop_unittest.py r=gbrown Changes: Remove the unnecessary psutil == 5.4.3 specifier in `desktop_unittest.py`. This should be a safe change. Prior to this patch, in a given test task the virtrualenv initialization will first install `psutil==5.6.3`, then proceed to invoke `desktop_unittest.py` where the `psutil==5.4.3` version forces the uninstallation of the newer version to install the older version. Differential Revision: https://phabricator.services.mozilla.com/D53302
testing/mozharness/mozharness/base/python.py
testing/mozharness/scripts/desktop_unittest.py
testing/tools/websocketprocessbridge/websocketprocessbridge_requirements.txt
--- a/testing/mozharness/mozharness/base/python.py
+++ b/testing/mozharness/mozharness/base/python.py
@@ -485,17 +485,17 @@ class ResourceMonitoringMixin(Perfherder
     While we would like to record resource usage for the entirety of a script,
     since we require an external package, we can only record resource usage
     after that package is installed (as part of creating the virtualenv).
     That's just the way things have to be.
     """
     def __init__(self, *args, **kwargs):
         super(ResourceMonitoringMixin, self).__init__(*args, **kwargs)
 
-        self.register_virtualenv_module('psutil>=3.1.1', method='pip',
+        self.register_virtualenv_module('psutil>=5.6.3', method='pip',
                                         optional=True)
         self.register_virtualenv_module('mozsystemmonitor==0.4',
                                         method='pip', optional=True)
         self.register_virtualenv_module('jsonschema==2.5.1',
                                         method='pip')
         self._resource_monitor = None
 
         # 2-tuple of (name, options) to assign Perfherder resource monitor
--- a/testing/mozharness/scripts/desktop_unittest.py
+++ b/testing/mozharness/scripts/desktop_unittest.py
@@ -326,17 +326,16 @@ class DesktopUnittest(TestingMixin, Merc
         else:
             self.abs_res_dir = abs_app_dir
         return self.abs_res_dir
 
     @PreScriptAction('create-virtualenv')
     def _pre_create_virtualenv(self, action):
         dirs = self.query_abs_dirs()
 
-        self.register_virtualenv_module('psutil==5.4.3')
         self.register_virtualenv_module(name='mock')
         self.register_virtualenv_module(name='simplejson')
 
         requirements_files = [os.path.join(dirs['abs_test_install_dir'],
                               'config', 'marionette_requirements.txt')]
 
         if self._query_specified_suites('mochitest') is not None:
             # mochitest is the only thing that needs this
--- a/testing/tools/websocketprocessbridge/websocketprocessbridge_requirements.txt
+++ b/testing/tools/websocketprocessbridge/websocketprocessbridge_requirements.txt
@@ -1,13 +1,13 @@
 # needed by txws, and we'd like pip to get it from the local server before setuptools tries pypi
 six==1.10.0
 
 twisted==10.2.0
 
 # websocket adapter for twisted, might be built into twisted someday
 txws==0.9.1
 
-psutil==5.4.3
+psutil>=5.6.3
 
 # Needed by iceserver
 ipaddr==2.1.11
 passlib==1.6.5