diff options
| author | Jonas Schnelli <[email protected]> | 2015-05-02 12:53:35 +0200 |
|---|---|---|
| committer | Jonas Schnelli <[email protected]> | 2015-05-18 15:25:45 +0200 |
| commit | 64937fe51acc269fc96b784fc97bd4cfe3c1d072 (patch) | |
| tree | e665ff0ccf03aa88847d9ecbfb9fb5f6ef6bbca8 /qa/rpc-tests/proxy_test.py | |
| parent | Merge pull request #6126 (diff) | |
| download | discoin-64937fe51acc269fc96b784fc97bd4cfe3c1d072.tar.xz discoin-64937fe51acc269fc96b784fc97bd4cfe3c1d072.zip | |
[QA] restructure rpc tests directory
* move non-test classes to subdir `test-framework`
Diffstat (limited to 'qa/rpc-tests/proxy_test.py')
| -rwxr-xr-x | qa/rpc-tests/proxy_test.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qa/rpc-tests/proxy_test.py b/qa/rpc-tests/proxy_test.py index d6d9e6725..9a9b2f530 100755 --- a/qa/rpc-tests/proxy_test.py +++ b/qa/rpc-tests/proxy_test.py @@ -7,9 +7,9 @@ import traceback, sys from binascii import hexlify import time, os -from socks5 import Socks5Configuration, Socks5Command, Socks5Server, AddressType -from test_framework import BitcoinTestFramework -from util import * +from test_framework.socks5 import Socks5Configuration, Socks5Command, Socks5Server, AddressType +from test_framework.test_framework import BitcoinTestFramework +from test_framework.util import * ''' Test plan: - Start bitcoind's with different proxy configurations |