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

Resolve bad merge: there should only be one test_get_file_from_env_in_url test

Browse source
This commit is contained in:
rallytime 2018-04-03 16:19:12 -04:00
parent e28f71b418
commit d0202cab72
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tests/integration/modules/test_cp.py
View file

@ -634,6 +634,7 @@ class CPModuleTest(ModuleCase):
finally:
os.unlink(tgt)
@with_tempfile
def test_get_file_from_env_in_url(self):
tgt = os.path.join(paths.TMP, 'cheese')
try:
@ -645,14 +646,6 @@ class CPModuleTest(ModuleCase):
finally:
os.unlink(tgt)
@with_tempfile
def test_get_file_from_env_in_url(self, tgt):
self.run_function('cp.get_file', ['salt://cheese?saltenv=prod', tgt])
with salt.utils.files.fopen(tgt, 'r') as cheese:
data = cheese.read()
self.assertIn('Gromit', data)
self.assertIn('Comte', data)
def test_push(self):
log_to_xfer = os.path.join(paths.TMP, uuid.uuid4().hex)
open(log_to_xfer, 'w').close() # pylint: disable=resource-leakage