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

Tests for juju-http(s)-proxy environment variables #447

Merged

Conversation

VariableDeclared
Copy link
Contributor

Added tests to check layer-docker, charm-docker, and charm-containerd for correct setting of HTTP(S) environment variables.

@adam-stokes adam-stokes force-pushed the master branch 2 times, most recently from e096727 to dd7345b Compare July 2, 2019 17:10
@VariableDeclared VariableDeclared marked this pull request as ready for review July 3, 2019 15:52
@VariableDeclared VariableDeclared changed the title WIP: Tests for juju-http(s)-proxy environment variables Tests for juju-http(s)-proxy environment variables Jul 8, 2019
@VariableDeclared VariableDeclared changed the title Tests for juju-http(s)-proxy environment variables WIP: Tests for juju-http(s)-proxy environment variables Jul 8, 2019
@VariableDeclared VariableDeclared changed the title WIP: Tests for juju-http(s)-proxy environment variables Tests for juju-http(s)-proxy environment variables Jul 12, 2019
from .base import (
UseModel,
_juju_wait
)
Copy link
Contributor

Choose a reason for hiding this comment

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

You dont need UseModel anymore and _juju_wait has moved to utils. There is a fixture named model in conftest.py so you just need to pass that into your tests

from .base import (
UseModel,
_juju_wait
)
Copy link
Contributor

Choose a reason for hiding this comment

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

same as above

Copy link
Contributor

@adam-stokes adam-stokes left a comment

Choose a reason for hiding this comment

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

Looks good other than those minor items, get those fixed up and we can merge this, thanks!

Added integration test for HTTP proxy config using
the juju-http-proxy model settings.

Need to add tests for https, containerd, and
layer-docker.
Added integration tests to check if juju proxy keys
exist and override defined proxy values on the application.
Added tests to check layer-docker, charm-docker, and
charm-containerd for correct setting of HTTP(S)
environment variables.
Added tests to check for removal of https keys, refactored
code, and improved regex.
More refractoring, moved proxy out
to resolve crashing issues. Tests should be
good to go.
Added missing removal of kubernetes-worker
runtime relation.
Fixed destroying model at end of test.
Fixed model destroy call.
Controller causes tests to error out because of a missing
connection.
Added docs for http proxy tests
Corrected errors in Jenkinsfiles when referring to
parameters and renamed files appropriately.
Removed UseModel for current model fixture, also
moved _juju_wait to import from utils.py.
@adam-stokes adam-stokes merged commit 2660b9a into charmed-kubernetes:master Jul 18, 2019
@adam-stokes
Copy link
Contributor

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
2 participants