Skip to content
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

Jump to bottom

fix(logging): update test assertion and core version pins #10087

Merged
merged 3 commits into from
Jan 10, 2020
Merged

fix(logging): update test assertion and core version pins #10087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff106c1
Adjust request params assertion in test (timeout)
plamut Jan 10, 2020
2d7798d
Update version pins for core dependencies
plamut Jan 10, 2020
f42692c
Adjust assertion in system test
plamut Jan 10, 2020
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
4 changes: 2 additions & 2 deletions logging/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
# 'Development Status :: 5 - Production/Stable'
release_status = 'Development Status :: 5 - Production/Stable'
dependencies = [
"google-api-core[grpc] >= 1.14.0, < 2.0.0dev",
"google-cloud-core >= 1.0.3, < 2.0dev",
"google-api-core[grpc] >= 1.15.0, < 2.0.0dev",
"google-cloud-core >= 1.1.0, < 2.0dev",
]
extras = {
}
Expand Down
3 changes: 2 additions & 1 deletion logging/tests/system/test_system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,8 @@ def test_log_text_with_resource(self):
logger = Config.CLIENT.logger(self._logger_name("log_text_res"))
now = datetime.datetime.utcnow()
resource = Resource(
type="gae_app", labels={"module_id": "default", "version_id": "test"}
type="gae_app",
labels={"module_id": "default", "version_id": "test", "zone": ""},
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is something that was already failing on master, does not seem to be caused by version bumps in this PR.
(I did not research when exactly the failure was introduced, though)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I remember seeing something about this. It sounds like it changed fairly recently in the backend.

)

self.to_delete.append(logger)
Expand Down
6 changes: 5 additions & 1 deletion logging/tests/unit/test__http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,11 @@ def test_extra_headers(self):
}
expected_uri = conn.build_api_url("/rainbow")
http.request.assert_called_once_with(
data=req_data, headers=expected_headers, method="GET", url=expected_uri
data=req_data,
headers=expected_headers,
method="GET",
url=expected_uri,
timeout=None,
)


Expand Down