Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix test_p2p on Windows #340

Merged
merged 1 commit into from
Sep 30, 2024
+2 −2
Merged

fix test_p2p on Windows #340

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Loading status checks…
fix test_p2p on Windows
@TTimo
TTimo committed Sep 29, 2024
commit a37be7724bee53cdc8ad6485baaab05202315820
4 changes: 2 additions & 2 deletions tests/test_p2p.py
View file
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ def run( self ):
# Wait for thread to shutdown. Nuke process if we don't exit in time
def join( self, timeout ):
threading.Thread.join( self, timeout )
if self.isAlive():
if self.is_alive():
self.WriteLn( "Still running after %d seconds. Killing" % timeout )
g_failed = True
self.process.kill()
@@ -88,7 +88,7 @@ def StartClientInThread( role, local, remote ):
]

env = dict( os.environ )
if os.name == 'nt' and not os.path.exists( 'steamnetworkingsockets.dll' ):
if os.name == 'nt' and not os.path.exists( 'steamnetworkingsockets.dll' ) and not os.path.exists( 'GameNetworkingSockets.dll' ):
bindir = os.path.abspath('../../../bin')
if not os.path.exists( bindir ):
print( "Can't find steamnetworkingsockets.dll" )