Logging: Fix logging system tests (#4768)

Author: chemelnucfin

nox.py

@@ -113,10 +113,7 @@ def system(session, py):
         '-vvv',
         '-s',
         'tests/system',
-        *session.posargs,
-        # Currently allowed to fail due to very high flakiness.
-        success_codes=range(0, 100)
-    )
+        *session.posargs)
 
 
 @nox.session

tests/system/gapic/v2/test_system_logging_service_v2_v2.py

@@ -15,6 +15,7 @@
 import os
 import time
 
+import google.auth
 from google.api import monitored_resource_pb2
 from google.cloud import logging_v2
 from google.cloud.logging_v2.proto import log_entry_pb2
@@ -23,7 +24,7 @@
 
 class TestSystemLoggingServiceV2(object):
     def test_write_log_entries(self):
-        project_id = os.environ['PROJECT_ID']
+        _, project_id = google.auth.default()
 
         client = logging_v2.LoggingServiceV2Client()
         log_name = client.log_path(project_id, 'test-{0}'.format(time.time()))

tests/system/test_system.py

@@ -103,7 +103,11 @@ def setUp(self):
     def tearDown(self):
         retry = RetryErrors(NotFound, max_tries=9)
         for doomed in self.to_delete:
-            retry(doomed.delete)()
+            try:
+                retry(doomed.delete)()
+            except AttributeError:
+                client, dataset = doomed
+                retry(client.delete_dataset)(dataset)
         logging.getLogger().handlers = self._handlers_cache[:]
 
     @staticmethod
@@ -427,25 +431,24 @@ def test_create_sink_pubsub_topic(self):
 
     def _init_bigquery_dataset(self):
         from google.cloud import bigquery
-        from google.cloud.bigquery.dataset import AccessGrant
-        DATASET_NAME = (
+        from google.cloud.bigquery.dataset import AccessEntry
+        dataset_name = (
             'system_testing_dataset' + _RESOURCE_ID).replace('-', '_')
-        DATASET_URI = 'bigquery.googleapis.com/projects/%s/datasets/%s' % (
-            Config.CLIENT.project, DATASET_NAME,)
+        dataset_uri = 'bigquery.googleapis.com/projects/%s/datasets/%s' % (
+            Config.CLIENT.project, dataset_name,)
 
         # Create the destination dataset, and set up the ACL to allow
         # Stackdriver Logging to write into it.
         bigquery_client = bigquery.Client()
-        dataset = bigquery_client.dataset(DATASET_NAME)
-        dataset.create()
-        self.to_delete.append(dataset)
-        dataset.reload()
-        grants = dataset.access_grants
-        grants.append(AccessGrant(
-            'WRITER', 'groupByEmail', '[email protected]'))
-        dataset.access_grants = grants
-        dataset.update()
-        return DATASET_URI
+        dataset_ref = bigquery_client.dataset(dataset_name)
+        dataset = bigquery_client.create_dataset(bigquery.Dataset(dataset_ref))
+        self.to_delete.append((bigquery_client, dataset))
+        bigquery_client.get_dataset(dataset)
+        access = AccessEntry(
+            'WRITER', 'groupByEmail', '[email protected]')
+        dataset.access_entries.append(access)
+        bigquery_client.update_dataset(dataset, ['access_entries'])
+        return dataset_uri
 
     def test_create_sink_bigquery_dataset(self):
         SINK_NAME = 'test-create-sink-dataset%s' % (_RESOURCE_ID,)