External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: remove virdeterministichashmock.so

Browse Source 
Code which is sensitive to ordering now uses deterministic iterator
functions, so we can remove the mock override.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Matt Coleman <matt@datto.com>
This commit is contained in:
Peter Krempa 2020-10-21 16:53:26 +02:00
parent 947d2db31b
commit 5f1b1da1b9
6 changed files with 4 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/meson.build
View File

@ -56,7 +56,6 @@ mock_libs = [
{ 'name': 'domaincapsmock' }, { 'name': 'domaincapsmock' },
{ 'name': 'shunload', 'sources': [ 'shunloadhelper.c' ] }, { 'name': 'shunload', 'sources': [ 'shunloadhelper.c' ] },
{ 'name': 'vircgroupmock' }, { 'name': 'vircgroupmock' },
{ 'name': 'virdeterministichashmock' },
{ 'name': 'virfilecachemock' }, { 'name': 'virfilecachemock' },
{ 'name': 'virgdbusmock' }, { 'name': 'virgdbusmock' },
{ 'name': 'virhostcpumock' }, { 'name': 'virhostcpumock' },

2
tests/qemublocktest.c
View File

@ -1385,4 +1385,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("virdeterministichash")) VIR_TEST_MAIN(mymain)

2
tests/qemumonitorjsontest.c
View File

@ -3480,4 +3480,4 @@ mymain(void)
return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("virdeterministichash")) VIR_TEST_MAIN(mymain)

3
tests/qemuxml2xmltest.c
View File

@ -1529,8 +1529,7 @@ mymain(void)
VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MAIN_PRELOAD(mymain,
VIR_TEST_MOCK("virpci"), VIR_TEST_MOCK("virpci"),
VIR_TEST_MOCK("virrandom"), VIR_TEST_MOCK("virrandom"),
VIR_TEST_MOCK("domaincaps"), VIR_TEST_MOCK("domaincaps"))
VIR_TEST_MOCK("virdeterministichash"))
#else #else

36
tests/virdeterministichashmock.c
View File

@ -1,36 +0,0 @@
/*
* Copyright (C) 2016 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
*/
#include <config.h>
#include "util/virhashcode.h"
uint32_t
virHashCodeGen(const void *key,
size_t len,
uint32_t seed G_GNUC_UNUSED)
{
const uint8_t *k = key;
uint32_t h = 0;
size_t i;
for (i = 0; i < len; i++)
h += k[i];
return h;
}

2
tests/virmacmaptest.c
View File

@ -225,4 +225,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("virdeterministichash")) VIR_TEST_MAIN(mymain)