Fixes failing appengine and vision tests (GoogleCloudPlatform#966)

Author: bshaffer

appengine/flexible/memcache/test/DeployTest.php

@@ -17,14 +17,12 @@
 namespace Google\Cloud\Test\Memcache;
 
 use Google\Cloud\TestUtils\AppEngineDeploymentTrait;
-use Google\Cloud\TestUtils\TestTrait;
 use Google\Cloud\TestUtils\FileUtil;
 use Symfony\Component\Yaml\Yaml;
 use PHPUnit\Framework\TestCase;
 
 class DeployTest extends TestCase
 {
-    use TestTrait;
     use AppEngineDeploymentTrait;
 
     public static function beforeDeploy()

appengine/php72/getting-started/test/DeployTest.php

@@ -18,7 +18,6 @@
 namespace Google\Cloud\Samples\Bookshelf;
 
 use Google\Cloud\TestUtils\AppEngineDeploymentTrait;
-use Google\Cloud\TestUtils\TestTrait;
 use Google\Cloud\TestUtils\FileUtil;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Yaml\Yaml;
@@ -28,8 +27,7 @@
  */
 class DeployTest extends TestCase
 {
-    use TestTrait,
-        AppEngineDeploymentTrait;
+    use AppEngineDeploymentTrait;
 
     private static function beforeDeploy()
     {

vision/test/visionTest.php

@@ -120,7 +120,7 @@ public function testLandmarkCommand()
     {
         $path = __DIR__ . '/data/tower.jpg';
         $output = $this->runCommand('landmark', ['path' => $path]);
-        $this->assertContains('Eiffel', $output);
+        $this->assertContains('Champ de Mars', $output);
     }
 
     public function testLandmarkCommandGcs()
@@ -129,7 +129,7 @@ public function testLandmarkCommandGcs()
 
         $path = 'gs://' . $bucketName . '/vision/tower.jpg';
         $output = $this->runCommand('landmark', ['path' => $path]);
-        $this->assertContains('Eiffel', $output);
+        $this->assertContains('Champ de Mars', $output);
     }
 
     public function testLandmarkCommandWithImageLackingLandmarks()