Merge pull request #566 from jtpio/integration-pip-spec

Rename to --bootstrap-pip-spec in the integration tests
This commit is contained in:
Georgiana Elena
2020-05-04 15:14:05 +03:00
committed by GitHub
3 changed files with 6 additions and 6 deletions

View File

@@ -57,7 +57,7 @@ commands:
fi fi
.circleci/integration-test.py run-test \ .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 \ basic-tests test_hub.py test_install.py test_extensions.py \
<< parameters.upgrade >> << parameters.upgrade >>
admin_tests: admin_tests:
@@ -77,7 +77,7 @@ commands:
.circleci/integration-test.py run-test \ .circleci/integration-test.py run-test \
--installer-args "--admin admin:admin" \ --installer-args "--admin admin:admin" \
--bootstrap_pip_spec $BOOTSTRAP_PIP_SPEC \ --bootstrap-pip-spec $BOOTSTRAP_PIP_SPEC \
basic-tests test_admin_installer.py \ basic-tests test_admin_installer.py \
<< parameters.upgrade >> << parameters.upgrade >>
@@ -97,7 +97,7 @@ commands:
fi fi
.circleci/integration-test.py run-test \ .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" \ --installer-args "--plugin /srv/src/integration-tests/plugins/simplest" \
plugins test_simplest_plugin.py \ plugins test_simplest_plugin.py \
<< parameters.upgrade >> << parameters.upgrade >>

View File

@@ -158,7 +158,7 @@ def main():
run_test_parser = subparsers.add_parser('run-test') run_test_parser = subparsers.add_parser('run-test')
run_test_parser.add_argument('--installer-args', default='') run_test_parser.add_argument('--installer-args', default='')
run_test_parser.add_argument('--upgrade', action='store_true') 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_name')
run_test_parser.add_argument('test_files', nargs='+') run_test_parser.add_argument('test_files', nargs='+')

View File

@@ -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 This will run the tests in the three files against the same installation
of TLJH and report errors. 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: parameter:
.. code-block:: bash .. code-block:: bash
.circleci/integration-test.py run-test <name-of-run> <test-file-names> \ .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"