Skip to content

Commit

Permalink
Merge pull request #566 from jtpio/integration-pip-spec
Browse files Browse the repository at this point in the history
Rename to --bootstrap-pip-spec in the integration tests
  • Loading branch information
GeorgianaElena committed May 4, 2020
2 parents 8841bf0 + 65d25aa commit 8d2a1c8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ commands:
fi
.circleci/integration-test.py run-test \
--bootstrap_pip_spec "$BOOTSTRAP_PIP_SPEC" \
--bootstrap-pip-spec "$BOOTSTRAP_PIP_SPEC" \
basic-tests test_hub.py test_install.py test_extensions.py \
<< parameters.upgrade >>
admin_tests:
Expand All @@ -77,7 +77,7 @@ commands:
.circleci/integration-test.py run-test \
--installer-args "--admin admin:admin" \
--bootstrap_pip_spec $BOOTSTRAP_PIP_SPEC \
--bootstrap-pip-spec $BOOTSTRAP_PIP_SPEC \
basic-tests test_admin_installer.py \
<< parameters.upgrade >>
Expand All @@ -97,7 +97,7 @@ commands:
fi
.circleci/integration-test.py run-test \
--bootstrap_pip_spec $BOOTSTRAP_PIP_SPEC \
--bootstrap-pip-spec $BOOTSTRAP_PIP_SPEC \
--installer-args "--plugin /srv/src/integration-tests/plugins/simplest" \
plugins test_simplest_plugin.py \
<< parameters.upgrade >>
Expand Down
2 changes: 1 addition & 1 deletion .circleci/integration-test.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ 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)
run_test_parser.add_argument('--bootstrap-pip-spec', nargs='?', default="", type=str)
run_test_parser.add_argument('test_name')
run_test_parser.add_argument('test_files', nargs='+')

Expand Down
4 changes: 2 additions & 2 deletions docs/contributing/tests.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ For example, to run all the basic tests, you would write:
This will run the tests in the three files against the same installation
of TLJH and report errors.

If you would like to run the tests with a custom pip spec for the bootstrap script, you can use the ``--bootstrap_pip_spec``
If you would like to run the tests with a custom pip spec for the bootstrap script, you can use the ``--bootstrap-pip-spec``
parameter:

.. code-block:: bash
.circleci/integration-test.py run-test <name-of-run> <test-file-names> \
--bootstrap_pip_spec="git+https://github.com/your-username/the-littlest-jupyterhub.git@branch-name"
--bootstrap-pip-spec="git+https://github.com/your-username/the-littlest-jupyterhub.git@branch-name"

0 comments on commit 8d2a1c8

Please sign in to comment.