rollback unintentional changes

Author: ViktorSky

snippets/messaging/cloud_messaging.py

@@ -244,6 +244,28 @@ def send_each():
     print(f'{response.success_count} messages were sent successfully')
     # [END send_each]
 
+
+def send_each_for_multicast():
+    # [START send_each_for_multicast]
+    # Create a list containing up to 500 registration tokens.
+    # These registration tokens come from the client FCM SDKs.
+    registration_tokens = [
+        'YOUR_REGISTRATION_TOKEN_1',
+        # ...
+        'YOUR_REGISTRATION_TOKEN_N',
+    ]
+
+    message = messaging.MulticastMessage(
+        data={'score': '850', 'time': '2:45'},
+        tokens=registration_tokens,
+    )
+    response = messaging.send_each_for_multicast(message)
+    # See the BatchResponse reference documentation
+    # for the contents of response.
+    print(f'{response.success_count} messages were sent successfully')
+    # [END send_each_for_multicast]
+
+
 def send_each_for_multicast_and_handle_errors():
     # [START send_each_for_multicast_error]
     # These registration tokens come from the client FCM SDKs.

tests/test_functions.py

@@ -14,7 +14,7 @@
 
 """Test cases for the firebase_admin.functions module."""
 
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timedelta
 import json
 import time
 import pytest
@@ -33,6 +33,8 @@
     _CLOUD_TASKS_URL + 'projects/test-project/locations/us-central1/queues/test-function-name/tasks'
 _DEFAULT_TASK_URL = _CLOUD_TASKS_URL + _DEFAULT_TASK_PATH
 _DEFAULT_RESPONSE = json.dumps({'name': _DEFAULT_TASK_PATH})
+_ENQUEUE_TIME = datetime.utcnow()
+_SCHEDULE_TIME = _ENQUEUE_TIME + timedelta(seconds=100)
 
 class TestTaskQueue:
     @classmethod
@@ -183,55 +185,36 @@ def _instrument_functions_service(self, app=None, status=200, payload=_DEFAULT_R
             testutils.MockAdapter(payload, status, recorder))
         return functions_service, recorder
 
-    def test_task_options_delay_seconds(self):
-        _, recorder = self._instrument_functions_service()
-        enqueue_time = datetime.now(timezone.utc)
-        expected_schedule_time = enqueue_time + timedelta(seconds=100)
-        task_opts_params = {
+    @pytest.mark.parametrize('task_opts_params', [
+        {
             'schedule_delay_seconds': 100,
             'schedule_time': None,
             'dispatch_deadline_seconds': 200,
             'task_id': 'test-task-id',
             'headers': {'x-test-header': 'test-header-value'},
             'uri': 'https://google.com'
-        }
-        queue = functions.task_queue('test-function-name')
-        task_opts = functions.TaskOptions(**task_opts_params)
-        queue.enqueue(_DEFAULT_DATA, task_opts)
-
-        assert len(recorder) == 1
-        task = json.loads(recorder[0].body.decode())['task']
-
-        task_schedule_time = datetime.fromisoformat(task['schedule_time'].replace('Z', '+00:00'))
-        delta = abs(task_schedule_time - expected_schedule_time)
-        assert delta <= timedelta(seconds=1)
-
-        assert task['dispatch_deadline'] == '200s'
-        assert task['http_request']['headers']['x-test-header'] == 'test-header-value'
-        assert task['http_request']['url'] in ['http://google.com', 'https://google.com']
-        assert task['name'] == _DEFAULT_TASK_PATH
-
-    def test_task_options_utc_time(self):
-        _, recorder = self._instrument_functions_service()
-        enqueue_time = datetime.now(timezone.utc)
-        expected_schedule_time = enqueue_time + timedelta(seconds=100)
-        task_opts_params = {
+        },
+        {
             'schedule_delay_seconds': None,
-            'schedule_time': expected_schedule_time,
+            'schedule_time': _SCHEDULE_TIME,
             'dispatch_deadline_seconds': 200,
             'task_id': 'test-task-id',
             'headers': {'x-test-header': 'test-header-value'},
             'uri': 'http://google.com'
-        }
+        },
+    ])
+    def test_task_options(self, task_opts_params):
+        _, recorder = self._instrument_functions_service()
         queue = functions.task_queue('test-function-name')
         task_opts = functions.TaskOptions(**task_opts_params)
         queue.enqueue(_DEFAULT_DATA, task_opts)
 
         assert len(recorder) == 1
         task = json.loads(recorder[0].body.decode())['task']
 
-        task_schedule_time = datetime.fromisoformat(task['schedule_time'].replace('Z', '+00:00'))
-        assert task_schedule_time == expected_schedule_time
+        schedule_time = datetime.fromisoformat(task['schedule_time'][:-1])
+        delta = abs(schedule_time - _SCHEDULE_TIME)
+        assert delta <= timedelta(seconds=15)
 
         assert task['dispatch_deadline'] == '200s'
         assert task['http_request']['headers']['x-test-header'] == 'test-header-value'
@@ -240,8 +223,7 @@ def test_task_options_utc_time(self):
 
     def test_schedule_set_twice_error(self):
         _, recorder = self._instrument_functions_service()
-        opts = functions.TaskOptions(
-            schedule_delay_seconds=100, schedule_time=datetime.now(timezone.utc))
+        opts = functions.TaskOptions(schedule_delay_seconds=100, schedule_time=datetime.utcnow())
         queue = functions.task_queue('test-function-name')
         with pytest.raises(ValueError) as excinfo:
             queue.enqueue(_DEFAULT_DATA, opts)
@@ -252,9 +234,9 @@ def test_schedule_set_twice_error(self):
 
     @pytest.mark.parametrize('schedule_time', [
         time.time(),
-        str(datetime.now(timezone.utc)),
-        datetime.now(timezone.utc).isoformat(),
-        datetime.now(timezone.utc).isoformat() + 'Z',
+        str(datetime.utcnow()),
+        datetime.utcnow().isoformat(),
+        datetime.utcnow().isoformat() + 'Z',
         '', ' '
     ])
     def test_invalid_schedule_time_error(self, schedule_time):