Skip to content

Commit 3bd98dd

Browse files
committed
don't run this test for msgpack (object type lost on unserialize)
1 parent 16f8661 commit 3bd98dd

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

tests/config.inc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ function memc_create_combinations ($name, $serializer, $ignore_object_type = fal
4747
);
4848
}
4949

50-
function memc_get_serializer_options ()
50+
function memc_get_serializer_options ($skipmsgpack=false)
5151
{
5252
$options = memc_create_combinations ('PHP', Memcached::SERIALIZER_PHP);
5353

@@ -59,8 +59,8 @@ function memc_get_serializer_options ()
5959
$options = array_merge ($options, memc_create_combinations ('JSON', Memcached::SERIALIZER_JSON, true));
6060
}
6161

62-
if (Memcached::HAVE_MSGPACK) {
62+
if (Memcached::HAVE_MSGPACK && !$skipmsgpack) {
6363
$options = array_merge ($options, memc_create_combinations ('msgpack', Memcached::SERIALIZER_MSGPACK));
6464
}
6565
return $options;
66-
}
66+
}

tests/types.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ function types_simple_test ($m, $options)
7777
}
7878
}
7979

80-
memc_run_test ('types_simple_test', memc_get_serializer_options ());
80+
memc_run_test ('types_simple_test', memc_get_serializer_options (true));
8181

8282
?>
8383
--EXPECT--

tests/types_multi.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ function types_test ($m, $options)
6666
}
6767
}
6868

69-
memc_run_test ('types_test', memc_get_serializer_options ());
69+
memc_run_test ('types_test', memc_get_serializer_options (true));
7070

7171
?>
7272
--EXPECT--
73-
TEST DONE
73+
TEST DONE

0 commit comments

Comments
 (0)