Auto merge of #1506 - bitcartel:master_1478_fix_testnet3_test_issue, r=bitcartel

Stop some wallet tests creating ~/.zcash/testnet3 folder by setting -datadir environment

Closes #1478

src/test/rpc_wallet_tests.cpp

@@ -29,6 +29,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/format.hpp>
+#include <boost/filesystem.hpp>
 
 using namespace std;
 using namespace json_spirit;
@@ -1093,6 +1094,8 @@ BOOST_AUTO_TEST_CASE(rpc_wallet_encrypted_wallet_zkeys)
     SecureString strWalletPass;
     strWalletPass.reserve(100);
     strWalletPass = "hello";
+
+    boost::filesystem::current_path(GetArg("-datadir","/tmp/thisshouldnothappen"));
     BOOST_CHECK(pwalletMain->EncryptWallet(strWalletPass));
     
     // Verify we can still list the keys imported