saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

cleanup code

Browse source
This commit is contained in:
ch3ll 2020-03-14 01:00:24 -04:00
parent ddfb065bfb
commit 293b1fddf2
No known key found for this signature in database
GPG key ID: 1124C6796EBDBD8D
2 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tests/integration/test_setup.py
View file

@ -33,17 +33,6 @@ class SetupTest(VirtualEnvHelper):
'''
# Let's create the testing virtualenv
self._create_virtualenv(self.venv_dir)
# Let's remove the pip binary
pip_bin = os.path.join(self.venv_dir, 'bin', 'pip')
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')
if not os.path.isfile(pip_bin):
self.skipTest(
'Failed to find the pip binary to the test virtualenv'
)
ret = self.run_function('cmd.run', ['python setup.py bdist_wheel --dist-dir={0}'.format(self.venv_dir)], cwd=RUNTIME_VARS.CODE_DIR)
for _file in os.listdir(self.venv_dir):

1
tests/unit/test_version.py
View file

@ -234,7 +234,6 @@ class VersionTestCase(TestCase):
('v4518.1', (4518, 1, None, 0, '', 0, 0, None)),
('v3000rc1', (3000, None, None, 0, 'rc', 2, 0, None)),
('v3000rc1-n/a-abcdefff', (3000, None, None, 0, 'rc', 1, -1, 'abcdefff')),
)
for vstr, full_info in expect: