tests: fix failing kubernetes test (#194)

Author: daniel-sanche

packages/google-cloud-logging/tests/environment/deployable/python/snippets.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import logging
+import os
 
 try:
     import google.cloud.logging
@@ -45,3 +46,26 @@ def pylogging(log_text="pylogging", severity="warning", **kwargs):
         logging.error(log_text)
     else:
         logging.critical(log_text)
+
+def print_handlers(**kwargs):
+    root_logger = logging.getLogger()
+    handlers_str = ', '.join([type(h).__name__ for h in root_logger.handlers])
+    logging.info(handlers_str)
+
+def remove_stream_handlers(**kwargs):
+    logger = logging.getLogger()
+    for handler in logger.handlers:
+        if isinstance(handler, logging.StreamHandler):
+            logging.error(handler)
+            logger.removeHandler(handler)
+
+def print_env_vars(env_var=None, **kwargs):
+    if env_var:
+        value = os.environ.get(env_var, None)
+        if value:
+            logging.error(value)
+        else:
+            logging.error(f"{env_var}: not found")
+    else:
+        logging.error(os.environ)
+

packages/google-cloud-logging/tests/environment/envctl/env_scripts/python/functions.sh

@@ -48,7 +48,7 @@ deploy() {
   set +e
   gcloud pubsub topics create $SERVICE_NAME 2>/dev/null
   set -e
-  local RUNTIME="${2:-python37}"
+  local RUNTIME="${2:-python38}"
   # set up deployment directory
   # copy over local copy of library
   pushd $SUPERREPO_ROOT

packages/google-cloud-logging/tests/environment/envctl/env_scripts/python/kubernetes.sh

@@ -58,7 +58,7 @@ attach_or_create_gke_cluster(){
     echo "cluster not found. creating..."
     gcloud container clusters create $SERVICE_NAME \
       --zone $ZONE \
-      --scopes "https://www.googleapis.com/auth/pubsub"
+      --scopes=gke-default,pubsub
   fi
   set -e
 }
@@ -98,6 +98,7 @@ EOF
   set -e
   # deploy test container
   kubectl apply -f $TMP_DIR
+  sleep 60
   # wait for pod to spin up
   kubectl wait --for=condition=ready pod -l app=$SERVICE_NAME
   # wait for the pub/sub subscriber to start

packages/google-cloud-logging/tests/environment/tests/common/common.py

@@ -24,6 +24,7 @@
 from time import sleep
 from datetime import datetime
 from datetime import timezone
+from datetime import timedelta
 import os
 import sys
 import uuid
@@ -38,25 +39,24 @@ class Common:
     # environment name must be set by subclass
     environment = None
 
-    def _get_logs(self, timestamp=None):
+    def _add_time_condition_to_filter(self, filter_str, timestamp=None):
         time_format = "%Y-%m-%dT%H:%M:%S.%f%z"
         if not timestamp:
             timestamp = datetime.now(timezone.utc) - timedelta(minutes=10)
-        _, filter_str = self._script.run_command(Command.GetFilter)
-        filter_str += ' AND timestamp > "%s"' % timestamp.strftime(time_format)
+        return f'"{filter_str}" AND timestamp > "{timestamp.strftime(time_format)}"'
+
+
+    def _get_logs(self, filter_str=None):
+        if not filter_str:
+            _, filter_str = self._script.run_command(Command.GetFilter)
         iterator = self._client.list_entries(filter_=filter_str)
         entries = list(iterator)
         return entries
 
-    def _trigger(self, function, return_logs=True, **kwargs):
+    def _trigger(self, function, **kwargs):
         timestamp = datetime.now(timezone.utc)
         args_str = ",".join([f'{k}="{v}"' for k, v in kwargs.items()])
         self._script.run_command(Command.Trigger, [function, args_str])
-        # give the command time to be received
-        sleep(30)
-        if return_logs:
-            log_list = self._get_logs(timestamp)
-            return log_list
 
     @classmethod
     def setUpClass(cls):
@@ -90,7 +90,15 @@ def tearDown_class(cls):
 
     def test_receive_log(self):
         log_text = f"{inspect.currentframe().f_code.co_name}: {uuid.uuid1()}"
-        log_list = self._trigger("pylogging", log_text=log_text)
+        self._trigger("pylogging", log_text=log_text)
+        # give the command time to be received
+        sleep(30)
+        filter_str = self._add_time_condition_to_filter(log_text)
+        # retrieve resulting logs
+        log_list = self._get_logs(filter_str)
+
+        self.assertEqual(len(log_list), 1)
+
         found_log = None
         for log in log_list:
             message = (

tests/environment

@@ -1 +1 @@
-Subproject commit e4cab8acdbf0054a9e4b5b3b3a2bbc68f108d982
+Subproject commit 46658b49b65d40a1311704b3fe898f8737bb4137