Use KNOWN_BINARY_NAMES from salt.modules.virtualenv

tests/integration/__init__.py

@@ -65,15 +65,6 @@ TMP_STATE_TREE = os.path.join(SYS_TMP_DIR, 'salt-temp-state-tree')
 TMP_PRODENV_STATE_TREE = os.path.join(SYS_TMP_DIR, 'salt-temp-prodenv-state-tree')
 TMP_CONF_DIR = os.path.join(TMP, 'config')
 
-KNOWN_BINARY_NAMES = {
-    'virtualenv': (
-        'virtualenv',
-        'virtualenv2',
-        'virtualenv-2.6',
-        'virtualenv-2.7'
-    ),
-}
-
 log = logging.getLogger(__name__)
 
 

tests/integration/modules/pip.py

@@ -22,10 +22,10 @@ ensure_in_syspath('../../')
 # Import salt libs
 import integration
 import salt.utils
+from salt.modules.virtualenv_mod import KNOWN_BINARY_NAMES
 
 
-@skipIf(salt.utils.which_bin(integration.KNOWN_BINARY_NAMES['virtualenv']) is None,
-        'virtualenv not installed')
+@skipIf(salt.utils.which_bin(KNOWN_BINARY_NAMES) is None, 'virtualenv not installed')
 class PipModuleTest(integration.ModuleCase):
 
     def setUp(self):

tests/integration/modules/state.py

@@ -12,6 +12,7 @@ ensure_in_syspath('../../')
 # Import salt libs
 import integration
 import salt.utils
+from salt.modules.virtualenv_mod import KNOWN_BINARY_NAMES
 
 
 class StateModuleTest(integration.ModuleCase,
@@ -231,8 +232,9 @@ fi
                 if os.path.isfile(fname):
                     os.remove(fname)
 
-    @skipIf(salt.utils.which_bin(integration.KNOWN_BINARY_NAMES['virtualenv']) is None,
-            'virtualenv not installed')
+
+
+    @skipIf(salt.utils.which_bin(KNOWN_BINARY_NAMES) is None, 'virtualenv not installed')
     def test_issue_2068_template_str(self):
         venv_dir = os.path.join(
             integration.SYS_TMP_DIR, 'issue-2068-template-str'

tests/integration/modules/supervisord.py

@@ -13,10 +13,10 @@ ensure_in_syspath('../../')
 # Import salt libs
 import integration
 import salt.utils
+from salt.modules.virtualenv_mod import KNOWN_BINARY_NAMES
 
 
-@skipIf(salt.utils.which_bin(integration.KNOWN_BINARY_NAMES['virtualenv']) is None,
-        'virtualenv not installed')
+@skipIf(salt.utils.which_bin(KNOWN_BINARY_NAMES) is None, 'virtualenv not installed')
 class SupervisordModuleTest(integration.ModuleCase):
     '''
     Validates the supervisorctl functions.

tests/integration/modules/virtualenv.py

@@ -12,10 +12,10 @@ ensure_in_syspath('../../')
 # Import salt libs
 import integration
 import salt.utils
+from salt.modules.virtualenv_mod import KNOWN_BINARY_NAMES
 
 
-@skipIf(salt.utils.which_bin(integration.KNOWN_BINARY_NAMES['virtualenv']) is None,
-        'virtualenv not installed')
+@skipIf(salt.utils.which_bin(KNOWN_BINARY_NAMES) is None, 'virtualenv not installed')
 class VirtualenvModuleTest(integration.ModuleCase):
     '''
     Validate the virtualenv module

tests/integration/states/pip.py

@@ -27,10 +27,10 @@ ensure_in_syspath('../../')
 # Import salt libs
 import integration
 import salt.utils
+from salt.modules.virtualenv_mod import KNOWN_BINARY_NAMES
 
 
-@skipIf(salt.utils.which_bin(integration.KNOWN_BINARY_NAMES['virtualenv']) is None,
-        'virtualenv not installed')
+@skipIf(salt.utils.which_bin(KNOWN_BINARY_NAMES) is None, 'virtualenv not installed')
 class PipStateTest(integration.ModuleCase, integration.SaltReturnAssertsMixIn):
 
     def test_pip_installed_errors(self):

tests/integration/states/supervisord.py

@@ -17,10 +17,10 @@ ensure_in_syspath('../../')
 # Import salt libs
 import integration
 import salt.utils
+from salt.modules.virtualenv_mod import KNOWN_BINARY_NAMES
 
 
-@skipIf(salt.utils.which_bin(integration.KNOWN_BINARY_NAMES['virtualenv']) is None,
-        'virtualenv not installed')
+@skipIf(salt.utils.which_bin(KNOWN_BINARY_NAMES) is None, 'virtualenv not installed')
 class SupervisordTest(integration.ModuleCase,
                       integration.SaltReturnAssertsMixIn):
     '''

tests/integration/states/virtualenv.py

@@ -21,10 +21,10 @@ ensure_in_syspath('../../')
 # Import salt libs
 import integration
 import salt.utils
+from salt.modules.virtualenv_mod import KNOWN_BINARY_NAMES
 
 
-@skipIf(salt.utils.which_bin(integration.KNOWN_BINARY_NAMES['virtualenv']) is None,
-        'virtualenv not installed')
+@skipIf(salt.utils.which_bin(KNOWN_BINARY_NAMES) is None, 'virtualenv not installed')
 class VirtualenvTest(integration.ModuleCase,
                      integration.SaltReturnAssertsMixIn):
     @destructiveTest