Merge pull request #47680 from rallytime/merge-2018.3

[2018.3] Merge forward from 2018.3.1 to 2018.3
saltstack · May 17, 2018 · b91c0f5 · b91c0f5
2 parents dbf12f9 + 9b1773a
commit b91c0f5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/tests/integration/modules/test_pip.py b/tests/integration/modules/test_pip.py
@@ -11,7 +11,6 @@
 import os
 import re
 import shutil
-import sys
 import tempfile
 
 # Import Salt Testing libs
@@ -75,8 +74,7 @@ def test_issue_2087_missing_pip(self):
 
         # Let's remove the pip binary
         pip_bin = os.path.join(self.venv_dir, 'bin', 'pip')
-        py_dir = 'python{0}.{1}'.format(*sys.version_info[:2])
-        site_dir = os.path.join(self.venv_dir, 'lib', py_dir, 'site-packages')
+        site_dir = self.run_function('virtualenv.get_distribution_path', [self.venv_dir, 'pip'])
         if salt.utils.platform.is_windows():
             pip_bin = os.path.join(self.venv_dir, 'Scripts', 'pip.exe')
             site_dir = os.path.join(self.venv_dir, 'lib', 'site-packages')

diff --git a/tests/integration/states/test_pip_state.py b/tests/integration/states/test_pip_state.py
@@ -240,8 +240,7 @@ def test_issue_2087_missing_pip(self):
 
             # Let's remove the pip binary
             pip_bin = os.path.join(venv_dir, 'bin', 'pip')
-            py_dir = 'python{0}.{1}'.format(*sys.version_info[:2])
-            site_dir = os.path.join(venv_dir, 'lib', py_dir, 'site-packages')
+            site_dir = self.run_function('virtualenv.get_distribution_path', [venv_dir, 'pip'])
             if salt.utils.platform.is_windows():
                 pip_bin = os.path.join(venv_dir, 'Scripts', 'pip.exe')
                 site_dir = os.path.join(venv_dir, 'lib', 'site-packages')