projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
jenkins-promote-staging-trunk-libmemcached-12
[m6w6/libmemcached]
/
tests
/
libmemcached-1.0
/
generate.cc
diff --git
a/tests/libmemcached-1.0/generate.cc
b/tests/libmemcached-1.0/generate.cc
index 4411d77f22129ed07e8bef1accd197b186c7b4c7..419d1ca273594b5e4e68fe06b1f141cb0e44ecd9 100644
(file)
--- a/
tests/libmemcached-1.0/generate.cc
+++ b/
tests/libmemcached-1.0/generate.cc
@@
-51,20
+51,22
@@
#define GLOBAL_COUNT 10000
#define GLOBAL2_COUNT 100
#define GLOBAL_COUNT 10000
#define GLOBAL2_COUNT 100
-static pairs_st *global_pairs;
+using namespace libtest;
+
+static pairs_st *global_pairs= NULL;
static const char *global_keys[GLOBAL_COUNT];
static size_t global_keys_length[GLOBAL_COUNT];
static size_t global_count= 0;
static const char *global_keys[GLOBAL_COUNT];
static size_t global_keys_length[GLOBAL_COUNT];
static size_t global_count= 0;
-test_return_t cleanup_pairs(memcached_st
*memc
)
+test_return_t cleanup_pairs(memcached_st
*
)
{
{
- (void)memc;
pairs_free(global_pairs);
pairs_free(global_pairs);
+ global_pairs= NULL;
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
-test_return_t generate_pairs(memcached_st *)
+
static
test_return_t generate_pairs(memcached_st *)
{
global_pairs= pairs_generate(GLOBAL_COUNT, 400);
global_count= GLOBAL_COUNT;
{
global_pairs= pairs_generate(GLOBAL_COUNT, 400);
global_count= GLOBAL_COUNT;
@@
-78,7
+80,7
@@
test_return_t generate_pairs(memcached_st *)
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
-test_return_t generate_large_pairs(memcached_st *)
+test_return_t generate_large_pairs(memcached_st *
memc
)
{
global_pairs= pairs_generate(GLOBAL2_COUNT, MEMCACHED_MAX_BUFFER+10);
global_count= GLOBAL2_COUNT;
{
global_pairs= pairs_generate(GLOBAL2_COUNT, MEMCACHED_MAX_BUFFER+10);
global_count= GLOBAL2_COUNT;
@@
-89,20
+91,30
@@
test_return_t generate_large_pairs(memcached_st *)
global_keys_length[x]= global_pairs[x].key_length;
}
global_keys_length[x]= global_pairs[x].key_length;
}
+ memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, true);
+ unsigned int check_execute= execute_set(memc, global_pairs, global_count);
+
+ test_true(check_execute > (global_count / 2));
+
return TEST_SUCCESS;
}
test_return_t generate_data(memcached_st *memc)
{
return TEST_SUCCESS;
}
test_return_t generate_data(memcached_st *memc)
{
+ test_compare(TEST_SUCCESS, generate_pairs(memc));
+
unsigned int check_execute= execute_set(memc, global_pairs, global_count);
unsigned int check_execute= execute_set(memc, global_pairs, global_count);
- test_compare_warn_hint(global_count, check_execute, "Possible false, positive, memcached may have ejected key/value based on memory needs");
+ test_true_hint(check_execute > (global_count / 2),
+ "Possible false, positive, memcached may have ejected key/value based on memory needs");
return TEST_SUCCESS;
}
test_return_t generate_data_with_stats(memcached_st *memc)
{
return TEST_SUCCESS;
}
test_return_t generate_data_with_stats(memcached_st *memc)
{
+ test_compare(TEST_SUCCESS, generate_pairs(memc));
+
unsigned int check_execute= execute_set(memc, global_pairs, global_count);
test_compare(check_execute, global_count);
unsigned int check_execute= execute_set(memc, global_pairs, global_count);
test_compare(check_execute, global_count);
@@
-192,7
+204,8
@@
test_return_t get_read(memcached_st *memc)
free(return_value);
}
}
free(return_value);
}
}
- test_compare_warn_hint(global_count, keys_returned, "Possible false, positive, memcached may have ejected key/value based on memory needs");
+ test_true_hint(keys_returned > (global_count / 2),
+ "Possible false, positive, memcached may have ejected key/value based on memory needs");
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-209,8
+222,7
@@
test_return_t mget_read(memcached_st *memc)
{
unsigned int keys_returned;
test_compare(TEST_SUCCESS, fetch_all_results(memc, keys_returned));
{
unsigned int keys_returned;
test_compare(TEST_SUCCESS, fetch_all_results(memc, keys_returned));
- test_true(keys_returned > 0);
- test_compare_warn_hint(global_count, keys_returned, "Possible false, positive, memcached may have ejected key/value based on memory needs");
+ test_true(keys_returned > (global_count / 2));
}
return TEST_SUCCESS;
}
return TEST_SUCCESS;
@@
-318,7
+330,8
@@
test_return_t delete_generate(memcached_st *memc)
total++;
}
}
total++;
}
}
- test_compare_warn_hint(global_count, total, "Possible false, positive, memcached may have ejected key/value based on memory needs");
+ test_true_hint(total > (global_count / 2),
+ "Possible false, positive, memcached may have ejected key/value based on memory needs");
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-335,7
+348,9
@@
test_return_t delete_buffer_generate(memcached_st *memc)
total++;
}
}
total++;
}
}
- test_compare_warn_hint(global_count, total, "Possible false, positive, memcached may have ejected key/value based on memory needs");
+
+ test_true_hint(total > (global_count / 2),
+ "Possible false, positive, memcached may have ejected key/value based on memory needs");
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}