Browse Source

minor testing fixes

The MMGen Project 2 months ago
parent
commit
7980ddcdb6
4 changed files with 7 additions and 6 deletions
  1. 1 0
      mmgen/proto/eth/daemon.py
  2. 4 0
      nix/README
  3. 0 3
      test-requirements.txt
  4. 2 3
      test/daemontest_d/exec.py

+ 1 - 0
mmgen/proto/eth/daemon.py

@@ -115,6 +115,7 @@ class geth_daemon(ethereum_daemon):
 		self.coind_args = list_gen(
 		self.coind_args = list_gen(
 			['node', self.id == 'reth'],
 			['node', self.id == 'reth'],
 			['--quiet', self.id == 'reth'],
 			['--quiet', self.id == 'reth'],
+			['--disable-dns-discovery', self.id == 'reth' and self.test_suite],
 			['--verbosity=0', self.id == 'geth'],
 			['--verbosity=0', self.id == 'geth'],
 			['--ipcdisable'], # IPC-RPC: if path to socket is longer than 108 chars, geth fails to start
 			['--ipcdisable'], # IPC-RPC: if path to socket is longer than 108 chars, geth fails to start
 			['--http'],
 			['--http'],

+ 4 - 0
nix/README

@@ -1,5 +1,9 @@
 Nix configuration directory for the MMGen Wallet suite
 Nix configuration directory for the MMGen Wallet suite
 
 
+NOTE: If you plan to make changes to the files in this directory, first copy it
+(e.g. `cp -a nix mynix`) and then make your changes in the copied directory.
+Also make sure to replace ‘nix’ with ‘mynix’ (e.g.) in the examples below.
+
 Only BTC and a bare minimum of packages are enabled by default.
 Only BTC and a bare minimum of packages are enabled by default.
 
 
 For altcoin and additional package support, copy the file ‘user-packages.nix’ to
 For altcoin and additional package support, copy the file ‘user-packages.nix’ to

+ 0 - 3
test-requirements.txt

@@ -1,3 +0,0 @@
-pycoin
-monero
-eth_keys

+ 2 - 3
test/daemontest_d/exec.py

@@ -70,15 +70,14 @@ class unit_tests:
 			+ list(args_in[1:])
 			+ list(args_in[1:])
 			+ (network_ids or self.daemon_ctrl_args))
 			+ (network_ids or self.daemon_ctrl_args))
 		vmsg('\n' + orange(f"Running '{' '.join(args)}':"))
 		vmsg('\n' + orange(f"Running '{' '.join(args)}':"))
-		cp = run(args, stdout=PIPE, stderr=PIPE, text=True)
+		redir = None if cfg.verbose else PIPE
+		cp = run(args, stdout=redir, stderr=redir, text=True)
 		if cp.returncode != 0:
 		if cp.returncode != 0:
 			if cp.stdout:
 			if cp.stdout:
 				msg(cp.stdout)
 				msg(cp.stdout)
 			if cp.stderr:
 			if cp.stderr:
 				msg(red(cp.stderr))
 				msg(red(cp.stderr))
 			return False
 			return False
-		if cfg.verbose:
-			msg_r(cp.stderr.strip())
 		if ok:
 		if ok:
 			vmsg('')
 			vmsg('')
 			qmsg('OK')
 			qmsg('OK')