test suite: minor fixes

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 *

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')