From 82f9d834ad772b2f16b6524f679d14d8a7afe881 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <gcontini@users.noreply.github.com>
Date: 周二, 10 9月 2019 23:29:10 +0800
Subject: [PATCH] fix issue #37 tests in windows

---
 test/library/Os_Linux_test.cpp |   64 +++++++++++++++++++++++++------
 1 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/test/library/Os_Linux_test.cpp b/test/library/Os_Linux_test.cpp
index bbb0bf6..d916375 100644
--- a/test/library/Os_Linux_test.cpp
+++ b/test/library/Os_Linux_test.cpp
@@ -10,18 +10,27 @@
 using namespace std;
 
 BOOST_AUTO_TEST_CASE( read_disk_id ) {
-	DiskInfo * diskInfos = NULL;
-	size_t disk_info_size = 0;
-	FUNCTION_RETURN result = getDiskInfos(NULL, &disk_info_size);
-	BOOST_CHECK_EQUAL(result, FUNC_RET_OK);
-	BOOST_CHECK_GT(disk_info_size, 0);
-	diskInfos = (DiskInfo*) malloc(sizeof(DiskInfo) * disk_info_size);
-	result = getDiskInfos(diskInfos, &disk_info_size);
-	BOOST_CHECK_EQUAL(result, FUNC_RET_OK);
-	BOOST_CHECK_GT(strlen(diskInfos[0].device), 0);
-	BOOST_CHECK_GT(strlen(diskInfos[0].label), 0);
-	BOOST_CHECK_GT(diskInfos[0].disk_sn[0], 0);
-	free(diskInfos);
+	VIRTUALIZATION virt = getVirtualization();
+	if(virt == NONE || virt == VM) {
+		DiskInfo * diskInfos = NULL;
+		size_t disk_info_size = 0;
+		FUNCTION_RETURN result = getDiskInfos(NULL, &disk_info_size);
+		BOOST_CHECK_EQUAL(result, FUNC_RET_OK);
+		BOOST_CHECK_GT(disk_info_size, 0);
+		diskInfos = (DiskInfo*) malloc(sizeof(DiskInfo) * disk_info_size);
+		result = getDiskInfos(diskInfos, &disk_info_size);
+		BOOST_CHECK_EQUAL(result, FUNC_RET_OK);
+		BOOST_CHECK_GT(strlen(diskInfos[0].device), 0);
+		BOOST_CHECK_GT(strlen(diskInfos[0].label), 0);
+		BOOST_CHECK_GT(diskInfos[0].disk_sn[0], 0);
+		free(diskInfos);
+	} else if(virt == CONTAINER){
+		//docker or lxc diskInfo is not meaningful
+		DiskInfo * diskInfos = NULL;
+		size_t disk_info_size = 0;
+		FUNCTION_RETURN result = getDiskInfos(NULL, &disk_info_size);
+		BOOST_CHECK_EQUAL(result, FUNC_RET_NOT_AVAIL);
+	}
 }
 
 BOOST_AUTO_TEST_CASE( read_network_adapters ) {
@@ -43,8 +52,37 @@
 		if (string(adapter_info[i].description) == "lo") {
 			BOOST_CHECK_NE(adapter_info[i].ipv4_address[0], 0);
 		} else {
-			BOOST_CHECK_NE(adapter_info[i].mac_address[0], 0);
+			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);
 }
+
+BOOST_AUTO_TEST_CASE( get_cpuid ) {
+	BOOST_CHECK_EQUAL(1, 1);
+}
+
+//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");
+	if (env != NULL) {
+		if (strcmp(env, "CONTAINER") == 0) {
+			VIRTUALIZATION virt = getVirtualization();
+			BOOST_CHECK_EQUAL(virt, CONTAINER);
+		} else if (strcmp(env, "VM") == 0) {
+			BOOST_FAIL("check for vm not implemented");
+		} else if (strcmp(env, "NONE") == 0) {
+			VIRTUALIZATION virt = getVirtualization();
+			BOOST_CHECK_EQUAL(virt, NONE);
+		} else {
+			BOOST_FAIL(string("value ") + env + " not supported: VM,CONTAINER,NONE");
+		}
+	}
+}
+

--
Gitblit v1.9.1