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.

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

Add integration test for proxy #1029

Merged
merged 5 commits into from
Jul 30, 2020

Conversation

danielmitterdorfer
Copy link
Member

With this commit we migrate the integration test for HTTP proxy connections to
the new integration test infrastructure and cleanup any remaining leftovers in
the old script (which is still used for Docker release image tests).

Relates #975

@danielmitterdorfer danielmitterdorfer added enhancement Improves the status quo :misc Changes that don't affect users directly: linter fixes, test improvements, etc. labels Jul 20, 2020
@danielmitterdorfer danielmitterdorfer added this to the 2.0.1 milestone Jul 20, 2020
@danielmitterdorfer danielmitterdorfer self-assigned this Jul 20, 2020
@danielmitterdorfer
Copy link
Member Author

@elasticmachine test this please

@danielmitterdorfer danielmitterdorfer marked this pull request as ready for review July 21, 2020 06:03
@danielmitterdorfer
Copy link
Member Author

@elasticmachine test this please

Copy link
Contributor

@hub-cap hub-cap left a comment

Choose a reason for hiding this comment

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

Im so glad you are finishing this cleanup effort!! I have some Qs id like to see replies to, and then ill lgtm this !

release-docker-test.sh Outdated Show resolved Hide resolved
function kill_related_es_processes {
# kill all lingering Rally instances that might still be hanging
set +e
# kill all lingering Elasticsearch Docker containers launched by Rally
Copy link
Contributor

Choose a reason for hiding this comment

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

I see that you removed the portion of this method that kills any rally pids found using jps.. Do we not need this functionality anymore w/ the release tests?

Copy link
Contributor

Choose a reason for hiding this comment

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

Looking at this more, I assume this is because we are only concerned w/ cleanup from the script itself, and since the test is only running docker-compose test commands, we should have no need to kill rally outside of docker.

Copy link
Member Author

Choose a reason for hiding this comment

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

Correct. There are only Docker processes so no need to kill anything else.

it/proxy_test.py Outdated Show resolved Hide resolved
cfg = it.ConfigFile(config_name=None)
log_file = os.path.join(cfg.rally_home, "logs", "rally.log")

if os.path.exists(log_file):
Copy link
Contributor

Choose a reason for hiding this comment

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

just curious, why would we not just zero out the log contents if we want a new logfile every time, instead of moving its contents. I assume the contents of the "last run" are useless if its a passing test by the time you get to the next test.

Copy link
Member Author

Choose a reason for hiding this comment

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

The idea behind this is that we should keep the full history of the log file. I am not so concerned with CI but rather when you run the tests locally. It might be puzzling (and maybe even a problem) if we start truncating the log file.

Copy link
Contributor

Choose a reason for hiding this comment

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

oh ok this makes sense

@danielmitterdorfer
Copy link
Member Author

@hub-cap can you please have another look at this?

Copy link
Contributor

@hub-cap hub-cap left a comment

Choose a reason for hiding this comment

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

lgtm, ty for clarifications

@danielmitterdorfer danielmitterdorfer merged commit 3abeff0 into elastic:master Jul 30, 2020
@danielmitterdorfer danielmitterdorfer deleted the proxy-it branch July 30, 2020 14:41
@danielmitterdorfer
Copy link
Member Author

Thanks for the review!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Improves the status quo :misc Changes that don't affect users directly: linter fixes, test improvements, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants