Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: workaround 'int' name being shadowed by module name

Browse Source 
qubes.tests.int shadows 'int' type in qubes.tests module.

QubesOS/qubes-issues#2241
This commit is contained in:
Marek Marczykowski-Górecki 2016-08-09 03:04:13 +02:00
parent 3f6c96ee39
commit 6d45b97357
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qubes/tests/__init__.py
View File

@ -45,6 +45,7 @@ import sys
import tempfile import tempfile
import traceback import traceback
import unittest import unittest
import __builtin__
import lxml.etree import lxml.etree
import time import time
@ -653,7 +654,8 @@ class SystemTestsMixin(object):
wait_count = 0 wait_count = 0
while subprocess.call(['xdotool', 'search', '--name', title], while subprocess.call(['xdotool', 'search', '--name', title],
stdout=open(os.path.devnull, 'w'), stdout=open(os.path.devnull, 'w'),
stderr=subprocess.STDOUT) == int(show): stderr=subprocess.STDOUT) == \
__builtin__.int(show):
wait_count += 1 wait_count += 1
if wait_count > timeout*10: if wait_count > timeout*10:
self.fail("Timeout while waiting for {} window to {}".format( self.fail("Timeout while waiting for {} window to {}".format(