Skip to content

Commit e60e02e

Browse files
committed
Test cleanup.
1 parent de487ff commit e60e02e

13 files changed

+18
-14
lines changed

Diff for: .gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,19 @@ tests/*.out
5353
tests/*.diff
5454
tests/*.php
5555
tests/*.exp
56+
tests/*.sh
5657
tests/*/*.log
5758
tests/*/*.mem
5859
tests/*/*.out
5960
tests/*/*.diff
6061
tests/*/*.php
6162
tests/*/*.exp
63+
tests/*/*.sh
6264
tests/*/*/*.log
6365
tests/*/*/*.mem
6466
tests/*/*/*.out
6567
tests/*/*/*.diff
6668
tests/*/*/*.php
6769
tests/*/*/*.exp
70+
tests/*/*/*.sh
6871
tmp-php.ini

Diff for: tests/experimental/append.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ var_dump($m->get('foo'));
2525
NULL
2626
%s: cannot append/prepend with compression turned on
2727
bool(false)
28-
NULL
28+
bool(false)
2929
bool(true)
3030
string(2) "ab"

Diff for: tests/experimental/cachecallback.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Exception in callback
5959
Miss
6060
string(3) "foo"
6161
NULL
62-
NULL
62+
bool(false)
6363
Miss
6464
string(3) "foo"
6565
NULL

Diff for: tests/experimental/delete_bykey.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ bool(true)
2929
SUCCESS
3030
bool(false)
3131
NOT FOUND
32-
NULL
32+
bool(false)
3333
bool(false)
3434
A BAD KEY WAS PROVIDED/CHARACTERS OUT OF RANGE
3535
bool(false)

Diff for: tests/experimental/get.phpt

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ $m->delete('foo');
2323
var_dump($m->get(' ä foo jkh a s åäö'));
2424
echo $m->getResultMessage(), "\n";
2525
--EXPECT--
26-
NULL
26+
bool(false)
2727
NOT FOUND
28-
NULL
28+
bool(false)
2929
A BAD KEY WAS PROVIDED/CHARACTERS OUT OF RANGE
3030
string(4) "asdf"
3131
SUCCESS
32-
NULL
32+
bool(false)
3333
NOT FOUND

Diff for: tests/experimental/get_bykey.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ int(1)
3030
SUCCESS
3131
string(4) "asdf"
3232
SUCCESS
33-
NULL
33+
bool(false)
3434
NOT FOUND

Diff for: tests/experimental/get_bykey_cas.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ SUCCESS
5858
string(4) "asdf"
5959
float(%d)
6060
SUCCESS
61-
NULL
61+
bool(false)
6262
NULL
6363
NOT FOUND
64-
NULL
64+
bool(false)
6565
NULL
6666
A BAD KEY WAS PROVIDED/CHARACTERS OUT OF RANGE
6767
called

Diff for: tests/experimental/incrdecr.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ var_dump($m->get('foo'));
3838
Not there
3939
bool(false)
4040
bool(false)
41-
NULL
41+
bool(false)
4242
Normal
4343
int(1)
4444
int(2)

Diff for: tests/experimental/moduleinfo.phpt

+1
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ memcached.serializer => %s => %s
2626
memcached.sess_lock_wait => %d => %d
2727
memcached.sess_locking => %d => %d
2828
memcached.sess_prefix => %s => %s
29+
memcached.use_sasl => %s => %s

Diff for: tests/experimental/prepend.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ var_dump($m->get('foo'));
2525
NULL
2626
%s: cannot append/prepend with compression turned on
2727
bool(false)
28-
NULL
28+
bool(false)
2929
bool(true)
3030
string(2) "ba"

Diff for: tests/experimental/replace.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ var_dump($m->get('foo'));
2020
--EXPECTF--
2121
bool(false)
2222

23-
NULL
23+
bool(false)
2424
bool(true)
2525
string(3) "bar"

Diff for: tests/experimental/replace_bykey.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ var_dump($m->getByKey('kef', 'foo'));
2222
bool(false)
2323

2424
%rNOT STORED|NOT FOUND%r
25-
NULL
25+
bool(false)
2626
bool(true)
2727
string(3) "bar"

Diff for: tests/experimental/stats_badserver.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ SUCCESS
2828
array(0) {
2929
}
3030
SOME ERRORS WERE REPORTED
31-
int(1)
31+
int(2)
3232
bool(true)
3333
int(%d)

0 commit comments

Comments
 (0)