diff --git a/server/daemon/Cargo.toml b/server/daemon/Cargo.toml index 24d710441..4f4b385cd 100644 --- a/server/daemon/Cargo.toml +++ b/server/daemon/Cargo.toml @@ -16,7 +16,7 @@ repository = { workspace = true } [[bin]] name = "kanidmd" path = "src/main.rs" -test = true +test = false doctest = false [features] diff --git a/server/lib-macros/Cargo.toml b/server/lib-macros/Cargo.toml index 9891a0393..85dafe444 100644 --- a/server/lib-macros/Cargo.toml +++ b/server/lib-macros/Cargo.toml @@ -13,7 +13,7 @@ repository = { workspace = true } [lib] proc-macro = true -test = true +test = false doctest = false [dependencies] diff --git a/server/testkit-macros/Cargo.toml b/server/testkit-macros/Cargo.toml index 594b41382..cb1af8006 100644 --- a/server/testkit-macros/Cargo.toml +++ b/server/testkit-macros/Cargo.toml @@ -5,7 +5,7 @@ edition = { workspace = true } [lib] proc-macro = true -test = true +test = false doctest = false [dependencies] diff --git a/server/testkit/Cargo.toml b/server/testkit/Cargo.toml index acc107b23..322e08e2b 100644 --- a/server/testkit/Cargo.toml +++ b/server/testkit/Cargo.toml @@ -14,7 +14,7 @@ repository = { workspace = true } [lib] name = "kanidmd_testkit" path = "src/lib.rs" -test = true +test = false doctest = false [features] diff --git a/server/testkit/tests/oauth2_device_flow.rs b/server/testkit/defunct_tests/oauth2_device_flow.rs similarity index 100% rename from server/testkit/tests/oauth2_device_flow.rs rename to server/testkit/defunct_tests/oauth2_device_flow.rs diff --git a/server/testkit/tests/DO_NOT_ADD_MORE_TESTS_HERE b/server/testkit/tests/DO_NOT_ADD_MORE_TESTS_HERE new file mode 100644 index 000000000..247376ef4 --- /dev/null +++ b/server/testkit/tests/DO_NOT_ADD_MORE_TESTS_HERE @@ -0,0 +1,11 @@ + +DO NOT ADD MORE TESTS TO THIS DIRECTORY + +Add them to the `testkit` directory. + +Each new test in this folder is a separate binary, that must be complied linked and executed. This +takes HUGES AMOUNTS OF TIME. It makes tests unbelievably slow. + +If you want to add an integration test, put it into the testkit dir so it becomes part of the +single larger integration test runner. + diff --git a/server/testkit/tests/integration_test.rs b/server/testkit/tests/integration_test.rs new file mode 100644 index 000000000..1a6f6f52e --- /dev/null +++ b/server/testkit/tests/integration_test.rs @@ -0,0 +1,3 @@ +#![deny(warnings)] + +mod testkit; diff --git a/server/testkit/tests/apidocs.rs b/server/testkit/tests/testkit/apidocs.rs similarity index 100% rename from server/testkit/tests/apidocs.rs rename to server/testkit/tests/testkit/apidocs.rs diff --git a/server/testkit/tests/domain.rs b/server/testkit/tests/testkit/domain.rs similarity index 100% rename from server/testkit/tests/domain.rs rename to server/testkit/tests/testkit/domain.rs diff --git a/server/testkit/tests/group.rs b/server/testkit/tests/testkit/group.rs similarity index 100% rename from server/testkit/tests/group.rs rename to server/testkit/tests/testkit/group.rs diff --git a/server/testkit/tests/http_manifest.rs b/server/testkit/tests/testkit/http_manifest.rs similarity index 100% rename from server/testkit/tests/http_manifest.rs rename to server/testkit/tests/testkit/http_manifest.rs diff --git a/server/testkit/tests/https_extractors.rs b/server/testkit/tests/testkit/https_extractors.rs similarity index 100% rename from server/testkit/tests/https_extractors.rs rename to server/testkit/tests/testkit/https_extractors.rs diff --git a/server/testkit/tests/https_middleware.rs b/server/testkit/tests/testkit/https_middleware.rs similarity index 100% rename from server/testkit/tests/https_middleware.rs rename to server/testkit/tests/testkit/https_middleware.rs diff --git a/server/testkit/tests/identity_verification_tests.rs b/server/testkit/tests/testkit/identity_verification_tests.rs similarity index 100% rename from server/testkit/tests/identity_verification_tests.rs rename to server/testkit/tests/testkit/identity_verification_tests.rs diff --git a/server/testkit/tests/integration.rs b/server/testkit/tests/testkit/integration.rs similarity index 100% rename from server/testkit/tests/integration.rs rename to server/testkit/tests/testkit/integration.rs diff --git a/server/testkit/tests/testkit/mod.rs b/server/testkit/tests/testkit/mod.rs new file mode 100644 index 000000000..4a9208322 --- /dev/null +++ b/server/testkit/tests/testkit/mod.rs @@ -0,0 +1,17 @@ +mod apidocs; +mod domain; +mod group; +mod http_manifest; +mod https_extractors; +mod https_middleware; +mod identity_verification_tests; +mod integration; +mod mtls_test; +mod oauth2_test; +mod person; +mod proto_v1_test; +mod scim_test; +mod self_resources; +mod service_account; +mod system; +mod unix; diff --git a/server/testkit/tests/mtls_test.rs b/server/testkit/tests/testkit/mtls_test.rs similarity index 100% rename from server/testkit/tests/mtls_test.rs rename to server/testkit/tests/testkit/mtls_test.rs diff --git a/server/testkit/tests/oauth2_test.rs b/server/testkit/tests/testkit/oauth2_test.rs similarity index 100% rename from server/testkit/tests/oauth2_test.rs rename to server/testkit/tests/testkit/oauth2_test.rs diff --git a/server/testkit/tests/person.rs b/server/testkit/tests/testkit/person.rs similarity index 100% rename from server/testkit/tests/person.rs rename to server/testkit/tests/testkit/person.rs diff --git a/server/testkit/tests/proto_v1_test.rs b/server/testkit/tests/testkit/proto_v1_test.rs similarity index 100% rename from server/testkit/tests/proto_v1_test.rs rename to server/testkit/tests/testkit/proto_v1_test.rs diff --git a/server/testkit/tests/scim_test.rs b/server/testkit/tests/testkit/scim_test.rs similarity index 100% rename from server/testkit/tests/scim_test.rs rename to server/testkit/tests/testkit/scim_test.rs diff --git a/server/testkit/tests/self.rs b/server/testkit/tests/testkit/self_resources.rs similarity index 100% rename from server/testkit/tests/self.rs rename to server/testkit/tests/testkit/self_resources.rs diff --git a/server/testkit/tests/service_account.rs b/server/testkit/tests/testkit/service_account.rs similarity index 100% rename from server/testkit/tests/service_account.rs rename to server/testkit/tests/testkit/service_account.rs diff --git a/server/testkit/tests/system.rs b/server/testkit/tests/testkit/system.rs similarity index 100% rename from server/testkit/tests/system.rs rename to server/testkit/tests/testkit/system.rs diff --git a/server/testkit/tests/unix.rs b/server/testkit/tests/testkit/unix.rs similarity index 100% rename from server/testkit/tests/unix.rs rename to server/testkit/tests/testkit/unix.rs diff --git a/tools/cli/Cargo.toml b/tools/cli/Cargo.toml index 219a8ed82..fdb9e2dfd 100644 --- a/tools/cli/Cargo.toml +++ b/tools/cli/Cargo.toml @@ -22,14 +22,14 @@ dev-oauth2-device-flow = [] [lib] name = "kanidm_cli" path = "src/cli/lib.rs" -test = true +test = false doctest = false [[bin]] name = "kanidm" path = "src/cli/main.rs" doc = false -test = true +test = false doctest = false [[bin]] diff --git a/tools/device_flow/Cargo.toml b/tools/device_flow/Cargo.toml index 1ac671ba8..252353711 100644 --- a/tools/device_flow/Cargo.toml +++ b/tools/device_flow/Cargo.toml @@ -12,8 +12,8 @@ repository = { workspace = true } [lib] -test = false doctest = false +test = false [features] diff --git a/tools/iam_migrations/freeipa/Cargo.toml b/tools/iam_migrations/freeipa/Cargo.toml index 6eee6a97a..4b79a812c 100644 --- a/tools/iam_migrations/freeipa/Cargo.toml +++ b/tools/iam_migrations/freeipa/Cargo.toml @@ -11,6 +11,11 @@ license = { workspace = true } homepage = { workspace = true } repository = { workspace = true } +[[bin]] +name = "kanidm-ipa-sync" +test = false +doctest = false + [dependencies] clap = { workspace = true, features = ["derive", "env"] } chrono = { workspace = true } diff --git a/tools/iam_migrations/ldap/Cargo.toml b/tools/iam_migrations/ldap/Cargo.toml index e8d240d03..8ebed8d00 100644 --- a/tools/iam_migrations/ldap/Cargo.toml +++ b/tools/iam_migrations/ldap/Cargo.toml @@ -11,6 +11,11 @@ license = { workspace = true } homepage = { workspace = true } repository = { workspace = true } +[[bin]] +name = "kanidm-ldap-sync" +test = false +doctest = false + [dependencies] clap = { workspace = true, features = ["derive", "env"] } chrono = { workspace = true } diff --git a/tools/orca/Cargo.toml b/tools/orca/Cargo.toml index 08aa6dfbc..5315f0212 100644 --- a/tools/orca/Cargo.toml +++ b/tools/orca/Cargo.toml @@ -14,7 +14,7 @@ repository = { workspace = true } [[bin]] name = "orca" path = "src/main.rs" -test = true +test = false doctest = false [dependencies] diff --git a/unix_integration/resolver/Cargo.toml b/unix_integration/resolver/Cargo.toml index 8718d9c53..96e09bbee 100644 --- a/unix_integration/resolver/Cargo.toml +++ b/unix_integration/resolver/Cargo.toml @@ -21,28 +21,28 @@ tpm = ["kanidm-hsm-crypto/tpm"] name = "kanidm_unixd" path = "src/bin/kanidm_unixd.rs" required-features = ["unix"] -test = true +test = false doctest = false [[bin]] name = "kanidm_unixd_tasks" path = "src/bin/kanidm_unixd_tasks.rs" required-features = ["unix"] -test = true +test = false doctest = false [[bin]] name = "kanidm_ssh_authorizedkeys" path = "src/bin/kanidm_ssh_authorizedkeys.rs" required-features = ["unix"] -test = true +test = false doctest = false [[bin]] name = "kanidm-unix" path = "src/bin/kanidm-unix.rs" required-features = ["unix"] -test = true +test = false doctest = false [lib]