Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

appveyor: Enable multiwallet tests #14559

Merged
merged 1 commit into from Oct 24, 2018

Conversation

Projects
None yet
6 participants
@ken2812221
Copy link
Member

commented Oct 24, 2018

Based on #14320

This PR enable multiwallet test on appveyor. Also re-enable symlink tests on Windows which is available after Windows Vista.

I disable these tests in #13964 because I suppose that Windows does not support symlink, but I was wrong.

@practicalswift

This comment has been minimized.

Copy link
Member

commented Oct 24, 2018

Concept ACK

Thanks for all your good appveyor work!

@fanquake fanquake added the Tests label Oct 24, 2018

@@ -826,6 +826,10 @@ void BerkeleyDatabase::Flush(bool shutdown)
LOCK(cs_db);
g_dbenvs.erase(env->Directory().string());
env = nullptr;
} else {
// To avoid accessing a map that has already deconstructed, do not call this when shutdown is true. g_dbenvs.erase would also erase this value.
// TODO: get rid of wild pointers

This comment has been minimized.

Copy link
@practicalswift

practicalswift Oct 24, 2018

Member

Wild pointers – scary stuff! Would you be able to construct a test case triggering that? What would it take to get rid of them?

This comment has been minimized.

Copy link
@ken2812221

ken2812221 Oct 24, 2018

Author Member

@practicalswift This is the code from #14320. Better to move to here. It might can be resolved by #11911

@@ -147,7 +143,7 @@ def wallet_file(name):

self.restart_node(0, extra_args)

assert_equal(set(map(lambda w: w['name'], self.nodes[0].listwalletdir()['wallets'])), set(['', 'w3', 'w2', 'sub/w5', 'w7', 'w7', 'w8_copy', 'w1', 'w8', 'w']))
assert_equal(set(map(lambda w: w['name'], self.nodes[0].listwalletdir()['wallets'])), set(['', 'w3', 'w2', os.path.join('sub', 'w5'), 'w7', 'w7', 'w8_copy', 'w1', 'w8', 'w']))

This comment has been minimized.

Copy link
@promag

promag Oct 24, 2018

Member

In windows it is possible to set -wallet=sub/w5, listwallets gives sub/w5 but listwalletdir gives sub\w5?

This comment has been minimized.

Copy link
@ken2812221

ken2812221 Oct 24, 2018

Author Member

Yes, unless we change to calling fs::path::generic_string() instead of calling fs::path::string()

@ryanofsky
Copy link
Contributor

left a comment

utACK 118f647. Change is essentially the same as 02b6bd343da296dc29ea017447b18c9afa13b5e3 previously reviewed in #14320, except symlinks are allowed in some more cases in the multiwallet test.

@ken2812221 ken2812221 force-pushed the ken2812221:appveyor-test-multiwallet branch from 118f647 Oct 24, 2018

@ken2812221

This comment has been minimized.

Copy link
Member Author

commented Oct 24, 2018

118f647 -> 216e8bf -> 4dca7d0
Just rebase #14320

@ken2812221 ken2812221 force-pushed the ken2812221:appveyor-test-multiwallet branch to 4dca7d0 Oct 24, 2018

@promag

This comment has been minimized.

Copy link
Member

commented Oct 24, 2018

utACK 4dca7d0.

MarcoFalke added a commit to MarcoFalke/bitcoin that referenced this pull request Oct 24, 2018

Merge bitcoin#14559: appveyor: Enable multiwallet tests
4dca7d0 appveyor: Enable multiwallet test (Chun Kuan Lee)

Pull request description:

  Based on bitcoin#14320

  This PR enable multiwallet test on appveyor. Also re-enable symlink tests on Windows which is available after Windows Vista.

  I disable these tests in bitcoin#13964 because I suppose that Windows does not support symlink, but I was wrong.

Tree-SHA512: 852cd4dedf36ec9c34aff8926cb34e6a560aea0bb9170c7a2264fc292dbb605622d561568d8df39aeb90d3d2bb700901d218ea7e7c5e21d84827c40d6370b369

@MarcoFalke MarcoFalke merged commit 4dca7d0 into bitcoin:master Oct 24, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@ken2812221 ken2812221 deleted the ken2812221:appveyor-test-multiwallet branch Oct 24, 2018

laanwj added a commit that referenced this pull request Oct 26, 2018

Merge #14561: Remove fs::relative call and fix listwalletdir tests
ed2e183 Remove fs::relative call and fix listwalletdir tests (João Barbosa)

Pull request description:

  The implementation of `fs::relative` resolves symlinks which is not intended
  in ListWalletDir. The replacement does what is required, and `listwalletdir` RPC
  tests are fixed accordingly.

  Also, `fs::recursive_directory_iterator` iteration is fixed to build with boost 1.47.

  Based on #14559

Tree-SHA512: 1da516226073f195285d10d9d9648c90cce0158c5d1eb9c31217bb4abb575cd37f07c00787c5a850554d6120bbc5a3cbc5cb47d4488b32ac6bcb52bc1882d600
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.