From 665e3654ceca5a34e8ada66a9805fa7b76fc9ebb Mon Sep 17 00:00:00 2001
From: Andrei Eres <eresav@me.com>
Date: Tue, 2 Apr 2024 21:27:11 +0200
Subject: [PATCH] Remove nextest filtration (#3885)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fixes
https://github.com/paritytech/polkadot-sdk/issues/3884#issuecomment-2026058687
After moving regression tests to benchmarks
(https://github.com/paritytech/polkadot-sdk/pull/3741) we don't need to
filter tests anymore.
---------
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: Andrei Sandu <54316454+sandreim@users.noreply.github.com>
Co-authored-by: Alin Dima <alin@parity.io>
Co-authored-by: Andrei Sandu <andrei-mihail@parity.io>
Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: Javier Viola <363911+pepoviola@users.noreply.github.com>
Co-authored-by: Serban Iorga <serban@parity.io>
Co-authored-by: Adrian Catangiu <adrian@parity.io>
Co-authored-by: Bastian Köcher <git@kchr.de>
Co-authored-by: Alexandru Vasile <60601340+lexnv@users.noreply.github.com>
Co-authored-by: Niklas Adolfsson <niklasadolfsson1@gmail.com>
Co-authored-by: Dastan <88332432+dastansam@users.noreply.github.com>
Co-authored-by: Liam Aharon <liam.aharon@hotmail.com>
Co-authored-by: Clara van Staden <claravanstaden64@gmail.com>
Co-authored-by: Ron <yrong1997@gmail.com>
Co-authored-by: Vincent Geddes <vincent@snowfork.com>
Co-authored-by: Svyatoslav Nikolsky <svyatonik@gmail.com>
Co-authored-by: Bastian Köcher <info@kchr.de>
---
.gitlab/pipeline/test.yml | 3 +--
substrate/frame/core-fellowship/src/benchmarking.rs | 5 +++++
substrate/frame/core-fellowship/src/lib.rs | 3 ++-
substrate/frame/scheduler/src/tests.rs | 5 ++++-
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/.gitlab/pipeline/test.yml b/.gitlab/pipeline/test.yml
index af261a893da..48c84b472b4 100644
--- a/.gitlab/pipeline/test.yml
+++ b/.gitlab/pipeline/test.yml
@@ -25,7 +25,6 @@ test-linux-stable:
# "upgrade_version_checks_should_work" is currently failing
- |
time cargo nextest run \
- --filter-expr 'not deps(/polkadot-subsystem-bench/)' \
--workspace \
--locked \
--release \
@@ -70,7 +69,7 @@ test-linux-stable-runtime-benchmarks:
# but still want to have debug assertions.
RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
script:
- - time cargo nextest run --filter-expr 'not deps(/polkadot-subsystem-bench/)' --workspace --features runtime-benchmarks benchmark --locked --cargo-profile testnet
+ - time cargo nextest run --workspace --features runtime-benchmarks benchmark --locked --cargo-profile testnet
# can be used to run all tests
# test-linux-stable-all:
diff --git a/substrate/frame/core-fellowship/src/benchmarking.rs b/substrate/frame/core-fellowship/src/benchmarking.rs
index ddde70bd7ce..fd5453310be 100644
--- a/substrate/frame/core-fellowship/src/benchmarking.rs
+++ b/substrate/frame/core-fellowship/src/benchmarking.rs
@@ -149,6 +149,11 @@ mod benchmarks {
#[benchmark]
fn promote() -> Result<(), BenchmarkError> {
+ // Ensure that the `min_promotion_period` wont get in our way.
+ let mut params = Params::<T, I>::get();
+ params.min_promotion_period = [Zero::zero(); RANK_COUNT];
+ Params::<T, I>::put(¶ms);
+
let member = make_member::<T, I>(1)?;
ensure_evidence::<T, I>(&member)?;
diff --git a/substrate/frame/core-fellowship/src/lib.rs b/substrate/frame/core-fellowship/src/lib.rs
index d1b81c3ca13..afb188261fd 100644
--- a/substrate/frame/core-fellowship/src/lib.rs
+++ b/substrate/frame/core-fellowship/src/lib.rs
@@ -149,7 +149,8 @@ pub mod pallet {
};
use frame_system::{ensure_root, pallet_prelude::*};
- const RANK_COUNT: usize = 9;
+ /// Number of available ranks.
+ pub(crate) const RANK_COUNT: usize = 9;
#[pallet::pallet]
pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
diff --git a/substrate/frame/scheduler/src/tests.rs b/substrate/frame/scheduler/src/tests.rs
index f251dde99a8..3023a370a4b 100644
--- a/substrate/frame/scheduler/src/tests.rs
+++ b/substrate/frame/scheduler/src/tests.rs
@@ -1501,8 +1501,11 @@ fn scheduler_handles_periodic_unavailable_preimage() {
run_to_block(4);
assert_eq!(logger::log().len(), 1);
- // Unnote the preimage
+ // As the public api doesn't support to remove a noted preimage, we need to first unnote it
+ // and then request it again. Basically this should not happen in real life (whatever you
+ // call real life;).
Preimage::unnote(&hash);
+ Preimage::request(&hash);
// Does not ever execute again.
run_to_block(100);
--
GitLab