qa: Use node.datadir instead of tmpdir in test framework #12076
Merged
Conversation
This file contains hidden or 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
fa283e9 to
fa72ada
Compare
promag
reviewed
Jan 2, 2018
test/functional/keypool-topup.py
Outdated
| self.stop_node(1) | ||
|
|
||
| shutil.copyfile(self.tmpdir + "/node1/regtest/wallets/wallet.dat", self.tmpdir + "/wallet.bak") | ||
| shutil.copyfile(datadir_regtest_1 + "/wallets/wallet.dat", datadir_regtest_1 + "/wallet.bak") |
There was a problem hiding this comment.
Should also use os.path.join?
bbbb244 to
fad2430
Compare
6a0ae9c to
fa3dda1
Compare
|
utACK fa3dda1, will check for missing changes. |
promag
reviewed
Jan 3, 2018
| @@ -213,7 +217,7 @@ def add_nodes(self, num_nodes, extra_args=None, rpchost=None, timewait=None, bin | |||
| assert_equal(len(extra_args), num_nodes) | |||
| assert_equal(len(binary), num_nodes) | |||
| for i in range(num_nodes): | |||
| self.nodes.append(TestNode(i, self.options.tmpdir, extra_args[i], rpchost, timewait=timewait, binary=binary[i], stderr=None, mocktime=self.mocktime, coverage_dir=self.options.coveragedir)) | |||
| self.nodes.append(TestNode(i, self.node_path(i), extra_args[i], rpchost, timewait=timewait, binary=binary[i], stderr=None, mocktime=self.mocktime, coverage_dir=self.options.coveragedir)) | |||
There was a problem hiding this comment.
Use get_datadir_path(self.options.tmpdir, i) instead.
| @@ -203,6 +204,9 @@ def run_test(self): | |||
|
|
|||
| # Public helper methods. These can be accessed by the subclass test scripts. | |||
|
|
|||
| def node_path(self, i, *paths): | |||
| return os.path.join(get_datadir_path(self.options.tmpdir, i), *paths) | |||
There was a problem hiding this comment.
Use os.path.join(node[i].datadir, *paths) instead.
promag
reviewed
Jan 3, 2018
|
concept ACK. What are the benefits of using |
|
Implicit path join. |
|
ok, let me rephrase: what are the benefits of implementing this as a method on |
|
@jnewbery I guess either are ok. You prefer |
fa3dda1 to
fa53143
Compare
fa5519a to
fa31ff9
Compare
fa31ff9 to
faada8b
Compare
fa8945d to
b5aecb2
Compare
b5aecb2 to
5c2e2a8
Compare
5c2e2a8 to
c8330d4
Compare
laanwj
added a commit
that referenced
this pull request
Mar 22, 2018
c8330d4 qa: Use node.datadir instead of tmpdir in test framework (MarcoFalke) Pull request description: Commit c53c983 introduced the utility function `get_datadir_path`, however not all places in the code use this util function. Using the util function everywhere makes it easier to review pull requests related to the datadir. This commit replaces datadir path creation with the `datadir` member of `TestNode`, which itself uses `get_datadir_path`. Tree-SHA512: c75707ab7149d732a6d56152a5813138a33459d3d07577b60b89f2a207c83b7663fac5f203593677c9892d1c23a5eba4bd45c5c4ababf040d720b437240fcddf
PastaPastaPasta
pushed a commit
to PastaPastaPasta/dash
that referenced
this pull request
Dec 16, 2020
…ramework c8330d4 qa: Use node.datadir instead of tmpdir in test framework (MarcoFalke) Pull request description: Commit c53c983 introduced the utility function `get_datadir_path`, however not all places in the code use this util function. Using the util function everywhere makes it easier to review pull requests related to the datadir. This commit replaces datadir path creation with the `datadir` member of `TestNode`, which itself uses `get_datadir_path`. Tree-SHA512: c75707ab7149d732a6d56152a5813138a33459d3d07577b60b89f2a207c83b7663fac5f203593677c9892d1c23a5eba4bd45c5c4ababf040d720b437240fcddf
PastaPastaPasta
pushed a commit
to PastaPastaPasta/dash
that referenced
this pull request
Dec 18, 2020
…ramework c8330d4 qa: Use node.datadir instead of tmpdir in test framework (MarcoFalke) Pull request description: Commit c53c983 introduced the utility function `get_datadir_path`, however not all places in the code use this util function. Using the util function everywhere makes it easier to review pull requests related to the datadir. This commit replaces datadir path creation with the `datadir` member of `TestNode`, which itself uses `get_datadir_path`. Tree-SHA512: c75707ab7149d732a6d56152a5813138a33459d3d07577b60b89f2a207c83b7663fac5f203593677c9892d1c23a5eba4bd45c5c4ababf040d720b437240fcddf
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Commit c53c983 introduced the utility function
get_datadir_path, however not all places in the code use this util function. Using the util function everywhere makes it easier to review pull requests related to the datadir.This commit replaces datadir path creation with the
datadirmember ofTestNode, which itself usesget_datadir_path.