Skip to content

kafka: fix integration test #17764

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
mattklein123 merged 2 commits into from
Aug 19, 2021
Merged

kafka: fix integration test #17764

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
04d2641
kafka: fix integration test
adamkotwasinski Aug 18, 2021
9cf8485
Remove waiting label
adamkotwasinski Aug 19, 2021
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 contrib/kafka/filters/network/test/broker/integration_test/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@ licenses(["notice"]) # Apache 2

envoy_contrib_package()

# This test sets up multiple services, and this can take variable amount of time (30-60 seconds).
envoy_py_test(
name = "kafka_broker_integration_test",
srcs = [
"kafka_broker_integration_test.py",
"@kafka_python_client//:all",
],
data = [
"//source/exe:envoy-static",
"//contrib/exe:envoy-static",
"//bazel:remote_jdk11",
"@kafka_server_binary//:all",
] + glob(["*.j2"]),
flaky = True,
python_version = "PY3",
srcs_version = "PY3",
tags = ["manual"],
Copy link
Contributor Author

@adamkotwasinski adamkotwasinski Aug 19, 2021

Choose a reason for hiding this comment

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

Given that Kafka has moved to contrib, why not give this a try, so far it appears to be stable.
In the worst case we'd go back to manual mode (and we're still keeping flaky just in case of slow machines, but the default of moderate = 5 minutes should be a good first idea).

deps = [
requirement("Jinja2"),
requirement("MarkupSafe"),
Expand Down
12 changes: 6 additions & 6 deletions contrib/kafka/filters/network/test/broker/integration_test/kafka_broker_integration_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,15 +441,15 @@ def find_java():
@staticmethod
def find_envoy():
"""
This method locates envoy binary.
It's present at ./source/exe/envoy-static (at least for mac/bazel-asan/bazel-tsan),
or at ./external/envoy/source/exe/envoy-static (for bazel-compile_time_options).
"""
This method locates envoy binary.
It's present at ./source/exe/envoy-static (at least for mac/bazel-asan/bazel-tsan),
or at ./external/envoy/source/exe/envoy-static (for bazel-compile_time_options).
"""

candidate = os.path.join('.', 'source', 'exe', 'envoy-static')
candidate = os.path.join('.', 'contrib', 'exe', 'envoy-static')
if os.path.isfile(candidate):
return candidate
candidate = os.path.join('.', 'external', 'envoy', 'source', 'exe', 'envoy-static')
candidate = os.path.join('.', 'external', 'envoy', 'contrib', 'exe', 'envoy-static')
if os.path.isfile(candidate):
return candidate
raise Exception("Could not find Envoy")
Expand Down