Skip to content

Commit 65424c6

Browse files
committed
environment variables in expecteds
1 parent 7cbf7f4 commit 65424c6

10 files changed

+10
-10
lines changed

tests/integration/memcached/test_basic.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
[{"name":"Datastore/allOther"}, [15, "??", "??", "??", "??", "??"]],
4747
[{"name":"Datastore/Memcached/all"}, [15, "??", "??", "??", "??", "??"]],
4848
[{"name":"Datastore/Memcached/allOther"}, [15, "??", "??", "??", "??", "??"]],
49-
[{"name":"Datastore/instance/Memcached/memcached/11211"}, [1, "??", "??", "??", "??", "??"]],
49+
[{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/ENV[MEMCACHE_PORT]"}, [1, "??", "??", "??", "??", "??"]],
5050
[{"name":"Datastore/operation/Memcached/add"}, [2, "??", "??", "??", "??", "??"]],
5151
[{"name":"Datastore/operation/Memcached/add",
5252
"scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]],

tests/integration/memcached/test_basic_logging_off.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
[{"name":"Datastore/allOther"}, [15, "??", "??", "??", "??", "??"]],
5050
[{"name":"Datastore/Memcached/all"}, [15, "??", "??", "??", "??", "??"]],
5151
[{"name":"Datastore/Memcached/allOther"}, [15, "??", "??", "??", "??", "??"]],
52-
[{"name":"Datastore/instance/Memcached/memcached/11211"}, [1, "??", "??", "??", "??", "??"]],
52+
[{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/ENV[MEMCACHE_PORT]"}, [1, "??", "??", "??", "??", "??"]],
5353
[{"name":"Datastore/operation/Memcached/add"}, [2, "??", "??", "??", "??", "??"]],
5454
[{"name":"Datastore/operation/Memcached/add",
5555
"scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]],

tests/integration/memcached/test_by_key.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
[{"name":"Datastore/allOther"}, [11, "??", "??", "??", "??", "??"]],
4949
[{"name":"Datastore/Memcached/all"}, [11, "??", "??", "??", "??", "??"]],
5050
[{"name":"Datastore/Memcached/allOther"}, [11, "??", "??", "??", "??", "??"]],
51-
[{"name":"Datastore/instance/Memcached/memcached/11211"}, [1, "??", "??", "??", "??", "??"]],
51+
[{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/ENV[MEMCACHE_PORT]"}, [1, "??", "??", "??", "??", "??"]],
5252
[{"name":"Datastore/operation/Memcached/add"}, [2, "??", "??", "??", "??", "??"]],
5353
[{"name":"Datastore/operation/Memcached/add",
5454
"scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]],

tests/integration/memcached/test_cas.php7.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
[{"name":"Datastore/allOther"}, [5, "??", "??", "??", "??", "??"]],
4343
[{"name":"Datastore/Memcached/all"}, [5, "??", "??", "??", "??", "??"]],
4444
[{"name":"Datastore/Memcached/allOther"}, [5, "??", "??", "??", "??", "??"]],
45-
[{"name":"Datastore/instance/Memcached/memcached/11211"}, [1, "??", "??", "??", "??", "??"]],
45+
[{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/ENV[MEMCACHE_PORT]"}, [1, "??", "??", "??", "??", "??"]],
4646
[{"name":"Datastore/operation/Memcached/delete"}, [1, "??", "??", "??", "??", "??"]],
4747
[{"name":"Datastore/operation/Memcached/delete",
4848
"scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]],

tests/integration/memcached/test_cas_by_key.php7.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
[{"name":"Datastore/allOther"}, [5, "??", "??", "??", "??", "??"]],
4343
[{"name":"Datastore/Memcached/all"}, [5, "??", "??", "??", "??", "??"]],
4444
[{"name":"Datastore/Memcached/allOther"}, [5, "??", "??", "??", "??", "??"]],
45-
[{"name":"Datastore/instance/Memcached/memcached/11211"}, [1, "??", "??", "??", "??", "??"]],
45+
[{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/ENV[MEMCACHE_PORT]"}, [1, "??", "??", "??", "??", "??"]],
4646
[{"name":"Datastore/operation/Memcached/delete"}, [1, "??", "??", "??", "??", "??"]],
4747
[{"name":"Datastore/operation/Memcached/delete",
4848
"scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]],

tests/integration/memcached/test_concat.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
[{"name":"Datastore/allOther"}, [5, "??", "??", "??", "??", "??"]],
3636
[{"name":"Datastore/Memcached/all"}, [5, "??", "??", "??", "??", "??"]],
3737
[{"name":"Datastore/Memcached/allOther"}, [5, "??", "??", "??", "??", "??"]],
38-
[{"name":"Datastore/instance/Memcached/memcached/11211"}, [1, "??", "??", "??", "??", "??"]],
38+
[{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/ENV[MEMCACHE_PORT]"}, [1, "??", "??", "??", "??", "??"]],
3939
[{"name":"Datastore/operation/Memcached/delete"}, [1, "??", "??", "??", "??", "??"]],
4040
[{"name":"Datastore/operation/Memcached/delete",
4141
"scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]],

tests/integration/memcached/test_concat_by_key.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
[{"name":"Datastore/allOther"}, [5, "??", "??", "??", "??", "??"]],
3636
[{"name":"Datastore/Memcached/all"}, [5, "??", "??", "??", "??", "??"]],
3737
[{"name":"Datastore/Memcached/allOther"}, [5, "??", "??", "??", "??", "??"]],
38-
[{"name":"Datastore/instance/Memcached/memcached/11211"}, [1, "??", "??", "??", "??", "??"]],
38+
[{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/ENV[MEMCACHE_PORT]"}, [1, "??", "??", "??", "??", "??"]],
3939
[{"name":"Datastore/operation/Memcached/delete"}, [1, "??", "??", "??", "??", "??"]],
4040
[{"name":"Datastore/operation/Memcached/delete",
4141
"scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]],

tests/integration/memcached/test_concat_by_key_logging_off.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
[{"name":"Datastore/allOther"}, [5, "??", "??", "??", "??", "??"]],
3939
[{"name":"Datastore/Memcached/all"}, [5, "??", "??", "??", "??", "??"]],
4040
[{"name":"Datastore/Memcached/allOther"}, [5, "??", "??", "??", "??", "??"]],
41-
[{"name":"Datastore/instance/Memcached/memcached/11211"}, [1, "??", "??", "??", "??", "??"]],
41+
[{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/ENV[MEMCACHE_PORT]"}, [1, "??", "??", "??", "??", "??"]],
4242
[{"name":"Datastore/operation/Memcached/delete"}, [1, "??", "??", "??", "??", "??"]],
4343
[{"name":"Datastore/operation/Memcached/delete",
4444
"scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]],

tests/integration/memcached/test_multi.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
[{"name":"Datastore/allOther"}, [5, "??", "??", "??", "??", "??"]],
4343
[{"name":"Datastore/Memcached/all"}, [5, "??", "??", "??", "??", "??"]],
4444
[{"name":"Datastore/Memcached/allOther"}, [5, "??", "??", "??", "??", "??"]],
45-
[{"name":"Datastore/instance/Memcached/memcached/11211"}, [1, "??", "??", "??", "??", "??"]],
45+
[{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/ENV[MEMCACHE_PORT]"}, [1, "??", "??", "??", "??", "??"]],
4646
[{"name":"Datastore/operation/Memcached/get"}, [4, "??", "??", "??", "??", "??"]],
4747
[{"name":"Datastore/operation/Memcached/get",
4848
"scope":"OtherTransaction/php__FILE__"}, [4, "??", "??", "??", "??", "??"]],

tests/integration/memcached/test_multi_by_key.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
[{"name":"Datastore/allOther"}, [5, "??", "??", "??", "??", "??"]],
4343
[{"name":"Datastore/Memcached/all"}, [5, "??", "??", "??", "??", "??"]],
4444
[{"name":"Datastore/Memcached/allOther"}, [5, "??", "??", "??", "??", "??"]],
45-
[{"name":"Datastore/instance/Memcached/memcached/11211"}, [1, "??", "??", "??", "??", "??"]],
45+
[{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/ENV[MEMCACHE_PORT]"}, [1, "??", "??", "??", "??", "??"]],
4646
[{"name":"Datastore/operation/Memcached/get"}, [4, "??", "??", "??", "??", "??"]],
4747
[{"name":"Datastore/operation/Memcached/get",
4848
"scope":"OtherTransaction/php__FILE__"}, [4, "??", "??", "??", "??", "??"]],

0 commit comments

Comments
 (0)