fixes DLP tests, marks them as not flakey (GoogleCloudPlatform#579)

Author: bshaffer

dlp/dlp.php

@@ -481,8 +481,8 @@
         InputArgument::REQUIRED,
         'The infoTypes corresponding to the chosen quasi-identifiers'
     )
-    ->addArgument('region-code', InputArgument::REQUIRED, 'The ISO 3166-1 region code that the data is representative of')
     ->addArgument('subscription-id', InputArgument::REQUIRED, 'The name of the Pub/Sub subscription to use when listening for job')
+    ->addArgument('region-code', InputArgument::OPTIONAL, 'The ISO 3166-1 region code that the data is representative of', 'US')
     ->addArgument('calling-project', InputArgument::OPTIONAL, 'The GCP Project ID to run the API call under', getenv('GOOGLE_PROJECT_ID'))
     ->addArgument('data-project', InputArgument::OPTIONAL, 'The GCP Project ID that the BigQuery table exists under', getenv('GOOGLE_PROJECT_ID'))
     ->setDescription('Computes the k-map risk estimation of a column set in a Google BigQuery table.')

dlp/test/dlpTest.php

@@ -362,7 +362,7 @@ public function testKMap()
             'data-project' => getenv('GOOGLE_PROJECT_ID'),
             'topic-id' => getenv('DLP_TOPIC'),
             'subscription-id' => getenv('DLP_SUBSCRIPTION'),
-            'region-code' => 'USA',
+            'region-code' => 'US',
             'quasi-ids' => 'Age,Gender',
             'info-types' => 'AGE,GENDER'
         ]);

monitoring/test/monitoringTest.php

@@ -88,8 +88,11 @@ public function testDeleteMetric()
 
     public function testWriteTimeseries()
     {
-        $output = $this->runCommand('write-timeseries');
-        $this->assertContains('Done writing time series data', $output);
+        // Catch all exceptions as this method occasionally throws an Internal error.
+        $this->runEventuallyConsistentTest(function () {
+            $output = $this->runCommand('write-timeseries');
+            $this->assertContains('Done writing time series data', $output);
+        }, self::RETRY_COUNT, true);
     }
 
     /** @depends testWriteTimeseries */

testing/run_test_suite.sh

@@ -22,7 +22,6 @@ fi
 # directories known as flaky tests
 FLAKES=(
     datastore/api
-    dlp
 )
 
 GRPC_ONLY_TESTS=(