From 740121504f2e9cb00ab0a97d277afd57db936633 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Fri, 17 Apr 2015 15:21:53 -0700 Subject: Add a timestamp to netconf cache, fix some SQL queries in NC. --- selftest.cpp | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'selftest.cpp') diff --git a/selftest.cpp b/selftest.cpp index de952cb1..53f0654f 100644 --- a/selftest.cpp +++ b/selftest.cpp @@ -720,13 +720,25 @@ static int testPhy() static int testSqliteNetworkController() { #ifdef ZT_ENABLE_NETWORK_CONTROLLER + + OSUtils::rm("./selftest_network_controller.db"); + try { std::cout << "[network-controller] Generating signing identity..." << std::endl; Identity signingId; signingId.generate(); - std::cout << "[network-controller] Creating database..." << std::endl; - SqliteNetworkController controller(signingId,"network-controller-test.db"); + { + std::cout << "[network-controller] Creating database..." << std::endl; + SqliteNetworkController controller("./selftest_network_controller.db"); + std::cout << "[network-controller] Closing database..." << std::endl; + } + + { + std::cout << "[network-controller] Re-opening database..." << std::endl; + SqliteNetworkController controller("./selftest_network_controller.db"); + std::cout << "[network-controller] Closing database..." << std::endl; + } } catch (std::runtime_error &exc) { std::cout << "FAIL! (unexpected exception: " << exc.what() << ")" << std::endl; return -1; @@ -734,6 +746,9 @@ static int testSqliteNetworkController() std::cout << "FAIL! (unexpected exception: ...)" << std::endl; return -1; } + + OSUtils::rm("./selftest_network_controller.db"); + #endif // ZT_ENABLE_NETWORK_CONTROLLER return 0; } @@ -818,8 +833,8 @@ int main(int argc,char **argv) srand((unsigned int)time(0)); - r |= testPhy(); - r |= testHttp(); + //r |= testPhy(); + //r |= testHttp(); r |= testSqliteNetworkController(); r |= testCrypto(); r |= testPacket(); -- cgit v1.2.3