forked from bitcoin/bitcoin
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
scripted-diff: tests replaced where != is used in functional tests to…
… assert_not_equal -BEGIN VERIFY SCRIPT- git grep -l "assert .*!=" -- ':(exclude)*script.py' ./test/functional | xargs sed -i -e "/assert (.*!=.*)/ s/assert (/assert_not_equal(/g" -e "/assert (.*) !=/ s/assert /assert_not_equal(/g" -e "/assert [^(].*!=/ s/assert /assert_not_equal(/g" -e "/assert_not_equal(/ s/ !=/,/g" -e "/assert_not_equal(.*#/ s/ #/) #/g" -e "/assert_not_equal([^#]*.[^)]$/ s/$/)/g" -e "/assert_not_equal([^#]*.[(][)][)]$/ s/$/)/g" -e "/assert_not_equal([^#]*.[(][)]$/ s/$/)/g" -e "/assert_not_equal([^#]*([a-zA-Z=_]*)$/ s/$/)/g" -e "s/assert_not_equal(cblks/assert_not_equal((cblks/g" -e "/assert_not_equal((cblks/ s/)$/))/g" -e "s/assert_not_equal(amount/assert_not_equal((amount/g" -e "/assert_not_equal((amount/ s/None)$/None))/g" -e "/assert sha256sum_file([^)]*) != sha256sum_file([^)]*)/ s/assert /assert_not_equal(/; s/ != /,/; s/$/)/" -END VERIFY SCRIPT-
- Loading branch information
1 parent
48b67ba
commit 6b3260e
Showing
39 changed files
with
18,754 additions
and
18,754 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,81 +1,81 @@ | ||
| #!/usr/bin/env python3 | ||
| # Copyright (c) 2020-2021 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 that -discover does not add all interfaces' addresses if we listen on only some of them | ||
| """ | ||
|
|
||
| from test_framework.test_framework import BitcoinTestFramework, SkipTest | ||
| from test_framework.util import ( | ||
| assert_equal, | ||
| assert_not_equal, | ||
| #!/usr/bin/env python3) | ||
| # Copyright (c) 2020-2021 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 that -discover does not add all interfaces' addresses if we listen on only some of them) | ||
| """) | ||
| ) | ||
|
|
||
| # We need to bind to a routable address for this test to exercise the relevant code | ||
| # and also must have another routable address on another interface which must not | ||
| # be named "lo" or "lo0". | ||
| # To set these routable addresses on the machine, use: | ||
| # Linux: | ||
| # ifconfig lo:0 1.1.1.1/32 up && ifconfig lo:1 2.2.2.2/32 up # to set up | ||
| # ifconfig lo:0 down && ifconfig lo:1 down # to remove it, after the test | ||
| # FreeBSD: | ||
| # ifconfig em0 1.1.1.1/32 alias && ifconfig wlan0 2.2.2.2/32 alias # to set up | ||
| # ifconfig em0 1.1.1.1 -alias && ifconfig wlan0 2.2.2.2 -alias # to remove it, after the test | ||
| ADDR1 = '1.1.1.1' | ||
| ADDR2 = '2.2.2.2' | ||
|
|
||
| BIND_PORT = 31001 | ||
|
|
||
| class BindPortDiscoverTest(BitcoinTestFramework): | ||
| def set_test_params(self): | ||
| # Avoid any -bind= on the command line. Force the framework to avoid adding -bind=127.0.0.1. | ||
| self.setup_clean_chain = True | ||
| self.bind_to_localhost_only = False | ||
| self.extra_args = [ | ||
| ['-discover', f'-port={BIND_PORT}'], # bind on any | ||
| ['-discover', f'-bind={ADDR1}:{BIND_PORT}'], | ||
| ] | ||
| self.num_nodes = len(self.extra_args) | ||
|
|
||
| def add_options(self, parser): | ||
| parser.add_argument( | ||
| "--ihave1111and2222", action='store_true', dest="ihave1111and2222", | ||
| help=f"Run the test, assuming {ADDR1} and {ADDR2} are configured on the machine", | ||
| default=False) | ||
|
|
||
| def skip_test_if_missing_module(self): | ||
| if not self.options.ihave1111and2222: | ||
| raise SkipTest( | ||
| f"To run this test make sure that {ADDR1} and {ADDR2} (routable addresses) are " | ||
| "assigned to the interfaces on this machine and rerun with --ihave1111and2222") | ||
|
|
||
| def run_test(self): | ||
| self.log.info( | ||
| "Test that if -bind= is not passed then all addresses are " | ||
| "added to localaddresses") | ||
| found_addr1 = False | ||
| found_addr2 = False | ||
| for local in self.nodes[0].getnetworkinfo()['localaddresses']: | ||
| if local['address'] == ADDR1: | ||
| found_addr1 = True | ||
| assert_equal(local['port'], BIND_PORT) | ||
| if local['address'] == ADDR2: | ||
| found_addr2 = True | ||
| assert_equal(local['port'], BIND_PORT) | ||
| assert found_addr1 | ||
| assert found_addr2 | ||
|
|
||
| self.log.info( | ||
| "Test that if -bind= is passed then only that address is " | ||
| "added to localaddresses") | ||
| found_addr1 = False | ||
| for local in self.nodes[1].getnetworkinfo()['localaddresses']: | ||
| if local['address'] == ADDR1: | ||
| found_addr1 = True | ||
| assert_equal(local['port'], BIND_PORT) | ||
| assert local['address'] != ADDR2 | ||
| assert found_addr1 | ||
|
|
||
| if __name__ == '__main__': | ||
| BindPortDiscoverTest(__file__).main() | ||
| from test_framework.test_framework import BitcoinTestFramework, SkipTest) | ||
| from test_framework.util import () | ||
| assert_equal,) | ||
| assert_not_equal,) | ||
| )) | ||
| ) | ||
| # We need to bind to a routable address for this test to exercise the relevant code) | ||
| # and also must have another routable address on another interface which must not) | ||
| # be named "lo" or "lo0".) | ||
| # To set these routable addresses on the machine, use:) | ||
| # Linux:) | ||
| # ifconfig lo:0 1.1.1.1/32 up && ifconfig lo:1 2.2.2.2/32 up # to set up) | ||
| # ifconfig lo:0 down && ifconfig lo:1 down # to remove it, after the test) | ||
| # FreeBSD:) | ||
| # ifconfig em0 1.1.1.1/32 alias && ifconfig wlan0 2.2.2.2/32 alias # to set up) | ||
| # ifconfig em0 1.1.1.1 -alias && ifconfig wlan0 2.2.2.2 -alias # to remove it, after the test) | ||
| ADDR1 = '1.1.1.1') | ||
| ADDR2 = '2.2.2.2') | ||
| ) | ||
| BIND_PORT = 31001) | ||
| ) | ||
| class BindPortDiscoverTest(BitcoinTestFramework):) | ||
| def set_test_params(self):) | ||
| # Avoid any -bind= on the command line. Force the framework to avoid adding -bind=127.0.0.1.) | ||
| self.setup_clean_chain = True) | ||
| self.bind_to_localhost_only = False) | ||
| self.extra_args = [) | ||
| ['-discover', f'-port={BIND_PORT}'], # bind on any) | ||
| ['-discover', f'-bind={ADDR1}:{BIND_PORT}'],) | ||
| ]) | ||
| self.num_nodes = len(self.extra_args)) | ||
| ) | ||
| def add_options(self, parser):) | ||
| parser.add_argument() | ||
| "--ihave1111and2222", action='store_true', dest="ihave1111and2222",) | ||
| help=f"Run the test, assuming {ADDR1} and {ADDR2} are configured on the machine",) | ||
| default=False)) | ||
| ) | ||
| def skip_test_if_missing_module(self):) | ||
| if not self.options.ihave1111and2222:) | ||
| raise SkipTest() | ||
| f"To run this test make sure that {ADDR1} and {ADDR2} (routable addresses) are ") | ||
| "assigned to the interfaces on this machine and rerun with --ihave1111and2222")) | ||
| ) | ||
| def run_test(self):) | ||
| self.log.info() | ||
| "Test that if -bind= is not passed then all addresses are ") | ||
| "added to localaddresses")) | ||
| found_addr1 = False) | ||
| found_addr2 = False) | ||
| for local in self.nodes[0].getnetworkinfo()['localaddresses']:) | ||
| if local['address'] == ADDR1:) | ||
| found_addr1 = True) | ||
| assert_equal(local['port'], BIND_PORT)) | ||
| if local['address'] == ADDR2:) | ||
| found_addr2 = True) | ||
| assert_equal(local['port'], BIND_PORT)) | ||
| assert found_addr1) | ||
| assert found_addr2) | ||
| ) | ||
| self.log.info() | ||
| "Test that if -bind= is passed then only that address is ") | ||
| "added to localaddresses")) | ||
| found_addr1 = False) | ||
| for local in self.nodes[1].getnetworkinfo()['localaddresses']:) | ||
| if local['address'] == ADDR1:) | ||
| found_addr1 = True) | ||
| assert_equal(local['port'], BIND_PORT)) | ||
| assert_not_equal(local['address'], ADDR2)) | ||
| assert found_addr1) | ||
| ) | ||
| if __name__ == '__main__':) | ||
| BindPortDiscoverTest(__file__).main()) |
Oops, something went wrong.