Merge pull request #6194

ee9a2e4 Fix walletbackup.py after directory restructuring (Suhas Daftuar)
This commit is contained in:
Wladimir J. van der Laan 2015-05-29 08:22:23 +02:00
commit fb061c3391
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
2 changed files with 3 additions and 2 deletions

View File

@ -31,6 +31,7 @@ testScripts=(
'proxy_test.py' 'proxy_test.py'
'merkle_blocks.py' 'merkle_blocks.py'
'signrawtransactions.py' 'signrawtransactions.py'
'walletbackup.py'
); );
testScriptsExt=( testScriptsExt=(
'bipdersig-p2p.py' 'bipdersig-p2p.py'

View File

@ -33,8 +33,8 @@ Shutdown again, restore using importwallet,
and confirm again balances are correct. and confirm again balances are correct.
""" """
from test_framework import BitcoinTestFramework from test_framework.test_framework import BitcoinTestFramework
from util import * from test_framework.util import *
from random import randint from random import randint
import logging import logging
logging.basicConfig(format='%(levelname)s:%(message)s', level=logging.INFO) logging.basicConfig(format='%(levelname)s:%(message)s', level=logging.INFO)