From 6f5db32d147166ab1617c66844e3297eededc704 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <gcontini@users.noreply.github.com>
Date: ćšć, 19 9æ 2019 20:20:18 +0800
Subject: [PATCH] Feature/mingw cross compile (#51)
---
test/functional/volid_test.cpp | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/test/functional/volid_test.cpp b/test/functional/volid_test.cpp
index f63d2b3..a91d0bc 100644
--- a/test/functional/volid_test.cpp
+++ b/test/functional/volid_test.cpp
@@ -52,11 +52,11 @@
for (int i = 0; i < num_strategies; i++) {
FUNCTION_RETURN generate_ok = generate_user_pc_signature(identifier_out,
strategies[i]);
- BOOST_ASSERT(generate_ok == FUNC_RET_OK);
if (generate_ok != FUNC_RET_OK) {
BOOST_ERROR(
"Generating identifier for strategy " << strategies[i] << " failed with: " << generate_ok);
idfile << "0000-0000-0000-0000" << endl;
+ BOOST_ASSERT(generate_ok == FUNC_RET_OK);
} else
idfile << identifier_out << endl;
}
@@ -66,12 +66,26 @@
BOOST_AUTO_TEST_CASE(generated_identifiers_stability) {
const string idfileLocation(PROJECT_TEST_TEMP_DIR "/identifiers_file");
std::vector<IDENTIFICATION_STRATEGY> strategies;
- if (getVirtualization() != CONTAINER) {
- strategies = { DEFAULT, DISK_LABEL, DISK_NUM, ETHERNET };
+ size_t disk_num;
+ getDiskInfos(NULL, &disk_num);
+ if (disk_num >0) {
+ strategies = { DEFAULT, DISK_NUM, DISK_LABEL };
} else {
- strategies = { DEFAULT, ETHERNET };
+ BOOST_TEST_CHECKPOINT("if no disk default strategy fails see #49");
+ //strategies = { DEFAULT };
+ strategies = {};
}
+ size_t adapters;
+ getAdapterInfos(nullptr, &adapters);
+ if(adapters > 0){
+ strategies.push_back(ETHERNET);
+ }
+
int num_strategies = strategies.size();
+ if(num_strategies == 0) {
+ //see issue #49 can't use default
+ return;
+ }
std::ifstream test_idfile_exist(idfileLocation);
if (!test_idfile_exist.good()) {
generate_reference_file(idfileLocation, strategies.data(),
--
Gitblit v1.9.1