Skip to content

Commit 895515a

Browse files
committed
Fix tests.
1 parent 51bb53a commit 895515a

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

tests/experimental/getmulti_badserver.phpt

+8-2
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,18 @@ echo $m->getResultMessage(), "\n";
1111
$m->addServer('localhost', 37712, 1);
1212

1313
var_dump($m->getMulti(array('foo', 'bar')));
14-
echo $m->getResultMessage(), "\n";
14+
switch ($m->getResultCode()) {
15+
case Memcached::RES_ERRNO:
16+
case Memcached::RES_SOME_ERRORS:
17+
break;
18+
default:
19+
echo $m->getResultCode(), ": ";
20+
echo $m->getResultMessage(), "\n";
21+
}
1522

1623
--EXPECT--
1724
array(0) {
1825
}
1926
NO SERVERS DEFINED
2027
array(0) {
2128
}
22-
SYSTEM ERROR

tests/experimental/getmulti_partial_error.phpt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
--TEST--
22
Memcached::getMulti() partial error
33
--SKIPIF--
4-
--XFAIL--
54
<?php if (!extension_loaded("memcached")) print "skip"; ?>
65
--FILE--
76
<?php
@@ -20,11 +19,12 @@ var_dump(count($m->deleteMulti(array("key1", "key2"))) == 2);
2019
$v = $m->getMulti(array_keys($data));
2120
var_dump(is_array($v));
2221
var_dump(count($v) < count($data));
23-
var_dump($m->getResultCode() == Memcached::RES_SUCCESS);
22+
var_dump($m->getResultCode() == Memcached::RES_SUCCESS ||
23+
$m->getResultCode() == Memcached::RES_SOME_ERRORS);
2424

2525
--EXPECT--
2626
bool(true)
2727
bool(true)
2828
bool(true)
2929
bool(true)
30-
bool(false)
30+
bool(true)

0 commit comments

Comments
 (0)