Auto merge of #3320 - str4d:macos-tests, r=bitcartel

Fix MacOS tests

Includes code cherry-picked from upstream PR bitcoin/bitcoin#8270.
This commit is contained in:
Homu
2018-06-18 19:00:56 -07:00
10 changed files with 32 additions and 16 deletions

View File

@@ -581,7 +581,7 @@ TEST(wallet_tests, cached_witnesses_empty_chain) {
// Until #1302 is implemented, this should triggger an assertion
EXPECT_DEATH(wallet.DecrementNoteWitnesses(&index),
"Assertion `nWitnessCacheSize > 0' failed.");
".*nWitnessCacheSize > 0.*");
}
TEST(wallet_tests, cached_witnesses_chain_tip) {