From d4edbb5a0aae0211389ce86264809b4237c73769 Mon Sep 17 00:00:00 2001 From: gcontini <1121667+gcontini@users.noreply.github.com> Date: 周日, 08 3月 2020 21:27:16 +0800 Subject: [PATCH] Issues #14 and #6 --- test/library/Os_Linux_test.cpp | 48 +++++++++++------------------------------------- 1 files changed, 11 insertions(+), 37 deletions(-) diff --git a/test/library/Os_Linux_test.cpp b/test/library/Os_Linux_test.cpp index 6d272bf..5306bb0 100644 --- a/test/library/Os_Linux_test.cpp +++ b/test/library/Os_Linux_test.cpp @@ -10,13 +10,14 @@ #include "../../src/library/os/execution_environment.hpp" namespace license { -using namespace std; namespace test { +using namespace std; +using namespace os; BOOST_AUTO_TEST_CASE(read_disk_id) { - ExecutionEnvironment exec_env; - VIRTUALIZATION virt = exec_env.getVirtualization(); - if (virt == NONE || virt == VM) { + os::ExecutionEnvironment exec_env; + os::VIRTUALIZATION virt = exec_env.getVirtualization(); + if (virt == VIRTUALIZATION::NONE || virt == VIRTUALIZATION::VM) { DiskInfo *diskInfos = NULL; size_t disk_info_size = 0; FUNCTION_RETURN result = getDiskInfos(NULL, &disk_info_size); @@ -29,7 +30,7 @@ BOOST_CHECK_GT(mstrnlen_s(diskInfos[0].label, sizeof diskInfos[0].label), 0); BOOST_CHECK_GT(diskInfos[0].disk_sn[0], 0); free(diskInfos); - } else if (virt == CONTAINER) { + } else if (virt == VIRTUALIZATION::CONTAINER) { // docker or lxc diskInfo is not meaningful DiskInfo *diskInfos = NULL; size_t disk_info_size = 0; @@ -38,47 +39,20 @@ } } -BOOST_AUTO_TEST_CASE(read_network_adapters) { - OsAdapterInfo *adapter_info = NULL; - size_t adapter_info_size = 0; - FUNCTION_RETURN result = getAdapterInfos(NULL, &adapter_info_size); - BOOST_CHECK_EQUAL(result, FUNC_RET_OK); - BOOST_CHECK_GT(adapter_info_size, 0); - adapter_info = (OsAdapterInfo *)malloc(sizeof(OsAdapterInfo) * adapter_info_size); - result = getAdapterInfos(adapter_info, &adapter_info_size); - BOOST_CHECK_EQUAL(result, FUNC_RET_OK); - for (size_t i = 0; i < adapter_info_size; i++) { - cout << "Interface found: " << string(adapter_info[i].description) << endl; - BOOST_CHECK_GT(strlen(adapter_info[i].description), 0); - // lo mac address is always 0 but it has ip - // other interfaces may not be connected - if (string(adapter_info[i].description) == "lo") { - BOOST_CHECK_NE(adapter_info[i].ipv4_address[0], 0); - } else { - bool mac_is_0 = true; - for (int j = 0; j < 6; j++) { - mac_is_0 = mac_is_0 && (adapter_info[i].mac_address[j] == 0); - } - BOOST_CHECK_MESSAGE(!mac_is_0, "Mac address for interface " << adapter_info[i].description << " is 0"); - } - } - free(adapter_info); -} - // To test if virtualization is detected correctly define an env variable VIRT_ENV // otherwise the test is skipped BOOST_AUTO_TEST_CASE(test_virtualization) { const char *env = getenv("VIRT_ENV"); - ExecutionEnvironment exec_env; + os::ExecutionEnvironment exec_env; if (env != NULL) { if (strcmp(env, "CONTAINER") == 0) { - VIRTUALIZATION virt = exec_env.getVirtualization(); - BOOST_CHECK_MESSAGE(virt == CONTAINER, "container detected"); + os::VIRTUALIZATION virt = exec_env.getVirtualization(); + BOOST_CHECK_MESSAGE(virt == VIRTUALIZATION::CONTAINER, "container detected"); } else if (strcmp(env, "VM") == 0) { BOOST_FAIL("check for vm not implemented"); } else if (strcmp(env, "NONE") == 0) { - VIRTUALIZATION virt = exec_env.getVirtualization(); - BOOST_CHECK_EQUAL(virt, NONE); + os::VIRTUALIZATION virt = exec_env.getVirtualization(); + BOOST_CHECK_EQUAL(virt, VIRTUALIZATION::NONE); } else { BOOST_FAIL(string("value ") + env + " not supported: VM,CONTAINER,NONE"); } -- Gitblit v1.9.1