From b6277b30756c96404bc747f32ae45e9d3e205447 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: ćšć, 09 1æ 2020 10:19:22 +0800
Subject: [PATCH] pc identifiers intermediate work
---
test/library/Os_Linux_test.cpp | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/test/library/Os_Linux_test.cpp b/test/library/Os_Linux_test.cpp
index b7b8c21..6d272bf 100644
--- a/test/library/Os_Linux_test.cpp
+++ b/test/library/Os_Linux_test.cpp
@@ -7,11 +7,15 @@
#include <licensecc_properties_test.h>
#include "../../src/library/base/StringUtils.h"
#include "../../src/library/os/os.h"
+#include "../../src/library/os/execution_environment.hpp"
+
namespace license {
using namespace std;
namespace test {
+
BOOST_AUTO_TEST_CASE(read_disk_id) {
- VIRTUALIZATION virt = getVirtualization();
+ ExecutionEnvironment exec_env;
+ VIRTUALIZATION virt = exec_env.getVirtualization();
if (virt == NONE || virt == VM) {
DiskInfo *diskInfos = NULL;
size_t disk_info_size = 0;
@@ -61,20 +65,19 @@
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");
+ ExecutionEnvironment exec_env;
if (env != NULL) {
if (strcmp(env, "CONTAINER") == 0) {
- VIRTUALIZATION virt = getVirtualization();
- BOOST_CHECK_EQUAL(virt, CONTAINER);
+ VIRTUALIZATION virt = exec_env.getVirtualization();
+ BOOST_CHECK_MESSAGE(virt == CONTAINER, "container detected");
} else if (strcmp(env, "VM") == 0) {
BOOST_FAIL("check for vm not implemented");
} else if (strcmp(env, "NONE") == 0) {
- VIRTUALIZATION virt = getVirtualization();
+ VIRTUALIZATION virt = exec_env.getVirtualization();
BOOST_CHECK_EQUAL(virt, NONE);
} else {
BOOST_FAIL(string("value ") + env + " not supported: VM,CONTAINER,NONE");
--
Gitblit v1.9.1