Skip to content

Logging: Fix tests. #8273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tseaver merged 2 commits into from
Jun 24, 2019
Merged

Logging: Fix tests. #8273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d36fef
Import datetime.
busunkim96 Jun 11, 2019
435dcd3
Fix mocks.
busunkim96 Jun 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion logging/google/cloud/logging/handlers/transports/background_thread.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
from __future__ import print_function

import atexit
import datetime
import logging
import sys
import threading
Expand Down Expand Up @@ -261,7 +262,7 @@ def enqueue(
"labels": labels,
"trace": trace,
"span_id": span_id,
"timestamp": datetime.utcfromtimestamp(record.created),
"timestamp": datetime.datetime.utcfromtimestamp(record.created),
}
)

Expand Down
10 changes: 8 additions & 2 deletions logging/tests/unit/handlers/transports/test_background_thread.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import time
import logging
import unittest

Expand Down Expand Up @@ -243,7 +244,9 @@ def test__main_thread_terminated_non_empty_queue(self):
worker = self._make_one(_Logger(self.NAME))

self._start_with_thread_patch(worker)
worker.enqueue(mock.Mock(), "")
record = mock.Mock()
record.created = time.time()
worker.enqueue(record, "")
worker._main_thread_terminated()

self.assertFalse(worker.is_alive)
Expand All @@ -253,7 +256,9 @@ def test__main_thread_terminated_did_not_join(self):

self._start_with_thread_patch(worker)
worker._thread._terminate_on_join = False
worker.enqueue(mock.Mock(), "")
record = mock.Mock()
record.created = time.time()
worker.enqueue(record, "")
worker._main_thread_terminated()

self.assertFalse(worker.is_alive)
Expand Down Expand Up @@ -431,6 +436,7 @@ def log_struct(
labels=None,
trace=None,
span_id=None,
timestamp=None,
):
from google.cloud.logging.logger import _GLOBAL_RESOURCE

Expand Down