Merge pull request #17852 from grpc/revert-17728-memory_leak_test

Revert "Memory leak test for PHP unit tests"

src/php/bin/run_tests.sh

@@ -22,17 +22,9 @@ cd src/php/bin
 source ./determine_extension_dir.sh
 # in some jenkins macos machine, somehow the PHP build script can't find libgrpc.dylib
 export DYLD_LIBRARY_PATH=$root/libs/$CONFIG
-
 php $extension_dir -d max_execution_time=300 $(which phpunit) -v --debug \
   --exclude-group persistent_list_bound_tests ../tests/unit_tests
 
 php $extension_dir -d max_execution_time=300 $(which phpunit) -v --debug \
   ../tests/unit_tests/PersistentChannelTests
 
-export ZEND_DONT_UNLOAD_MODULES=1
-export USE_ZEND_ALLOC=0
-# Detect whether valgrind is executable
-if [ -x "$(command -v valgrind)" ]; then
-  valgrind --error-exitcode=10 --leak-check=yes php $extension_dir -d max_execution_time=300 \
-	../tests/MemoryLeakTest/MemoryLeakTest.php
-fi

src/php/tests/unit_tests/CallTest.php

@@ -86,16 +86,6 @@ class CallTest extends PHPUnit_Framework_TestCase
         $this->assertTrue($result->send_metadata);
     }
 
-    public function testAddMultiAndMultiValueMetadata()
-    {
-        $batch = [
-            Grpc\OP_SEND_INITIAL_METADATA => ['key1' => ['value1', 'value2'],
-                                              'key2' => ['value3', 'value4'],],
-        ];
-        $result = $this->call->startBatch($batch);
-        $this->assertTrue($result->send_metadata);
-    }
-
     public function testGetPeer()
     {
         $this->assertTrue(is_string($this->call->getPeer()));

templates/tools/dockerfile/php_valgrind.include

@@ -1,7 +0,0 @@
-#=================
-# PHP Test dependencies
-
-# Install dependencies
-
-RUN apt-get update && apt-get install -y ${'\\'}
-    valgrind

templates/tools/dockerfile/test/php7_jessie_x64/Dockerfile.template

@@ -19,7 +19,6 @@
   <%include file="../../php7_deps.include"/>
   <%include file="../../gcp_api_libraries.include"/>
   <%include file="../../python_deps.include"/>
-  <%include file="../../php_valgrind.include"/>
   <%include file="../../run_tests_addons.include"/>
   # Define the default command.
   CMD ["bash"]

templates/tools/dockerfile/test/php_jessie_x64/Dockerfile.template

@@ -20,7 +20,6 @@
   <%include file="../../gcp_api_libraries.include"/>
   <%include file="../../python_deps.include"/>
   <%include file="../../php_deps.include"/>
-  <%include file="../../php_valgrind.include"/>
   <%include file="../../run_tests_addons.include"/>
   # Define the default command.
   CMD ["bash"]

tools/dockerfile/test/php7_jessie_x64/Dockerfile

@@ -79,14 +79,6 @@ RUN pip install --upgrade pip==10.0.1
 RUN pip install virtualenv
 RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0
 
-#=================
-# PHP Test dependencies
-
-# Install dependencies
-
-RUN apt-get update && apt-get install -y \
-    valgrind
-
 
 RUN mkdir /var/local/jenkins
 

tools/dockerfile/test/php_jessie_x64/Dockerfile

@@ -76,14 +76,6 @@ RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 t
 RUN apt-get update && apt-get install -y \
     git php5 php5-dev phpunit unzip
 
-#=================
-# PHP Test dependencies
-
-# Install dependencies
-
-RUN apt-get update && apt-get install -y \
-    valgrind
-
 
 RUN mkdir /var/local/jenkins