From 355ece62389eeae9bbb1c427dd134caddd862e84 Mon Sep 17 00:00:00 2001
From: Stephen Sawchuk <stephenplusplusplus@gmail.com>
Date: Mon, 27 Aug 2018 17:04:18 -0400
Subject: [PATCH] fix: (tests) Use a filter to locate datasets used in tests.

---
 system-test/bigquery.ts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/system-test/bigquery.ts b/system-test/bigquery.ts
index 4ed9a8a1..602b161e 100644
--- a/system-test/bigquery.ts
+++ b/system-test/bigquery.ts
@@ -32,7 +32,7 @@ const bigquery = new BigQuery();
 const storage = require('@google-cloud/storage')();
 
 describe('BigQuery', function() {
-  const GCLOUD_TESTS_PREFIX = 'gcloud_test_';
+  const GCLOUD_TESTS_PREFIX = 'nodejs_bq_test';
 
   const dataset = bigquery.dataset(generateName('dataset'));
   const table = dataset.table(generateName('table'));
@@ -98,8 +98,10 @@ describe('BigQuery', function() {
         // Remove datasets created for the tests.
         deleteDatasets,
 
-        // Create the test dataset.
-        dataset.create.bind(dataset),
+        // Create the test dataset with a label tagging this as a test run.
+        dataset.create.bind(dataset, {
+          labels: [{[GCLOUD_TESTS_PREFIX]: ''}]
+        }),
 
         // Create the test table.
         table.create.bind(table, {
@@ -1631,7 +1633,7 @@ describe('BigQuery', function() {
   });
 
   function generateName(resourceType) {
-    return (GCLOUD_TESTS_PREFIX + resourceType + '_' + uuid.v1()).replace(
+    return `${GCLOUD_TESTS_PREFIX}_${resourceType}_${uuid.v1()}`.replace(
       /-/g,
       '_'
     );
@@ -1674,7 +1676,7 @@ describe('BigQuery', function() {
   function deleteDatasets(callback) {
     bigquery.getDatasets(
       {
-        prefix: GCLOUD_TESTS_PREFIX,
+        filter: `labels.${GCLOUD_TESTS_PREFIX}`,
       },
       function(err, datasets) {
         if (err) {