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

Merge pull request #48869 from Ch3LL/mac_shell_tests

Browse source 
Catch socket.error exception in testprogram
This commit is contained in:
Nicole Thomas 2018-08-02 10:19:22 -04:00 • committed by GitHub
commit a84f5155a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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/utils/testprogram.py
View file

@ -598,7 +598,7 @@ class TestSaltProgram(six.with_metaclass(TestSaltProgramMeta, TestProgram)):
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
try:
connect = sock.bind(('localhost', port))
except OSError:
except (socket.error, OSError):
# these ports are already in use, use different ones
pub_port = 4606
ret_port = 4607