From f8c87838b00fb6b3935262b218abb6593e8178fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Cauderlier?= Date: Tue, 6 Feb 2024 15:48:26 +0100 Subject: [PATCH 1/2] Revert "Tests/Proto/AI: unplug slow activation tests" This reverts commit 09a6ee0fee7051975b8ff22ede002a01676d728a. --- .../test_adaptive_issuance_launch.ml | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/src/proto_alpha/lib_protocol/test/integration/test_adaptive_issuance_launch.ml b/src/proto_alpha/lib_protocol/test/integration/test_adaptive_issuance_launch.ml index 74eeb18928b1..9af0c2c7c22f 100644 --- a/src/proto_alpha/lib_protocol/test/integration/test_adaptive_issuance_launch.ml +++ b/src/proto_alpha/lib_protocol/test/integration/test_adaptive_issuance_launch.ml @@ -553,26 +553,11 @@ let tests = test_launch_without_vote; Tztest.tztest "the EMA reaches the vote threshold at the expected level and adaptive \ - issuance launches (vote enabled)" + issuance launches (very low threshold, vote enabled)" `Quick (test_launch 1000000l (* This means that the threshold is set at 0.05% *) 88l); - Tztest.tztest - "the EMA reaches the vote threshold at the expected level and adaptive \ - issuance does not launch (vote disabled)" - `Quick - (test_does_not_launch_without_feature_flag - 1000000l (* This means that the threshold is set at 0.05% *) - 88l); - ] - -(* These tests have been unplugged because they are too long for the - CI (more than 3 minutes). For unit tests of the fact that the 80% - threshold can be reached by iteration of the EMA update function, - see ../unit/test_adaptive_issuance_ema.ml *) -let _unplugged_tests = - [ Tztest.tztest "the EMA reaches the vote threshold at the expected level and adaptive \ issuance launches (realistic threshold, vote enabled)" @@ -584,6 +569,13 @@ let _unplugged_tests = (* This vote duration is consistent with the result of the unit test for this EMA in ../unit/test_adaptive_issuance_ema.ml*)); + Tztest.tztest + "the EMA reaches the vote threshold at the expected level and adaptive \ + issuance does not launch (very low threshold, vote disabled)" + `Quick + (test_does_not_launch_without_feature_flag + 1000000l (* This means that the threshold is set at 0.05% *) + 88l); Tztest.tztest "the EMA reaches the vote threshold at the expected level and adaptive \ issuance does not launch (realistic threshold, vote disabled)" -- GitLab From e3e803742615949480e6e16e9c805b177d878d17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Cauderlier?= Date: Tue, 6 Feb 2024 15:48:36 +0100 Subject: [PATCH 2/2] Revert "Tests/Proto/AI: backport prev commit to Oxford" This reverts commit 89d8e384b33fa6a810ea1c15559655b1cc0cb549. --- .../test_adaptive_issuance_launch.ml | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/src/proto_018_Proxford/lib_protocol/test/integration/test_adaptive_issuance_launch.ml b/src/proto_018_Proxford/lib_protocol/test/integration/test_adaptive_issuance_launch.ml index 64b4987bb7aa..5c23e260aba3 100644 --- a/src/proto_018_Proxford/lib_protocol/test/integration/test_adaptive_issuance_launch.ml +++ b/src/proto_018_Proxford/lib_protocol/test/integration/test_adaptive_issuance_launch.ml @@ -465,26 +465,11 @@ let tests = [ Tztest.tztest "the EMA reaches the vote threshold at the expected level and adaptive \ - issuance launches (vote enabled)" + issuance launches (very low threshold, vote enabled)" `Quick (test_launch 1000000l (* This means that the threshold is set at 0.05% *) 59l); - Tztest.tztest - "the EMA reaches the vote threshold at the expected level and adaptive \ - issuance does not launch (vote disabled)" - `Quick - (test_does_not_launch_without_feature_flag - 1000000l (* This means that the threshold is set at 0.05% *) - 59l); - ] - -(* These tests have been unplugged because they are too long for the - CI (more than 3 minutes). For unit tests of the fact that the 80% - threshold can be reached by iteration of the EMA update function, - see ../unit/test_adaptive_issuance_ema.ml *) -let _unplugged_tests = - [ Tztest.tztest "the EMA reaches the vote threshold at the expected level and adaptive \ issuance launches (realistic threshold, vote enabled)" @@ -496,6 +481,13 @@ let _unplugged_tests = (* This vote duration is consistent with the result of the unit test for this EMA in ../unit/test_adaptive_issuance_ema.ml*)); + Tztest.tztest + "the EMA reaches the vote threshold at the expected level and adaptive \ + issuance does not launch (very low threshold, vote disabled)" + `Quick + (test_does_not_launch_without_feature_flag + 1000000l (* This means that the threshold is set at 0.05% *) + 59l); Tztest.tztest "the EMA reaches the vote threshold at the expected level and adaptive \ issuance does not launch (realistic threshold, vote disabled)" -- GitLab