commit d1f620fc257270c80f0c1e1985397f975c6c9058
author Chris McDonald <cjmcdonald@chromium.org> Sat Apr 18 09:35:05 2020 -0600
committer Commit Bot <commit-bot@chromium.org> Mon Apr 20 21:39:08 2020 +0000
tree 74484a5f74dcf166ae4c75b2a51aa411b57814b8
parent 320ef427268fbe469cdde5c11c9500ab0086a7c5

pytest: Fix up some unittests to succeed when run in one process

These tests had conditions that were only reliably true when run as an
isolated process.

BUG=chromium:1072136
TEST=`run_pytest -n 0`

Change-Id: Iadad6323c3a064686fae62d80cad0b7864c9fa2c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2156930
Tested-by: Chris McDonald <cjmcdonald@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Chris McDonald <cjmcdonald@chromium.org>

scripts/virtualenv_wrapper_unittest.py

diff --git a/scripts/virtualenv_wrapper_unittest.py b/scripts/virtualenv_wrapper_unittest.py
index 2e8aae9..b1b79ba 100644
--- a/scripts/virtualenv_wrapper_unittest.py
+++ b/scripts/virtualenv_wrapper_unittest.py
@@ -37,8 +37,9 @@
   def testInsideVenv(self):
     """Test that we are inside a virtualenv."""
     # pylint: disable=protected-access
-    self.assertTrue(virtualenv_wrapper._IsInsideVenv(os.environ))
-
+    self.assertTrue(
+        (hasattr(sys, 'real_prefix') or
+         (hasattr(sys, 'base_prefix') and sys.base_prefix != sys.prefix)))
 
   def testVenvMarkers(self):
     """Test that the virtualenv marker functions work."""