From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sun, 10 Apr 2016 12:43:47 +0000 (+0100)
Subject: [Minor] Improve tests for heap
X-Git-Tag: 1.2.3~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bb517fb0e1a031fbee9e25632ada43e371b4b42a;p=thirdparty%2Frspamd.git

[Minor] Improve tests for heap
---

diff --git a/test/rspamd_heap_test.c b/test/rspamd_heap_test.c
index db508fcb7e..634c648d22 100644
--- a/test/rspamd_heap_test.c
+++ b/test/rspamd_heap_test.c
@@ -19,6 +19,9 @@
 #include "heap.h"
 #include "ottery.h"
 
+static const niter = 100500;
+static const nrem = 100;
+
 static inline
 struct rspamd_min_heap_elt *
 new_elt (guint pri)
@@ -54,14 +57,19 @@ rspamd_heap_test_func (void)
 	rspamd_min_heap_destroy (heap);
 	heap = rspamd_min_heap_create (128);
 
-	for (i = 0; i < 100500; i ++) {
+	for (i = 0; i < niter; i ++) {
 		elt = new_elt (ottery_rand_uint32 () % G_MAXINT32 + 1);
 		rspamd_min_heap_push (heap, elt);
 	}
 
+	for (i = 0; i < nrem; i ++) {
+		elt = rspamd_min_heap_index (heap, ottery_rand_uint32 () % niter);
+		rspamd_min_heap_remove_elt (heap, elt);
+	}
+
 	prev = 0;
 
-	for (i = 0; i < 100500; i ++) {
+	for (i = 0; i < niter - nrem; i ++) {
 		elt = rspamd_min_heap_pop (heap);
 
 		if (prev != 0) {