Browse Source

minor testing fixes

The MMGen Project 1 year ago
parent
commit
4f3f031a3b
4 changed files with 17 additions and 9 deletions
  1. 1 1
      mmgen/data/version
  2. 4 1
      test/hashfunc.py
  3. 2 2
      test/test-release.d/cfg.sh
  4. 10 5
      test/test_py_d/ts_misc.py

+ 1 - 1
mmgen/data/version

@@ -1 +1 @@
-13.3.dev54
+13.3.dev55

+ 4 - 1
test/hashfunc.py

@@ -112,6 +112,9 @@ class TestKeccak(TestHashFunc):
 		if python_version >= '3.11':
 			ymsg(f'Skipping keccak random data test for Python version {python_version} (no pysha3)')
 			self.hashlib = None
+		elif gc.platform == 'win':
+			ymsg(f'Skipping keccak random data test for Windows platform (no pysha3)')
+			self.hashlib = None
 		else:
 			import sha3
 			self.hashlib = sha3
@@ -165,7 +168,7 @@ class TestSha512(TestSha2):
 		0x431d67c49c100d4c, 0x4cc5d4becb3e42b6, 0x597f299cfc657e2a, 0x5fcb6fab3ad6faec, 0x6c44198c4a475817 )
 
 from test.include.common import getrand,set_globals
-from mmgen.cfg import Config
+from mmgen.cfg import Config,gc
 
 set_globals(Config())
 

+ 2 - 2
test/test-release.d/cfg.sh

@@ -69,8 +69,8 @@ init_tests() {
 		ripemd160 $python mmgen/contrib/ripemd160.py $VERBOSE $fast_opt
 	"
 
-	[ "$ARM32" ] && t_hash_skip='512'        # gmpy produces invalid init constants
-	[ "$MSYS2" ] && t_hash_skip='512 keccak' # 2:py_long_long issues, 3:no pysha3 for keccak reference
+	[ "$ARM32" ] && t_hash_skip='512' # gmpy produces invalid init constants
+	[ "$MSYS2" ] && t_hash_skip='512' # 2:py_long_long issues
 	[ "$SKIP_ALT_DEP" ] && t_hash_skip+=' keccak'
 
 	d_ref="generated values against reference data"

+ 10 - 5
test/test_py_d/ts_misc.py

@@ -66,13 +66,18 @@ class TestSuiteMisc(TestSuiteBase):
 		return self.xmrwallet_txview(op='txlist')
 
 	def coin_daemon_info(self):
-		start_test_daemons('ltc','eth')
-		t = self.spawn(f'examples/coin-daemon-info.py',['btc','ltc','eth'],cmd_dir='.')
-		for s in ('BTC','LTC','ETH'):
-			t.expect(s + r'\s+mainnet\s+Up',regex=True)
+		if cfg.no_altcoin:
+			coins = ['btc']
+		else:
+			coins = ['btc','ltc','eth']
+			start_test_daemons('ltc','eth')
+		t = self.spawn(f'examples/coin-daemon-info.py',coins,cmd_dir='.')
+		for coin in coins:
+			t.expect(coin.upper() + r'\s+mainnet\s+Up',regex=True)
 		if cfg.pexpect_spawn:
 			t.send('q')
-		stop_test_daemons('ltc','eth')
+		if not cfg.no_altcoin:
+			stop_test_daemons('ltc','eth')
 		return t
 
 	def term_echo(self):