From 9e8f1d09ca2142562030db10a5eed31376fb6a85 Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@z.cash>
Date: Mon, 22 Jan 2018 21:08:15 +0000
Subject: [PATCH] zkey_import_export: Synchronize mempools before mining

Resolves a race condition that caused the RPC test to intermittently fail.

Closes #2892.
---
 qa/rpc-tests/zkey_import_export.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qa/rpc-tests/zkey_import_export.py b/qa/rpc-tests/zkey_import_export.py
index f6d7af765..243ca3909 100755
--- a/qa/rpc-tests/zkey_import_export.py
+++ b/qa/rpc-tests/zkey_import_export.py
@@ -113,7 +113,8 @@ class ZkeyImportExportTest (BitcoinTestFramework):
         alice_zaddr = alice.z_getnewaddress()
         res = alice.z_shieldcoinbase("*", alice_zaddr)
         self.wait_and_assert_operationid_status(alice, res['opid'])
-        miner.generate(6)
+        self.sync_all()
+        miner.generate(1)
         self.sync_all()
 
         # Now get a pristine z-address for receiving transfers: