| Commit message (Collapse) | Author | Age | Files | Lines |
| | |
|
| |
|
|
|
| |
Test the arti-extra bin, which includes most of `full` and
`experimental` features, too.
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
This will give us a bit more flexibility, e.g. to pass additional
arguments.
Now that the python linters understand it, we fix some linting issues.
We preserve the ability to run the test on other networks by making the
Config.network optional. The new default of `None` means to use the
built-in module to create the network.
The functionality of the test itself is the same.
|
| |
|
|
|
| |
This helps avoid subtle mismatches of the sort fixed in the previous
commit.
|
| |
|
|
|
| |
We were accidentally using the arti-bin command-line arg to also
override arti-bench-bin.
|
| |
|
|
| |
Everything now uses the json version, instead.
|
| | |
|
| | |
|
| |
|
|
|
| |
In particular, use `str` instead of `Path`, so that it's directly
encodable and decodable by the json module.
|
| | |
|
| |
|
|
|
|
| |
Previously this was naively wrapping strings in double-quotes. This
works ok for escaping internal whitespace, but doesn't escape other
special characters.
|
| |
|
|
| |
Bump chutney, and migrate to CLI changes introduced in chutney!101
|
| | |
|
| |
|
|
| |
Also search several candidate paths.
|
| |
|
|
|
|
| |
This is partly just to get more code out of "main", but also paves the
way a bit for reusing this config code in the `integration-e2e-shadow`
wrapper script, to support the same command-line arguments there.
|
| |
|
|
|
|
| |
Since we're validating the presence of jq, we might as well handle it
consistently with the other dependencies and provide a way to specify
where it is.
|
| |
|
|
|
|
| |
Encapsulate the logic of finding and validating each option into their
own objects (e.g. so that specification of corresponding command-line
option goes together with other related logic).
|
| |
|
|
|
|
| |
This wasn't a pre-existing environment variable, and now it can be set
via command-line if it needs to be overridden. I don't see much reason
to use an environment variable here.
|
| | |
|
| | |
|
| |
|
|
|
| |
We avoid much refactoring at this step to minimize functional changes
from the shell script.
|
| |
|
|
|
|
| |
This makes the `setup` script a bit more clearly single-purpose of
resolving and storing the configuration, without actually acting on it
yet.
|
| |
|
|
|
|
|
|
|
| |
It made sense to have this as part of the setup when the chutney network
itself didn't include arti; i.e. this used to be just validating the
non-chutney tor network before adding chutney nodes.
Now that the chutney network natively includes arti nodes, `chutney
verify` is testing those nodes; i.e., testing arti.
|
| | |
|
| |
|
|
|
|
|
|
|
| |
In this commit there should be little effective difference, other than
combining the "setup", "configure", and "wait_for_bootstrap" steps.
"chutney bootstrap" also support multi-phase networks, though, in which
chutney waits for some nodes to fully bootstrap before bringing up other
nodes.
|
| |
|
|
|
|
|
|
|
|
|
| |
This is the time we wait for the network to bootstrap before giving up.
With the larger network we seem to need this extra time.
We've already increased the default in chutney to 300; no reason to use
a smaller value here.
Keep the explicit-setting for now as a convenience in case we want to
modify it again.
|
| |
|
|
| |
An arti proxy is already started as part of the chutney network.
|
| | |
|
| | |
|
| |
|
|
| |
This is needed to support chutney networks containing arti nodes.
|
| |
|
|
|
| |
Use the new exported json metadata to get a tor client port instead of
hard-coding it.
|
| | |
|
| |
|
|
|
|
| |
We no longer need a path to a checkout of the chutney repository; we
just need the chutney binary itself. We still allow this to be set
explicitly with CHUTNEY_BIN, but fall back to finding it on the PATH.
|
| |
|
|
|
|
|
|
| |
This takes advantage of a feature added in
https://gitlab.torproject.org/tpo/core/chutney/-/merge_requests/31.
This is a step towards not needing to set CHUTNEY_PATH to point to a
chutney repository.
|
| |
|
|
|
|
|
|
|
|
|
| |
Previously `tests/chutney/setup` would locate *or install* chutney and
set `CHUTNEY_PATH` for itself. However that `CHUTNEY_PATH` wasn't
propagated to other steps or "up" to the new `integration-e2e` wrapper
script.
Tracking it in the arti.run along with other dynamic info lets us ensure
we consistently use the same chutney across steps, and in the higher
level `integration-e2e` script.
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
| |
This commit changes the shebang in all shell scripts from absolute
paths (such as `/bin/bash` or `/usr/bin/python3`) to the `/usr/bin/env`
binary with the accompanying interpreter as it's argument.
The reason for this are as follows:
- NixOS cannot work with absolute paths
- BSD systems install their packages in /usr/local/bin
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
| |
Apparently 5353 is commonly used for mDNS, and so counts as "already in
use" on many consumer machines.
|
| | |
|
| | |
|
| |
|
|
|
|
|
| |
It turns out that the clone-and-hack in tests/chutney/arti-bench
was not identical to the original in tests/chutney/setup.
I diffed the two and preferred the version from arti-bench.
|
| |
|
|
|
|
|
|
|
| |
Formerly, the "launch a chutney network" code was duplicated in
"setup" and "arti-bench", since "setup" always launched an arti
proxy, while "arti-bench" didn't want that functionality.
Now the "setup" script launches an arti proxy conditionally,
depending on whether the "proxy" argument is given.
|
| |
|
|
|
| |
This is not a replacement for a real startup protocol, but it may
help repair our CI.
|
| |
|
|
| |
Now that arti listens immediately, a very short sleep ought to do.
|
|
|
As per #309
Update all references. There is one remaining hit for
git-grep '\.sh\b'
namely "build.sh" in maint/reproducible_build, which I think is
the build script for osxcross - ie, an external project.
|