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 one0010000000000-40", + "001oneoneadminImage one0010000000000-40", - "111Second Image0100000000000-40", + "111twooneadminSecond Image0100000000000-40", - "021The third image0000000000000-40" + "021threeusersThe third image0000000000000-40" }; // This xml dump result has the STIMEs modified to 0000000000 const string xml_dump = -"001Image one0010000000000-40111Second Image0100000000000-40221The third image0000000000000-40"; +"001oneoneadminImage one0010000000000-40111twooneadminSecond Image0100000000000-40221threeusersThe third image0000000000000-40"; const string xml_dump_where = -"001Image one0010000000000-40111Second Image0100000000000-40"; - +"001oneoneadminImage one0010000000000-40111twooneadminSecond Image0100000000000-40"; /* ************************************************************************* */ /* ************************************************************************* */ 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 one010000000000000000