Skip to content

Commit a0ed436

Browse files
committed
According to memcached wiki, touch is added since 1.4.8
https://github.com/memcached/memcached/wiki/ReleaseNotes148
1 parent 0acaa06 commit a0ed436

File tree

6 files changed

+24
-6
lines changed

6 files changed

+24
-6
lines changed

tests/config.inc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,8 @@ function memc_create_combinations ($name, $serializer, $ignore_object_type = fal
6666
),
6767
);
6868
}
69+
70+
function memc_get_version($memc, $host = '') {
71+
$version = $memc->getVersion();
72+
return array_pop($version);
73+
}

tests/expire.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ Memcached store, fetch & touch expired key
33
--XFAIL--
44
https://code.google.com/p/memcached/issues/detail?id=275
55
--SKIPIF--
6-
<?php include dirname(__FILE__) . "/skipif.inc";
6+
<?php
7+
$min_version = "1.4.8";
8+
include dirname(__FILE__) . "/skipif.inc";
79
if (!method_exists("memcached", "touch")) die ("skip memcached::touch is not available");
810
?>
911
--FILE--

tests/gh_155.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
Test for bug 155
33
--SKIPIF--
44
<?php
5+
$min_version = "1.4.8";
56
include dirname(__FILE__) . "/skipif.inc";
67
if (Memcached::LIBMEMCACHED_VERSION_HEX < 0x01000016) die ('skip too old libmemcached');
78
?>

tests/gh_77.phpt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
--TEST--
22
Test for Github issue #77
33
--SKIPIF--
4-
<?php include dirname(__FILE__) . "/skipif.inc";
5-
if (Memcached::LIBMEMCACHED_VERSION_HEX < 0x01000016) die ('skip too old libmemcached');
4+
<?php
5+
$min_version = "1.4.8";
6+
include dirname(__FILE__) . "/skipif.inc";
7+
if (Memcached::LIBMEMCACHED_VERSION_HEX < 0x01000016) die ('skip too old libmemcached');
68
?>
79
--FILE--
810
<?php

tests/skipif.inc

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ if (!extension_loaded("memcached")) {
55

66
include dirname(__FILE__) . "/config.inc";
77

8-
if (memc_get_instance() === NULL) {
8+
if (($m = memc_get_instance()) === NULL) {
99
die ("skip can not connect to server\n");
1010
}
11+
12+
if (isset($min_version)) {
13+
if (version_compare(memc_get_version($m), $min_version, "<")) {
14+
die("skip version of server pool is too old, $min_version is required\n");
15+
}
16+
}

tests/touch_binary.phpt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
--TEST--
22
Touch in binary mode
33
--SKIPIF--
4-
<?php include dirname(__FILE__) . "/skipif.inc";
5-
if (Memcached::LIBMEMCACHED_VERSION_HEX < 0x01000016) die ('skip too old libmemcached');
4+
<?php
5+
$min_version = "1.4.8"; //TOUCH is added since 1.4.8
6+
include dirname(__FILE__) . "/skipif.inc";
7+
if (Memcached::LIBMEMCACHED_VERSION_HEX < 0x01000016) die ('skip too old libmemcached');
68
?>
79
--FILE--
810
<?php

0 commit comments

Comments
 (0)