Merge m-c to a CLOSED TREE m-i
authorPhil Ringnalda <philringnalda@gmail.com>
Wed, 31 May 2017 23:41:56 -0700
changeset 409876 0f04ee5c2e1c916ae454c911bcead18a04927460
parent 409875 86118b6e455a69325eff54fb8160bd28f113f0a9 (current diff)
parent 409794 bdb2387396b4a74dfefb7c983733eed3625e906a (diff)
child 409877 0bcea6bac1797e14b00af45cc7c368d12460ab7f
child 409904 d7b4edc492490251642bc0e35b244147b31b72e9
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [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 m-i MozReview-Commit-ID: BrsSHyBv1nf
--- 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)) {