LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Make qt test compatible with TestChain100Setup framework

Browse source 
Reset global state after rpc tests, and remove unnecessary ECC initialization
to prevent assert error if it is initialized twice.
This commit is contained in:
Russell Yanofsky 2017-03-10 15:52:29 -05:00
parent 91e303595b
commit cc9503cec9
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/qt/test/rpcnestedtests.cpp
View file

@ -148,9 +148,13 @@ void RPCNestedTests::rpcNestedTests()
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(result, "rpcNestedTest(abc,,)"), std::runtime_error); //don't tollerate empty arguments when using , QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(result, "rpcNestedTest(abc,,)"), std::runtime_error); //don't tollerate empty arguments when using ,
#endif #endif
UnloadBlockIndex();
delete pcoinsTip; delete pcoinsTip;
pcoinsTip = nullptr;
delete pcoinsdbview; delete pcoinsdbview;
pcoinsdbview = nullptr;
delete pblocktree; delete pblocktree;
pblocktree = nullptr;
boost::filesystem::remove_all(boost::filesystem::path(path)); boost::filesystem::remove_all(boost::filesystem::path(path));
} }

3
src/qt/test/test_main.cpp
View file

@ -7,7 +7,6 @@
#endif #endif
#include "chainparams.h" #include "chainparams.h"
#include "key.h"
#include "rpcnestedtests.h" #include "rpcnestedtests.h"
#include "util.h" #include "util.h"
#include "uritests.h" #include "uritests.h"
@ -36,7 +35,6 @@ extern void noui_connect();
// This is all you need to run all the tests // This is all you need to run all the tests
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
ECC_Start();
SetupEnvironment(); SetupEnvironment();
SetupNetworking(); SetupNetworking();
SelectParams(CBaseChainParams::MAIN); SelectParams(CBaseChainParams::MAIN);
@ -66,6 +64,5 @@ int main(int argc, char *argv[])
if (QTest::qExec(&test4) != 0) if (QTest::qExec(&test4) != 0)
fInvalid = true; fInvalid = true;
ECC_Stop();
return fInvalid; return fInvalid;
} }