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

Update testing infrastructure #609

Merged
merged 3 commits into from
Feb 28, 2019
Merged

Conversation

jkoelker
Copy link
Contributor

Uses a Makefile to drive testing. Allows locally running unit/integration tests with just docker/curl installed. Includes the two commits from #606. Will close that in favor of this one.

Fixes the flake8 W605 for the tests:

test_marathon_lb.py:1175:-359: W605 invalid escape sequence '\ '
test_marathon_lb.py:1922:-110: W605 invalid escape sequence '\ '
test_marathon_lb.py:1922:-90: W605 invalid escape sequence '\ '
test_marathon_lb.py:2835:22: W605 invalid escape sequence '\ '
test_marathon_lb.py:2852:-81: W605 invalid escape sequence '\ '
test_marathon_lb.py:2931:-182: W605 invalid escape sequence '\ '
test_marathon_lb.py:2931:-157: W605 invalid escape sequence '\ '
Fixes the flake8 E605 for the lines:

./config.py:264:34: W605 invalid escape sequence '\ '
./config.py:592:61: W605 invalid escape sequence '\ '
./config.py:596:-84: W605 invalid escape sequence '\ '
@jkoelker jkoelker mentioned this pull request Dec 20, 2018
@mesosphere-ci
Copy link
Collaborator

Can one of the admins verify this patch?

&& git -c advice.detachedHead=false \
clone --quiet --depth 1 --branch "${DCOS_E2E_VERSION}" \
https://github.com/dcos/dcos-e2e.git /usr/src/dcos-e2e \
&& pip3 install /usr/src/dcos-e2e \

Choose a reason for hiding this comment

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

I'm not aware of an advantage of this over pip3 install git+https://github.com/dcos/dcos-e2e.git@${DCOS_E2E_VERSION}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

git+https urls clone the entire history, during development it was noticeable that it was taking a while to build so I switched it to this. I guess installing from the 'archive' url like in requirements-dev.txt would do the same thing.

Choose a reason for hiding this comment

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

Good to know - another reason to switch to PyPI which I hope I can do sometime.

Copy link
Contributor

@vespian vespian left a comment

Choose a reason for hiding this comment

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

Few nits but nothing blocking. Happy to discuss.

Dockerfile.devkit Show resolved Hide resolved
Dockerfile.devkit Outdated Show resolved Hide resolved
@jkoelker
Copy link
Contributor Author

Fixed an issue in the readme, instructing to run make test-unit for the integration tests, where it should be make test-integration

Copy link
Contributor

@vespian vespian left a comment

Choose a reason for hiding this comment

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

I am sorry, but can we please have a chat and clarify few things first? Thank you!

Dockerfile.devkit Show resolved Hide resolved
Dockerfile.devkit Outdated Show resolved Hide resolved
Copy link
Contributor

@vespian vespian left a comment

Choose a reason for hiding this comment

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

Thanks @jkoelker ! 🚢

DCOS_E2E_DOWNLOAD_SITE := https://downloads.dcos.io/dcos

ifeq ($(strip $(DCOS_E2E_VARIANT)), enterprise)
DCOS_E2E_DOWNLOAD_SITE := $(strip \

Choose a reason for hiding this comment

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

Please see my DM about this and note here that the issue is acknowledged.

requirements-dev.txt Outdated Show resolved Hide resolved
All tests will be run locally in a docker container built/rebuilt on
demand.

All integration tests will be run locally in a cluster created by
DCOS E2E.
@jkoelker jkoelker merged commit 94c211f into mesosphere:master Feb 28, 2019
@jkoelker jkoelker deleted the dcos-e2e branch February 28, 2019 18:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants