From e7cbfc2bd156d865c7ea694eacc261940d1fbf8a Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Wed, 5 Oct 2022 19:22:29 +0000 Subject: [PATCH] test suite: minor fixes --- test/test.py | 7 +++++-- test/test_py_d/ts_ethdev.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test/test.py b/test/test.py index addc8eae..d12a6bd5 100755 --- a/test/test.py +++ b/test/test.py @@ -78,8 +78,11 @@ from test.overlay import get_overlay_dir,overlay_setup overlay_dir = get_overlay_dir(repo_root) sys.path.insert(0,overlay_dir) -if not (len(sys.argv) == 2 and sys.argv[1] == 'clean'): - 'hack: overlay must be set up before mmgen mods are imported' +if sys.argv[-1] == 'clean': + from shutil import rmtree + rmtree(overlay_dir,ignore_errors=True) +else: + # overlay must be set up before importing mmgen mods! overlay_setup(repo_root) from mmgen.common import * diff --git a/test/test_py_d/ts_ethdev.py b/test/test_py_d/ts_ethdev.py index 54cc7373..1db31d7f 100755 --- a/test/test_py_d/ts_ethdev.py +++ b/test/test_py_d/ts_ethdev.py @@ -994,7 +994,7 @@ class TestSuiteEthdev(TestSuiteBase,TestSuiteShared): start_gas = ETHAmt(60000,'wei'), gasPrice = ETHAmt(8,'Gwei') ) if self.daemon.id == 'geth': # yet another Geth bug - await asyncio.sleep(0.3) + await asyncio.sleep(0.5) if (await self.get_tx_receipt(txid)).status == 0: die(2,'Transfer of token funds failed. Aborting')