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@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Matt Coleman <matt@datto.com>

diff --git a/tests/meson.build b/tests/meson.build
index a59002c083770aeeda48efb4c3673afbe7c1f5f2..69847800665c5aaf9d10116ef8b0f1e28834acc9 100644 (file)
--- 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 c39f96716f70a6a510ead60f02d5fbba27b40ae2..70dce54d0ee8b8232e1b555402e8f46a41299336 100644 (file)
--- 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 9231fa835ad1d02ae577a17a3891765cf2b557a2..cd52a0019ab607c83e0a1863a5d75bd76e01227c 100644 (file)
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -3480,4 +3480,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 0e9f88788ca34e97f0308ef0d9d0720e384ca286..ba6bdb67c93b0664cbf477c488f54744cb4617bc 100644 (file)
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1529,8 +1529,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 (file)
index 4d0c88f..0000000
--- 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 15ad23932ec0312f6816ab4d18d0f07157efc0b4..8fd9916b95b700c9a07d463676125bc665fb8eda 100644 (file)
--- 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)