diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-05-29 08:22:23 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-05-29 08:22:34 +0200 |
| commit | fb061c3391bca56bba281d85fecf8fb8dd650d86 (patch) | |
| tree | 451311560e76c1c44854cde33aa4108738eaa1c9 | |
| parent | ce56f5621a94dcc2159ebe57e43da727eab18e6c (diff) | |
| parent | ee9a2e4271153344b70005558698c2a3902481c8 (diff) | |
| download | bitcoin-fb061c3391bca56bba281d85fecf8fb8dd650d86.tar.xz | |
Merge pull request #6194
ee9a2e4 Fix walletbackup.py after directory restructuring (Suhas Daftuar)
| -rwxr-xr-x | qa/pull-tester/rpc-tests.sh | 1 | ||||
| -rwxr-xr-x | qa/rpc-tests/walletbackup.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/qa/pull-tester/rpc-tests.sh b/qa/pull-tester/rpc-tests.sh index 8ed942643b..88772a9c32 100755 --- a/qa/pull-tester/rpc-tests.sh +++ b/qa/pull-tester/rpc-tests.sh @@ -31,6 +31,7 @@ testScripts=( 'proxy_test.py' 'merkle_blocks.py' 'signrawtransactions.py' + 'walletbackup.py' ); testScriptsExt=( 'bipdersig-p2p.py' diff --git a/qa/rpc-tests/walletbackup.py b/qa/rpc-tests/walletbackup.py index b9fc862234..da100d7fc0 100755 --- a/qa/rpc-tests/walletbackup.py +++ b/qa/rpc-tests/walletbackup.py @@ -33,8 +33,8 @@ Shutdown again, restore using importwallet, and confirm again balances are correct. """ -from test_framework import BitcoinTestFramework -from util import * +from test_framework.test_framework import BitcoinTestFramework +from test_framework.util import * from random import randint import logging logging.basicConfig(format='%(levelname)s:%(message)s', level=logging.INFO) |