[wallet] [tests] Add listwallets to multiwallet test

2 files changed, 22 insertions, 10 deletions

diff --git a/test/functional/multiwallet.py b/test/functional/multiwallet.py
index 2b4dd2d3e7..f0929a8e28 100755
--- a/test/functional/multiwallet.py
+++ b/test/functional/multiwallet.py
@@ -2,9 +2,12 @@
 # Copyright (c) 2017 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
-"""Test multiwallet."""
+"""Test multiwallet.
+
+Verify that a bitcoind node can load multiple wallet files
+"""
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import *
+from test_framework.util import assert_equal, assert_raises_jsonrpc
 
 class MultiWalletTest(BitcoinTestFramework):
 
@@ -18,20 +21,28 @@ class MultiWalletTest(BitcoinTestFramework):
         w1 = self.nodes[0] / "wallet/w1"
         w1.generate(1)
 
-        #accessing wallet RPC without using wallet endpoint fails
+        # accessing wallet RPC without using wallet endpoint fails
         assert_raises_jsonrpc(-32601, "Method not found", self.nodes[0].getwalletinfo)
 
-        #check w1 wallet balance
-        walletinfo = w1.getwalletinfo()
-        assert_equal(walletinfo['immature_balance'], 50)
+        # check w1 wallet balance
+        w1_info = w1.getwalletinfo()
+        assert_equal(w1_info['immature_balance'], 50)
+        w1_name = w1_info['walletname']
+        assert_equal(w1_name, "w1")
 
-        #check w1 wallet balance
+        # check w1 wallet balance
         w2 = self.nodes[0] / "wallet/w2"
-        walletinfo = w2.getwalletinfo()
-        assert_equal(walletinfo['immature_balance'], 0)
+        w2_info = w2.getwalletinfo()
+        assert_equal(w2_info['immature_balance'], 0)
+        w2_name = w2_info['walletname']
+        assert_equal(w2_name, "w2")
 
         w3 = self.nodes[0] / "wallet/w3"
-        
+        w3_name = w3.getwalletinfo()['walletname']
+        assert_equal(w3_name, "w3")
+
+        assert_equal({"w1", "w2", "w3"}, {w1_name, w2_name, w3_name})
+
         w1.generate(101)
         assert_equal(w1.getbalance(), 100)
         assert_equal(w2.getbalance(), 0)
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index 51577589fe..c158eaa34e 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -89,6 +89,7 @@ BASE_SCRIPTS= [
     'mempool_spendcoinbase.py',
     'mempool_reorg.py',
     'mempool_persist.py',
+    'multiwallet.py',
     'httpbasics.py',
     'multi_rpc.py',
     'proxy_test.py',