diff options
| author | Matt Mastracci <matthew@mastracci.com> | 2024-02-10 13:22:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-10 20:22:13 +0000 |
| commit | f5e46c9bf2f50d66a953fa133161fc829cecff06 (patch) | |
| tree | 8faf2f5831c1c7b11d842cd9908d141082c869a5 /test_util/src | |
| parent | d2477f780630a812bfd65e3987b70c0d309385bb (diff) | |
chore: move cli/tests/ -> tests/ (#22369)
This looks like a massive PR, but it's only a move from cli/tests ->
tests, and updates of relative paths for files.
This is the first step towards aggregate all of the integration test
files under tests/, which will lead to a set of integration tests that
can run without the CLI binary being built.
While we could leave these tests under `cli`, it would require us to
keep a more complex directory structure for the various test runners. In
addition, we have a lot of complexity to ignore various test files in
the `cli` project itself (cargo publish exclusion rules, autotests =
false, etc).
And finally, the `tests/` folder will eventually house the `test_ffi`,
`test_napi` and other testing code, reducing the size of the root repo
directory.
For easier review, the extremely large and noisy "move" is in the first
commit (with no changes -- just a move), while the remainder of the
changes to actual files is in the second commit.
Diffstat (limited to 'test_util/src')
| -rw-r--r-- | test_util/src/lib.rs | 2 | ||||
| -rw-r--r-- | test_util/src/servers/mod.rs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test_util/src/lib.rs b/test_util/src/lib.rs index dda62a591..eda386a82 100644 --- a/test_util/src/lib.rs +++ b/test_util/src/lib.rs @@ -76,7 +76,7 @@ pub fn prebuilt_path() -> PathRef { } pub fn tests_path() -> PathRef { - root_path().join("cli").join("tests") + root_path().join("tests") } pub fn testdata_path() -> PathRef { diff --git a/test_util/src/servers/mod.rs b/test_util/src/servers/mod.rs index e6084dd81..f828f1bd4 100644 --- a/test_util/src/servers/mod.rs +++ b/test_util/src/servers/mod.rs @@ -327,9 +327,9 @@ async fn get_tcp_listener_stream( /// This server responds with 'PASS' if client authentication was successful. Try it by running /// test_server and -/// curl --key cli/tests/testdata/tls/localhost.key \ +/// curl --key tests/testdata/tls/localhost.key \ /// --cert cli/tests/testsdata/tls/localhost.crt \ -/// --cacert cli/tests/testdata/tls/RootCA.crt https://localhost:4552/ +/// --cacert tests/testdata/tls/RootCA.crt https://localhost:4552/ async fn run_tls_client_auth_server(port: u16) { let mut tls = get_tls_listener_stream("tls client auth", port, Default::default()).await; @@ -352,7 +352,7 @@ async fn run_tls_client_auth_server(port: u16) { /// This server responds with 'PASS' if client authentication was successful. Try it by running /// test_server and -/// curl --cacert cli/tests/testdata/tls/RootCA.crt https://localhost:4553/ +/// curl --cacert tests/testdata/tls/RootCA.crt https://localhost:4553/ async fn run_tls_server(port: u16) { let mut tls = get_tls_listener_stream("tls", port, Default::default()).await; while let Some(Ok(mut tls_stream)) = tls.next().await { |