From 6d45b973579817919dc503475a9fef4372ee3a5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Tue, 9 Aug 2016 03:04:13 +0200
Subject: [PATCH] tests: workaround 'int' name being shadowed by module name

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

QubesOS/qubes-issues#2241
---
 qubes/tests/__init__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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