diff --git a/src/image/test/ImagePoolTest.cc b/src/image/test/ImagePoolTest.cc
index 7a59fdfa27..c190a08f1d 100644
--- a/src/image/test/ImagePoolTest.cc
+++ b/src/image/test/ImagePoolTest.cc
@@ -53,20 +53,19 @@ const string templates[] =
const string xmls[] =
{
- "001Image one001000000000040",
+ "001oneoneadminImage one001000000000040",
- "111Second Image010000000000040",
+ "111twooneadminSecond Image010000000000040",
- "021The third image000000000000040"
+ "021threeusersThe third image000000000000040"
};
// This xml dump result has the STIMEs modified to 0000000000
const string xml_dump =
-"001Image one001000000000040111Second Image010000000000040221The third image000000000000040";
+"001oneoneadminImage one001000000000040111twooneadminSecond Image010000000000040221threeusersThe third image000000000000040";
const string xml_dump_where =
-"001Image one001000000000040111Second Image010000000000040";
-
+"001oneoneadminImage one001000000000040111twooneadminSecond Image010000000000040";
/* ************************************************************************* */
/* ************************************************************************* */
diff --git a/src/um/test/UserPoolTest.cc b/src/um/test/UserPoolTest.cc
index ad60f7e3fa..344b9eb2f2 100644
--- a/src/um/test/UserPoolTest.cc
+++ b/src/um/test/UserPoolTest.cc
@@ -31,10 +31,10 @@ const string usernames[] = { "A user", "B user", "C user", "D user", "E user" };
const string passwords[] = { "A pass", "B pass", "C pass", "D pass", "E pass" };
const string dump_result =
- "00one_user_test5baa61e4c9b93f3f0682250b6cf8331b7ee68fd81010ap1020a namepass1030a_namepassword1040another namesecret1050user123410";
+ "00oneadminone_user_test5baa61e4c9b93f3f0682250b6cf8331b7ee68fd81010oneadminap1020oneadmina namepass1030oneadmina_namepassword1040oneadminanother namesecret1050oneadminuser123410";
const string dump_where_result =
- "10ap1020a namepass1030a_namepassword1040another namesecret10";
+ "10oneadminap1020oneadmina namepass1030oneadmina_namepassword1040oneadminanother namesecret10";
#include "NebulaTest.h"
diff --git a/src/vm/test/VirtualMachinePoolTest.cc b/src/vm/test/VirtualMachinePoolTest.cc
index b3122614dc..5bcd6c1e7d 100644
--- a/src/vm/test/VirtualMachinePoolTest.cc
+++ b/src/vm/test/VirtualMachinePoolTest.cc
@@ -46,21 +46,21 @@ const string templates[] =
const string xmls[] =
{
- "01231VM one001231the_userusersVM one010000000000000000"
"",
- "12611Second VM0"
+ "12611the_userusersSecond VM0"
"1000000000000<"
"/ETIME>0000"
""
"",
- "01231VM one001231the_userusersVM one01000000000000000011024VM one"
@@ -70,13 +70,13 @@ const string xmls[] =
// This xml dump result has the STIMEs modified to 0000000000
const string xml_dump =
- "011VM one010000000000000000121Second VM020000000000000000";
+ "011the_userusersVM one010000000000000000121the_userusersSecond VM020000000000000000";
const string xml_dump_where =
- "011VM one010000000000000000";
+ "011the_userusersVM one010000000000000000";
const string xml_history_dump =
- "001VM one010000000000000000101Second VM0200000000000000000A_hostnameA_vm_dir000A_vmm_madA_tm_mad0000000201VM one0200000000000000001C_hostnameC_vm_dir200C_vmm_madC_tm_mad0000000";
+ "001the_userusersVM one010000000000000000101the_userusersSecond VM0200000000000000000A_hostnameA_vm_dir000A_vmm_madA_tm_mad0000000201the_userusersVM one0200000000000000001C_hostnameC_vm_dir200C_vmm_madC_tm_mad0000000311the_userusersVM one060000000000000000";
/* ************************************************************************* */
/* ************************************************************************* */
@@ -260,13 +260,13 @@ public:
string result = oss.str();
fix_stimes(result);
-//*
+/*
if( result != xml_dump )
{
cout << endl << result << endl << "========"
<< endl << xml_dump << endl << "--------";
}
-//*/
+*/
CPPUNIT_ASSERT( result == xml_dump );
}
@@ -385,13 +385,13 @@ public:
string result = oss.str();
fix_stimes(result);
-/*
+
if( result != xml_history_dump )
{
cout << endl << result << endl << "========"
<< endl << xml_history_dump << endl << "--------";
}
-*/
+
CPPUNIT_ASSERT( result == xml_history_dump );
}
diff --git a/src/vnm/test/VirtualNetworkPoolTest.cc b/src/vnm/test/VirtualNetworkPoolTest.cc
index ef14d38149..955b841f0c 100644
--- a/src/vnm/test/VirtualNetworkPoolTest.cc
+++ b/src/vnm/test/VirtualNetworkPoolTest.cc
@@ -71,18 +71,18 @@ const string templates[] =
const string xmls[] =
{
- "01230Net number one1br100130.10.0.150:20:20:20:20:200-1",
+ "01230the_useroneadminNet number one1br100130.10.0.150:20:20:20:20:200-1",
- "12610A virtual network0br010",
+ "12610the_useroneadminA virtual network0br010",
- "01330Net number two1br100130.10.2.150:20:20:20:20:200-1"
+ "01330the_useroneadminNet number two1br100130.10.2.150:20:20:20:20:200-1"
};
const string xml_dump =
- "010Net number one1br100120A virtual network0br010";
+ "010the_useroneadminNet number one1br100120the_useroneadminA virtual network0br010";
const string xml_dump_where =
- "120A virtual network0br010";
+ "120the_useroneadminA virtual network0br010";
/* ************************************************************************* */
/* ************************************************************************* */
@@ -274,9 +274,9 @@ public:
};
string phydev_xml[] = {
- "000BRIDGE and PHYDEV1br0eth000130.10.0.150:20:20:20:20:200-1",
+ "000the_useroneadminBRIDGE and PHYDEV1br0eth000130.10.0.150:20:20:20:20:200-1",
- "100No BRIDGE only PHYDEV1onebr1eth000130.10.0.150:20:20:20:20:200-1"
+ "100the_useroneadminNo BRIDGE only PHYDEV1onebr1eth000130.10.0.150:20:20:20:20:200-1"
};
// test vm with bridge and phydev