From f54229efd2c5c6d3a50b474d7df2a7533cd8ab27 Mon Sep 17 00:00:00 2001 From: Daniel Narvaez Date: Sat, 22 Jun 2013 12:09:17 +0200 Subject: [PATCH] Move setting AT_SPI_CLIENT to discover It needs to be called as early as possible before unit tests has a chance to import gtk. Hopefully will fix random test failures we are seeing in buildbot. --- src/sugar3/test/discover.py | 1 + src/sugar3/test/unittest.py | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/sugar3/test/discover.py b/src/sugar3/test/discover.py index 8de28f8c..c9866060 100644 --- a/src/sugar3/test/discover.py +++ b/src/sugar3/test/discover.py @@ -37,6 +37,7 @@ def main(): os.chdir(args.tests_dir) os.environ["TMPDIR"] = temp_dir + os.environ["AT_SPI_CLIENT"] = "yes" try: test = unittest.defaultTestLoader.discover(".") diff --git a/src/sugar3/test/unittest.py b/src/sugar3/test/unittest.py index aba715bd..d6628833 100644 --- a/src/sugar3/test/unittest.py +++ b/src/sugar3/test/unittest.py @@ -35,14 +35,10 @@ class UITestCase(unittest.TestCase): self._orig_level = logger.getEffectiveLevel() logger.setLevel(logging.DEBUG) - os.environ["AT_SPI_CLIENT"] = "yes" - def tearDown(self): logger = logging.getLogger() logger.setLevel(self._orig_level) - del os.environ["AT_SPI_CLIENT"] - @contextmanager def run_view(self, name): view_path = os.path.join("views", "%s.py" % name)