test_script: Reword provision warning not to assume running tests.

Previously, running `./tools/run-dev.py` when provision was required
would lead to a warning along the lines of:
```
Before we run tests, we make sure your provisioning version
is correct by looking at var/provision_version, which is at
version 165.1, and we compare it to the version in source
control (version.py), which is 165.2.

It looks like you checked out a branch that has added
dependencies beyond what you last provisioned. Your command
is likely to fail until you add dependencies by provisioning.

Do this: `./tools/provision`

If you really know what you are doing, use --skip-provision-check to
run anyway.
```

The assumption that we're trying to run tests might cause some
confusion, especially if its the first time you're seeing the
provision warning. Hence, we reword the first paragraph to avoid
making that assumption.

The second paragraph has also been slightly altered, since (1) it's
possible that we didn't checkout a different branch, but eg just
rebased with upstream and (2) we might not be on a VM.

The warning you'd get after this commit would be along the lines of:
```
Provisioning state check failed! This check compares
`var/provision_version` (currently 165.2) to the version in
source control (`version.py`), which is 164.6, to see if you
likely need to provision before this command can run
properly.

The branch you are currently on expects an older version of
dependencies than the version you provisioned last. This may
be ok, but it's likely that you either want to rebase your
branch on top of upstream/main or re-provision your machine.

Do this: `./tools/provision`

If you really know what you are doing, use --skip-provision-check to
run anyway.
```
or along the lines of:
```
Provisioning state check failed! This check compares
`var/provision_version` (currently 165.2) to the version in
source control (`version.py`), which is 167.2, to see if you
likely need to provision before this command can run
properly.

The branch you are currently on has added dependencies beyond
what you last provisioned. Your command is likely to fail
until you add dependencies by provisioning.

Do this: `./tools/provision`

If you really know what you are doing, use --skip-provision-check to
run anyway.
```
This commit is contained in:
YashRE42
2021-11-16 11:23:07 +05:30
committed by Tim Abbott
parent bd1f3ced4f
commit b0be6a0f92

View File

@@ -22,10 +22,11 @@ def get_version_file() -> str:
PREAMBLE = """ PREAMBLE = """
Before we run tests, we make sure your provisioning version Provisioning state check failed! This check compares
is correct by looking at var/provision_version, which is at `var/provision_version` (currently {}) to the version in
version {}, and we compare it to the version in source source control (`version.py`), which is {}, to see if you
control (version.py), which is {}. likely need to provision before this command can run
properly.
""" """
@@ -36,18 +37,18 @@ def preamble(version: str) -> str:
NEED_TO_DOWNGRADE = """ NEED_TO_DOWNGRADE = """
It looks like you checked out a branch that expects an older The branch you are currently on expects an older version of
version of dependencies than the version you provisioned last. dependencies than the version you provisioned last. This may
This may be ok, but it's likely that you either want to rebase be ok, but it's likely that you either want to rebase your
your branch on top of upstream/main or re-provision your VM. branch on top of upstream/main or re-provision your machine.
Do this: `./tools/provision` Do this: `./tools/provision`
""" """
NEED_TO_UPGRADE = """ NEED_TO_UPGRADE = """
It looks like you checked out a branch that has added The branch you are currently on has added dependencies beyond
dependencies beyond what you last provisioned. Your command what you last provisioned. Your command is likely to fail
is likely to fail until you add dependencies by provisioning. until you add dependencies by provisioning.
Do this: `./tools/provision` Do this: `./tools/provision`
""" """