Skip to content

Wrap pocket-ic tests to consolidate configuration #4846

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Bownairo wants to merge 1 commit into from
Closed

Wrap pocket-ic tests to consolidate configuration #4846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions bazel/canbench.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ def rust_canbench(name, results_file, add_test = False, opt = "3", noise_thresho
"POCKET_IC_BIN": pocket_ic_bin,
# Hack to escape the sandbox and update the actual repository
"WORKSPACE": "$(rootpath //:WORKSPACE.bazel)",
# TODO: Update TMPDIR here
# "TMPDIR": "",
}

if noise_threshold:
Expand Down
15 changes: 5 additions & 10 deletions packages/pocket-ic/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
load("@rules_rust//rust:defs.bzl", "rust_doc_test", "rust_library", "rust_test", "rust_test_suite")
load("@rules_rust//rust:defs.bzl", "rust_doc_test", "rust_library", "rust_test")
load("//rs/pocket_ic_server:defs.bzl", "pocket_ic_rust_test_suite")

package(default_visibility = ["//visibility:public"])

Expand Down Expand Up @@ -67,18 +68,16 @@ rust_test(
deps = DEPENDENCIES + TEST_DEPENDENCIES,
)

rust_test_suite(
pocket_ic_rust_test_suite(
name = "test",
size = "medium",
srcs = ["tests/tests.rs"],
data = [
"//packages/pocket-ic/test_canister:test_canister.wasm.gz",
"//rs/pocket_ic_server:pocket-ic-server",
"@mozilla_root_ca_store//file",
],
env = {
"RUST_TEST_THREADS": "2",
"POCKET_IC_BIN": "$(rootpath //rs/pocket_ic_server:pocket-ic-server)",
"SSL_CERT_FILE": "$(rootpath @mozilla_root_ca_store//file)",
"TEST_WASM": "$(rootpath //packages/pocket-ic/test_canister:test_canister.wasm.gz)",
},
Expand All @@ -93,16 +92,14 @@ rust_test_suite(
deps = [":pocket-ic"] + DEPENDENCIES + TEST_DEPENDENCIES,
)

rust_test_suite(
pocket_ic_rust_test_suite(
name = "restart",
size = "medium",
srcs = ["tests/restart.rs"],
data = [
"//rs/pocket_ic_server:pocket-ic-server",
"@mozilla_root_ca_store//file",
],
env = {
"POCKET_IC_BIN": "$(rootpath //rs/pocket_ic_server:pocket-ic-server)",
"SSL_CERT_FILE": "$(rootpath @mozilla_root_ca_store//file)",
},
proc_macro_deps = MACRO_DEPENDENCIES,
Expand All @@ -115,17 +112,15 @@ rust_test_suite(
deps = [":pocket-ic"] + DEPENDENCIES + TEST_DEPENDENCIES,
)

rust_test_suite(
pocket_ic_rust_test_suite(
name = "slow",
size = "medium",
srcs = ["tests/slow.rs"],
data = [
"//packages/pocket-ic/test_canister:test_canister.wasm.gz",
"//rs/pocket_ic_server:pocket-ic-server",
"@mozilla_root_ca_store//file",
],
env = {
"POCKET_IC_BIN": "$(rootpath //rs/pocket_ic_server:pocket-ic-server)",
"SSL_CERT_FILE": "$(rootpath @mozilla_root_ca_store//file)",
"TEST_WASM": "$(rootpath //packages/pocket-ic/test_canister:test_canister.wasm.gz)",
},
Expand Down
6 changes: 2 additions & 4 deletions rs/bitcoin/checker/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
load("@rules_rust//rust:defs.bzl", "rust_library", "rust_test")
load("//bazel:canisters.bzl", "rust_canister")
load("//bazel:defs.bzl", "rust_ic_test")
load("//rs/pocket_ic_server:defs.bzl", "pocket_ic_rust_ic_test")

package(default_visibility = ["//visibility:public"])

Expand Down Expand Up @@ -84,7 +84,7 @@ rust_canister(
],
)

rust_ic_test(
pocket_ic_rust_ic_test(
name = "integration_tests",
srcs = ["tests/tests.rs"],
data = [
Expand All @@ -94,13 +94,11 @@ rust_ic_test(
env = {
"CARGO_MANIFEST_DIR": "rs/bitcoin/checker",
"IC_BTC_CHECKER_CANISTER_WASM_PATH": "$(rootpath :btc_checker_canister)",
"POCKET_IC_BIN": "$(rootpath //:pocket-ic-server)",
"UNIVERSAL_CANISTER_WASM_PATH": "$(rootpath //rs/universal_canister/impl:universal_canister.wasm.gz)",
},
deps = [
# Keep sorted.
":btc_checker_lib",
"//:pocket-ic-server",
"//packages/ic-metrics-assert:ic-metrics-assert_pocket_ic",
"//packages/pocket-ic",
"//rs/rust_canisters/http_types",
Expand Down
2 changes: 2 additions & 0 deletions rs/bitcoin/ckbtc/minter/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,8 @@ genrule(
export IC_BITCOIN_CANISTER_MOCK_WASM_PATH="$(location //rs/bitcoin/mock:bitcoin_canister_mock)"
export IC_CKBTC_MINTER_WASM_PATH="$(location :ckbtc_minter_debug.wasm.gz)"
export POCKET_IC_BIN="$(location //:pocket-ic-server)"
# TODO: Update TMPDIR here
# export TEMPDIR=""

$(location :ckbtc_minter_dump_stable_memory) $(location test_resources/mainnet_events.gz) $@
""",
Expand Down
6 changes: 2 additions & 4 deletions rs/boundary_node/rate_limits/integration_tests/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_rust//rust:defs.bzl", "rust_library")
load("//bazel:defs.bzl", "rust_test_suite_with_extra_srcs")
load("//rs/pocket_ic_server:defs.bzl", "pocket_ic_rust_test_suite_with_extra_srcs")

package(default_visibility = ["//visibility:public"])

Expand Down Expand Up @@ -37,15 +37,13 @@ ALIASES = {}
DEV_DATA = [
"@mainnet_nns_registry_canister//file",
"//rs/registry/canister:registry-canister",
"//rs/pocket_ic_server:pocket-ic-server",
"//rs/boundary_node/rate_limits:rate_limit_canister",
]

DEV_ENV = {
"CARGO_MANIFEST_DIR": "rs/nns/integration_tests",
"REGISTRY_CANISTER_WASM_PATH": "$(rootpath //rs/registry/canister:registry-canister)",
"MAINNET_REGISTRY_CANISTER_WASM_PATH": "$(rootpath @mainnet_nns_registry_canister//file)",
"POCKET_IC_BIN": "$(rootpath //rs/pocket_ic_server:pocket-ic-server)",
"RATE_LIMITS_CANISTER_WASM_PATH": "$(rootpath //rs/boundary_node/rate_limits:rate_limit_canister)",
}

Expand All @@ -59,7 +57,7 @@ rust_library(
deps = DEPENDENCIES,
)

rust_test_suite_with_extra_srcs(
pocket_ic_rust_test_suite_with_extra_srcs(
name = "integration_tests_test",
srcs = glob(
["tests/**/*.rs"],
Expand Down
6 changes: 2 additions & 4 deletions rs/boundary_node/salt_sharing/integration_tests/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_rust//rust:defs.bzl", "rust_library")
load("//bazel:defs.bzl", "rust_test_suite_with_extra_srcs")
load("//rs/pocket_ic_server:defs.bzl", "pocket_ic_rust_test_suite_with_extra_srcs")

package(default_visibility = ["//visibility:public"])

Expand Down Expand Up @@ -32,15 +32,13 @@ DEPENDENCIES = [
DEV_DATA = [
"@mainnet_nns_registry_canister//file",
"//rs/registry/canister:registry-canister",
"//rs/pocket_ic_server:pocket-ic-server",
"//rs/boundary_node/salt_sharing:salt_sharing_canister",
]

DEV_ENV = {
"CARGO_MANIFEST_DIR": "rs/nns/integration_tests",
"REGISTRY_CANISTER_WASM_PATH": "$(rootpath //rs/registry/canister:registry-canister)",
"MAINNET_REGISTRY_CANISTER_WASM_PATH": "$(rootpath @mainnet_nns_registry_canister//file)",
"POCKET_IC_BIN": "$(rootpath //rs/pocket_ic_server:pocket-ic-server)",
"SALT_SHARING_CANISTER_WASM_PATH": "$(rootpath //rs/boundary_node/salt_sharing:salt_sharing_canister)",
}

Expand All @@ -54,7 +52,7 @@ rust_library(
deps = DEPENDENCIES,
)

rust_test_suite_with_extra_srcs(
pocket_ic_rust_test_suite_with_extra_srcs(
name = "integration_tests_test",
srcs = glob(
["tests/**/*.rs"],
Expand Down
5 changes: 2 additions & 3 deletions rs/ledger_suite/icp/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ load("//bazel:candid.bzl", "did_git_test")
load("//bazel:canisters.bzl", "rust_canister")
load("//bazel:defs.bzl", "rust_ic_test_suite")
load("//bazel:prost.bzl", "generated_files_check")
load("//rs/pocket_ic_server:defs.bzl", "pocket_ic_rust_ic_test_suite")

package(default_visibility = ["//visibility:public"])

Expand Down Expand Up @@ -90,7 +91,7 @@ rust_canister(
],
)

rust_ic_test_suite(
pocket_ic_rust_ic_test_suite(
name = "ledger_canister_integration_test",
timeout = "long",
srcs = [
Expand All @@ -106,7 +107,6 @@ rust_ic_test_suite(
"//rs/ledger_suite/icp/index:ic-icp-index-canister",
"//rs/ledger_suite/icp/ledger:ledger-canister-wasm",
"//rs/ledger_suite/icp/ledger:ledger-canister-wasm-notify-method",
"//rs/pocket_ic_server:pocket-ic-server",
"@mainnet_icp_index_canister//file",
"@mainnet_icp_ledger-archive-node-canister//file",
"@mainnet_icp_ledger_canister//file",
Expand All @@ -121,7 +121,6 @@ rust_ic_test_suite(
"MAINNET_ICP_INDEX_CANISTER_WASM_PATH": "$(rootpath @mainnet_icp_index_canister//file)",
"MAINNET_ICP_LEDGER_ARCHIVE_NODE_CANISTER_WASM_PATH": "$(rootpath @mainnet_icp_ledger-archive-node-canister//file)",
"MAINNET_ICP_LEDGER_CANISTER_WASM_PATH": "$(rootpath @mainnet_icp_ledger_canister//file)",
"POCKET_IC_BIN": "$(rootpath //rs/pocket_ic_server:pocket-ic-server)",
"TEST_NOTIFIED_WASM_PATH": "$(rootpath :test_notified_canister)",
},
deps = [
Expand Down
6 changes: 2 additions & 4 deletions rs/ledger_suite/icp/archive/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
load("@rules_rust//rust:defs.bzl", "rust_library", "rust_test")
load("//bazel:canisters.bzl", "rust_canister")
load("//bazel:defs.bzl", "rust_ic_test")
load("//rs/pocket_ic_server:defs.bzl", "pocket_ic_rust_ic_test")

package(default_visibility = ["//visibility:public"])

Expand Down Expand Up @@ -60,17 +60,15 @@ rust_test(
deps = ["@crate_index//:candid_parser"],
)

rust_ic_test(
pocket_ic_rust_ic_test(
name = "ledger_archive_node_canister_integration",
srcs = ["tests/tests.rs"],
data = [
"//rs/ledger_suite/icp/archive:ledger-archive-node-canister-wasm",
"//rs/pocket_ic_server:pocket-ic-server",
],
env = {
"CARGO_MANIFEST_DIR": "rs/ledger_suite/icp/archive",
"LEDGER_ARCHIVE_NODE_CANISTER_WASM_PATH": "$(rootpath //rs/ledger_suite/icp/archive:ledger-archive-node-canister-wasm)",
"POCKET_IC_BIN": "$(rootpath //rs/pocket_ic_server:pocket-ic-server)",
},
deps = [
# Keep sorted.
Expand Down
6 changes: 2 additions & 4 deletions rs/nervous_system/integration_tests/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_rust//rust:defs.bzl", "rust_library", "rust_test")
load("//bazel:defs.bzl", "rust_test_suite_with_extra_srcs")
load("//rs/pocket_ic_server:defs.bzl", "pocket_ic_rust_test_suite_with_extra_srcs")

package(default_visibility = ["//visibility:public"])

Expand Down Expand Up @@ -105,7 +105,6 @@ DEV_DATA = [
"//rs/nns/handlers/root/impl:root-canister",
"//rs/nns/sns-wasm:sns-wasm-canister",
"//rs/node_rewards/canister:node-rewards-canister",
"//rs/pocket_ic_server:pocket-ic-server",
"//rs/registry/canister:registry-canister",
"//rs/rosetta-api/tvl/xrc_mock:xrc_mock_canister",
"//rs/sns/governance:sns-governance-canister-test",
Expand Down Expand Up @@ -165,7 +164,6 @@ DEV_ENV = {
"MAINNET_SNS_SWAP_CANISTER_WASM_PATH": "$(rootpath @mainnet_sns-swap-canister//file)",
"ROOT_CANISTER_WASM_PATH": "$(rootpath //rs/nns/handlers/root/impl:root-canister)",
"XRC_MOCK_WASM_PATH": "$(rootpath //rs/rosetta-api/tvl/xrc_mock:xrc_mock_canister)",
"POCKET_IC_BIN": "$(rootpath //rs/pocket_ic_server:pocket-ic-server)",
"UNIVERSAL_CANISTER_WASM_PATH": "$(rootpath //rs/universal_canister/impl:universal_canister.wasm.gz)",
}

Expand All @@ -180,7 +178,7 @@ rust_library(
deps = DEPENDENCIES_WITH_TEST_FEATURES,
)

rust_test_suite_with_extra_srcs(
pocket_ic_rust_test_suite_with_extra_srcs(
name = "integration_tests_test",
timeout = "long",
srcs = glob(
Expand Down
7 changes: 3 additions & 4 deletions rs/nns/integration_tests/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
load("//bazel:canisters.bzl", "rust_canister")
load("//bazel:defs.bzl", "rust_ic_test", "rust_ic_test_suite_with_extra_srcs")
load("//bazel:defs.bzl", "rust_ic_test")
load("//rs/pocket_ic_server:defs.bzl", "pocket_ic_rust_ic_test_suite_with_extra_srcs")

package(default_visibility = ["//visibility:public"])

Expand Down Expand Up @@ -158,7 +159,6 @@ DEV_DATA = [
"//rs/nns/handlers/root/impl:root-canister",
"//rs/nns/sns-wasm:sns-wasm-canister",
"//rs/node_rewards/canister:node-rewards-canister",
"//rs/pocket_ic_server:pocket-ic-server",
"//rs/registry/canister:registry-canister",
"//rs/rosetta-api/tvl/xrc_mock:xrc_mock_canister",
"//rs/sns/governance:sns-governance-canister",
Expand Down Expand Up @@ -187,7 +187,6 @@ DEV_ENV = {
"CYCLES_MINTING_CANISTER_WASM_PATH": "$(rootpath //rs/nns/cmc:cycles-minting-canister)",
"MEM_UTILS_TEST_CANISTER_WASM_PATH": "$(rootpath :mem-utils-test-canister)",
"NODE_REWARDS_CANISTER_WASM_PATH": "$(rootpath //rs/node_rewards/canister:node-rewards-canister)",
"POCKET_IC_BIN": "$(rootpath //rs/pocket_ic_server:pocket-ic-server)",
"GOVERNANCE_MEM_TEST_CANISTER_WASM_PATH": "$(rootpath :governance-mem-test-canister)",
"CANISTER_PLAYGROUND_CANISTER_WASM_PATH": "$(rootpath :canister-playground-canister)",
"SNS_WASM_CANISTER_WASM_PATH": "$(rootpath //rs/nns/sns-wasm:sns-wasm-canister)",
Expand Down Expand Up @@ -254,7 +253,7 @@ rust_canister(
],
)

rust_ic_test_suite_with_extra_srcs(
pocket_ic_rust_ic_test_suite_with_extra_srcs(
name = "integration_tests",
timeout = "long",
srcs = glob(
Expand Down
15 changes: 5 additions & 10 deletions rs/pocket_ic_server/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
load("@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", "rust_test")
load("@rules_rust//rust:defs.bzl", "rust_binary", "rust_library")
load("//bazel:defs.bzl", "rust_ic_test")
load(":defs.bzl", "pocket_ic_rust_test")

BUILD_DEPENDENCIES = []

Expand Down Expand Up @@ -174,7 +175,7 @@ rust_ic_test(
deps = LIB_DEPENDENCIES + [":build_script"],
)

rust_test(
pocket_ic_rust_test(
name = "test",
size = "medium",
srcs = [
Expand All @@ -183,14 +184,12 @@ rust_test(
],
aliases = {},
data = [
":pocket-ic-server",
"//rs/registry/canister:registry-canister",
"@ii_dev_canister//file",
"@mozilla_root_ca_store//file",
],
env = {
"RUST_TEST_THREADS": "2",
"POCKET_IC_BIN": "$(rootpath :pocket-ic-server)",
"REGISTRY_WASM": "$(rootpath //rs/registry/canister:registry-canister)",
"II_WASM": "$(rootpath @ii_dev_canister//file)",
"SSL_CERT_FILE": "$(rootpath @mozilla_root_ca_store//file)",
Expand All @@ -213,23 +212,21 @@ rust_test(
deps = TEST_DEPENDENCIES,
)

rust_test(
pocket_ic_rust_test(
name = "spec_test",
size = "medium",
srcs = [
"tests/common.rs",
"tests/spec_test.rs",
],
data = [
":pocket-ic-server",
"//hs/spec_compliance:ic-ref-test",
"//rs/tests/httpbin-rs:httpbin",
"//rs/tests/research:ic-hs",
"//rs/universal_canister/impl:universal_canister.wasm.gz",
],
env = {
"HTTPBIN_BIN": "$(rootpath //rs/tests/httpbin-rs:httpbin)",
"POCKET_IC_BIN": "$(rootpath :pocket-ic-server)",
"IC_REF_TEST_ROOT": "rs/tests/research/ic-hs",
"IC_REF_TEST_BIN": "$(rootpath //hs/spec_compliance:ic-ref-test)",
"UNIVERSAL_CANISTER_WASM_PATH": "$(rootpath //rs/universal_canister/impl:universal_canister.wasm.gz)",
Expand All @@ -240,22 +237,20 @@ rust_test(
deps = SPEC_TEST_DEPENDENCIES,
)

rust_test(
pocket_ic_rust_test(
name = "bitcoin_integration_tests",
size = "small",
srcs = [
"tests/bitcoin_integration_tests.rs",
],
aliases = {},
data = [
":pocket-ic-server",
"//:bitcoind",
"@bitcoin_example_canister//file",
"@btc_canister//file",
"@mozilla_root_ca_store//file",
],
env = {
"POCKET_IC_BIN": "$(rootpath :pocket-ic-server)",
"BASIC_BITCOIN_WASM": "$(rootpath @bitcoin_example_canister//file)",
"BITCOIND_BIN": "$(rootpath //:bitcoind)",
"BTC_WASM": "$(rootpath @btc_canister//file)",
Expand Down
Loading