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

Lint: Fix syntax error from bad merge-conflict resolution

Browse source
This commit is contained in:
rallytime 2018-05-10 11:16:02 -04:00
parent 25f03ae425
commit 295e302fcf
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/integration/states/test_pip_state.py
View file

@ -342,7 +342,7 @@ class PipStateTest(ModuleCase, SaltReturnAssertsMixin):
# pip install using a requirements file
req_filename = os.path.join(
RUNTIME_VARS.TMP_STATE_TREE, 'issue-6912-requirements.txt')
RUNTIME_VARS.TMP_STATE_TREE, 'issue-6912-requirements.txt'
)
with salt.utils.files.fopen(req_filename, 'wb') as reqf:
reqf.write(b'pep8\n')