[PATCH 06/13] tests: remove virdeterministichashmock.so
Code which is sensitive to ordering now uses deterministic iterator
functions, so we can remove the mock override.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/meson.build | 1 -
tests/qemublocktest.c | 2 +-
tests/qemumonitorjsontest.c | 2 +-
tests/qemuxml2xmltest.c | 3 +--
tests/virdeterministichashmock.c | 36 --------------------------------
tests/virmacmaptest.c | 2 +-
6 files changed, 4 insertions(+), 42 deletions(-)
delete mode 100644 tests/virdeterministichashmock.c
diff --git a/tests/meson.build b/tests/meson.build
index a59002c083..6984780066 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -56,7 +56,6 @@ mock_libs = [
{ 'name': 'domaincapsmock' },
{ 'name': 'shunload', 'sources': [ 'shunloadhelper.c' ]
},
{ 'name': 'vircgroupmock' },
- { 'name': 'virdeterministichashmock' },
{ 'name': 'virfilecachemock' },
{ 'name': 'virgdbusmock' },
{ 'name': 'virhostcpumock' },
diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
index c39f96716f..70dce54d0e 100644
--- a/tests/qemublocktest.c
+++ b/tests/qemublocktest.c
@@ -1385,4 +1385,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
}
-VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("virdeterministichash"))
+VIR_TEST_MAIN(mymain)
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index d7c9af7e88..ec4199de68 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -3479,4 +3479,4 @@ mymain(void)
return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
}
-VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("virdeterministichash"))
+VIR_TEST_MAIN(mymain)
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 44ac9fbce7..3e56d0fc50 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1528,8 +1528,7 @@ mymain(void)
VIR_TEST_MAIN_PRELOAD(mymain,
VIR_TEST_MOCK("virpci"),
VIR_TEST_MOCK("virrandom"),
- VIR_TEST_MOCK("domaincaps"),
- VIR_TEST_MOCK("virdeterministichash"))
+ VIR_TEST_MOCK("domaincaps"))
#else
diff --git a/tests/virdeterministichashmock.c b/tests/virdeterministichashmock.c
deleted file mode 100644
index 4d0c88f600..0000000000
--- a/tests/virdeterministichashmock.c
+++ /dev/null
@@ -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;
-}
diff --git a/tests/virmacmaptest.c b/tests/virmacmaptest.c
index 15ad23932e..8fd9916b95 100644
--- a/tests/virmacmaptest.c
+++ b/tests/virmacmaptest.c
@@ -225,4 +225,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
}
-VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("virdeterministichash"))
+VIR_TEST_MAIN(mymain)
--
2.26.2