Merge m-c to a CLOSED TREE autoland
authorPhil Ringnalda <philringnalda@gmail.com>
Wed, 31 May 2017 23:40:53 -0700
changeset 361696 3f23b184c4af4506e8a2214f4e3ec24d4ce025c2
parent 361695 614f1d397f4b1b87725a9ac7520d429f7af3970f (current diff)
parent 361677 bdb2387396b4a74dfefb7c983733eed3625e906a (diff)
child 361697 582b3347c32b39981ce859bc6db99f19684ad361
push id31939
push usercbook@mozilla.com
push dateThu, 01 Jun 2017 11:49:28 +0000
treeherdermozilla-central@d96110d76619 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone55.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
Merge m-c to a CLOSED TREE autoland MozReview-Commit-ID: AOUyvYh643g
--- a/testing/mozharness/mozharness/base/python.py
+++ b/testing/mozharness/mozharness/base/python.py
@@ -422,16 +422,17 @@ class VirtualenvMixin(object):
 
         if os.path.exists(self.query_python_path()):
             self.info("Virtualenv %s appears to already exist; skipping virtualenv creation." % self.query_python_path())
         else:
             self.mkdir_p(dirs['abs_work_dir'])
             self.run_command(virtualenv + virtualenv_options + [venv_path],
                              cwd=dirs['abs_work_dir'],
                              error_list=VirtualenvErrorList,
+                             partial_env={'VIRTUALENV_NO_DOWNLOAD': "1"},
                              halt_on_failure=True)
 
         # Resolve the pip version so we can conditionally do things if we have
         # a modern pip.
         pip = self.query_python_path('pip')
         output = self.get_output_from_command([pip, '--version'],
                                               halt_on_failure=True)
         words = output.split()
--- a/xpcom/threads/nsThread.cpp
+++ b/xpcom/threads/nsThread.cpp
@@ -1041,18 +1041,17 @@ NS_IMETHODIMP
 nsThread::HasPendingEvents(bool* aResult)
 {
   if (NS_WARN_IF(PR_GetCurrentThread() != mThread)) {
     return NS_ERROR_NOT_SAME_THREAD;
   }
 
   {
     MutexAutoLock lock(mLock);
-    *aResult = mEvents->HasPendingEvent(lock) ||
-               mIdleEvents.HasPendingEvent(lock);
+    *aResult = mEvents->HasPendingEvent(lock);
   }
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsThread::RegisterIdlePeriod(already_AddRefed<nsIIdlePeriod> aIdlePeriod)
 {
   if (NS_WARN_IF(PR_GetCurrentThread() != mThread)) {