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

Make bootstrap_pip_spec test argument optional #563

Merged
merged 2 commits into from
Apr 30, 2020
Merged

Make bootstrap_pip_spec test argument optional #563

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
8e1d360
Make bootstrap_pip_spec arg optional
GeorgianaElena Apr 30, 2020
c042c28
Remove space
GeorgianaElena Apr 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 7 additions & 4 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,9 @@ commands:
BOOTSTRAP_PIP_SPEC=git+https://github.com/$CIRCLE_PROJECT_USERNAME/the-littlest-jupyterhub.git@$CIRCLE_SHA1
fi

.circleci/integration-test.py run-test basic-tests \
"$BOOTSTRAP_PIP_SPEC" test_hub.py test_install.py test_extensions.py \
.circleci/integration-test.py run-test \
--bootstrap_pip_spec "$BOOTSTRAP_PIP_SPEC" \
basic-tests test_hub.py test_install.py test_extensions.py \
<< parameters.upgrade >>
admin_tests:
parameters:
Expand All @@ -76,7 +77,8 @@ commands:

.circleci/integration-test.py run-test \
--installer-args "--admin admin:admin" \
basic-tests $BOOTSTRAP_PIP_SPEC test_admin_installer.py \
--bootstrap_pip_spec $BOOTSTRAP_PIP_SPEC \
basic-tests test_admin_installer.py \
<< parameters.upgrade >>

plugin_tests:
Expand All @@ -95,8 +97,9 @@ commands:
fi

.circleci/integration-test.py run-test \
--bootstrap_pip_spec $BOOTSTRAP_PIP_SPEC \
--installer-args "--plugin /srv/src/integration-tests/plugins/simplest" \
plugins $BOOTSTRAP_PIP_SPEC test_simplest_plugin.py \
plugins test_simplest_plugin.py \
<< parameters.upgrade >>

bootstrap_checks:
Expand Down
2 changes: 1 addition & 1 deletion .circleci/integration-test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ def main():
run_test_parser = subparsers.add_parser('run-test')
run_test_parser.add_argument('--installer-args', default='')
run_test_parser.add_argument('--upgrade', action='store_true')
run_test_parser.add_argument('--bootstrap_pip_spec', nargs='?', default="", type=str)
Copy link
Contributor

Choose a reason for hiding this comment

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

Wondering whether the parameter should be named --bootstrap-pip-spec, similar to --installer-args? (so they both follow the same style)

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh, right 😕 Yes, that would be better.

run_test_parser.add_argument('test_name')
run_test_parser.add_argument('bootstrap_pip_spec')
run_test_parser.add_argument('test_files', nargs='+')

show_logs_parser = subparsers.add_parser('show-logs')
Expand Down