functions: fix slack + pubsub tests

.kokoro/tests/run_tests.sh

@@ -50,7 +50,6 @@ gcloud auth activate-service-account \
 
 export GOOGLE_CLIENT_SECRETS=$(pwd)/testing/client-secrets.json
 source "${KOKORO_GFILE_DIR}/automl_secrets.txt"
-cp "${KOKORO_GFILE_DIR}/functions-slack-config.json" "functions/slack/config.json"
 
 # For Datalabeling samples to hit the testing endpoint
 export DATALABELING_ENDPOINT="test-datalabeling.sandbox.googleapis.com:443"

functions/pubsub/main.py

@@ -46,7 +46,6 @@ def publish(request):
         'data': {'message': message},
     })
     message_bytes = message_json.encode('utf-8')
-    print(message_bytes)
 
     # Publishes a message
     try:
@@ -62,7 +61,7 @@ def publish(request):
 
 # [START functions_pubsub_subscribe]
 # Triggered from a message on a Cloud Pub/Sub topic.
-def subscribe(event, context):
+def subscribe(event, _ = None):
     # Print out the data from Pub/Sub, to prove that it worked
     print(base64.b64decode(event['data']))
 # [END functions_pubsub_subscribe]

functions/pubsub/main_test.py

@@ -16,38 +16,34 @@
 import os
 
 from mock import MagicMock
-import pytest
 
 import main
 
 
 FUNCTIONS_TOPIC = os.getenv("FUNCTIONS_TOPIC")
 
 
-@pytest.mark.skip("broken")
 def test_functions_pubsub_publish_should_fail_without_params():
     request = MagicMock()
-    request.body.topic = None
+    request.get_json.return_value = {}
     response = main.publish(request)
 
     assert 'Missing "topic" and/or "subscription" parameter.' in response
 
 
-@pytest.mark.skip("broken")
 def test_functions_pubsub_publish_should_publish_message():
     request = MagicMock()
-    request.body.topic = FUNCTIONS_TOPIC
-    request.body.message = "my_message"
+    request.get_json.return_value = {
+        "topic": FUNCTIONS_TOPIC, "message": "my_message"
+    }
 
     response = main.publish(request)
 
     assert response == "Message published."
 
 
-@pytest.mark.skip("broken")
 def test_functions_pubsub_subscribe_should_print_message(capsys):
-    pubsub_message = MagicMock()
-    pubsub_message.data = base64.b64encode(b"Hello, world!")
+    pubsub_message = {"data": base64.b64encode(b"Hello, world!")}
 
     main.subscribe(pubsub_message)
 

functions/slack/main_test.py

@@ -48,7 +48,6 @@ def test_verify_signature_token_incorrect(self):
             request.headers = {'X-Slack-Signature': '12345'}
             main.verify_signature(request)
 
-    @pytest.mark.skip("broken")
     def test_verify_web_hook_valid_request(self):
         request = Request()
         request.headers = {
@@ -74,7 +73,6 @@ def test_make_search_request(self):
         assert 'lion' in message['attachments'][0]['title'].lower()
         assert message['attachments'][0]['color'] == '#3367d6'
 
-    @pytest.mark.skip("broken")
     def test_kg_search(self):
         with mock.patch.object(main, 'kgsearch'):
             entities = main.kgsearch.entities.return_value