From a711d059d53cdc61d5f4305877ec2228b9409077 Mon Sep 17 00:00:00 2001 From: Roman Yurchak Date: Thu, 20 Sep 2018 12:51:11 +0200 Subject: [PATCH] Simplify traceback on package load timeout --- cpython/Makefile | 2 +- test/conftest.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cpython/Makefile b/cpython/Makefile index 8625823f6..b419a6b71 100644 --- a/cpython/Makefile +++ b/cpython/Makefile @@ -83,7 +83,7 @@ $(BUILD)/Makefile: $(BUILD)/.patched $(ZLIBBUILD)/.patched cp config.site $(BUILD)/ ( \ cd $(BUILD); \ - CONFIG_SITE=./config.site READELF=true emconfigure ./configure --without-threads --without-pymalloc --disable-shared --disable-ipv6 --without-gcc --host=asmjs-unknown-emscripten --build=$(shell $(BUILD)/config.guess) --prefix=$(INSTALL) ; \ + CONFIG_SITE=./config.site READELF=true emconfigure ./configure --without-pymalloc --disable-shared --disable-ipv6 --without-gcc --host=asmjs-unknown-emscripten --build=$(shell $(BUILD)/config.guess) --prefix=$(INSTALL) ; \ ) diff --git a/test/conftest.py b/test/conftest.py index 081e39c64..ef4e3db44 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -102,17 +102,19 @@ class SeleniumWrapper: 'window.done = false\n' + 'pyodide.loadPackage({!r})'.format(packages) + '.finally(function() { window.done = true; })') + __tracebackhide__ = True self.wait_until_packages_loaded() def wait_until_packages_loaded(self): from selenium.common.exceptions import TimeoutException + __tracebackhide__ = True try: self.wait.until(PackageLoaded()) except TimeoutException as exc: _display_driver_logs(self.browser, self.driver) print(self.logs) - raise TimeoutException() + raise TimeoutException('wait_until_packages_loaded timed out') @property def urls(self):