From: Monty Taylor <mordred@inaugust.com>
Date: Wed, 2 Dec 2009 23:07:20 +0000 (-0800)
Subject: Merged trunk.
X-Git-Tag: 0.37~83^2~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=604540c15315c6ed876082529f639697ba3eceab;p=m6w6%2Flibmemcached

Merged trunk.
---

604540c15315c6ed876082529f639697ba3eceab
diff --cc tests/function.c
index f1074697,84a053a4..c95d3348
--- a/tests/function.c
+++ b/tests/function.c
@@@ -4303,17 -4351,17 +4352,17 @@@ static test_return_t set_udp_behavior_t
  
    memcached_quit(memc);
    memc->number_of_hosts= 0;
 -  run_distribution(memc);
 +  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, memc->distribution);
-   assert(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_USE_UDP, 1) == MEMCACHED_SUCCESS);
-   assert(memc->flags & MEM_USE_UDP);
-   assert(memc->flags & MEM_NOREPLY);;
+   test_truth(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_USE_UDP, 1) == MEMCACHED_SUCCESS);
+   test_truth(memc->flags & MEM_USE_UDP);
+   test_truth(memc->flags & MEM_NOREPLY);;
  
-   assert(memc->number_of_hosts == 0);
+   test_truth(memc->number_of_hosts == 0);
  
    memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_USE_UDP,0);
-   assert(!(memc->flags & MEM_USE_UDP));
+   test_truth(!(memc->flags & MEM_USE_UDP));
    memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY,0);
-   assert(!(memc->flags & MEM_NOREPLY));
+   test_truth(!(memc->flags & MEM_NOREPLY));
    return TEST_SUCCESS;
  }