Skip to content
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

Fix test failures under default Savanna libtester #95

Merged
merged 7 commits into from
Jun 4, 2024
Merged

Fix test failures under default Savanna libtester #95

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8ed7edd
Remove tester but keep validating_tester for eosio_system_tester; add…
linh2931 May 28, 2024
d4227b8
Start bios_inst_fin_tests with legacy tester
linh2931 May 28, 2024
4864476
Keep powerup_tests under legacy_tester for now
linh2931 May 28, 2024
cc812f8
Adjust proposer schedule change for producer_wtmsig tests
linh2931 May 28, 2024
43c76ea
Point spring-dev target to default_tester branch to get around circul…
linh2931 May 28, 2024
4ccfbbf
Use legacy_tester instead of tester_not_transition_to_savanna
linh2931 Jun 4, 2024
9d4d6cd
Change spring-dev/target back to main
linh2931 Jun 4, 2024
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: 1 addition & 1 deletion .cicd/defaults.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"spring-dev":{
"target":"main",
"target":"default_tester",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remember to change back to main once merged.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the reminder.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done by 9d4d6cd

"prerelease":false
},
"cdt":{
Expand Down
2 changes: 1 addition & 1 deletion tests/eosio.bios_inst_fin_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ using namespace fc;
using mvo = fc::mutable_variant_object;

// tests for instant finality actions
class eosio_bios_if_tester : public tester {
class eosio_bios_if_tester : public tester_not_transition_to_savanna {
public:

eosio_bios_if_tester() {
Expand Down
2 changes: 1 addition & 1 deletion tests/eosio.limitauth_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ inline const auto bob = "bob111111111"_n;
struct limitauth_tester: eosio_system_tester {
action_result push_action(name code, name action, permission_level auth, const variant_object& data) {
try {
TESTER::push_action(code, action, {auth}, data);
validating_tester::push_action(code, action, {auth}, data);
return "";
} catch (const fc::exception& ex) {
edump((ex.to_detail_string()));
Expand Down
7 changes: 6 additions & 1 deletion tests/eosio.powerup_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,12 @@ using namespace eosio_system;

struct powerup_tester : eosio_system_tester {

powerup_tester() { create_accounts_with_resources({ "eosio.reserv"_n }); }
// Use full_except_do_not_transition_to_savanna for now until
// https://github.com/AntelopeIO/reference-contracts/issues/91 is resolved
powerup_tester()
: eosio_system_tester(setup_level::full, setup_policy::full_except_do_not_transition_to_savanna) {
create_accounts_with_resources({ "eosio.reserv"_n });
}

void start_rex() {
create_account_with_resources("rexholder111"_n, config::system_account_name, core_sym::from_string("1.0000"),
Expand Down
15 changes: 4 additions & 11 deletions tests/eosio.system_tester.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,9 @@ using namespace fc;

using mvo = fc::mutable_variant_object;

#ifndef TESTER
#ifdef NON_VALIDATING_TEST
#define TESTER tester
#else
#define TESTER validating_tester
#endif
#endif

namespace eosio_system {

class eosio_system_tester : public TESTER {
class eosio_system_tester : public validating_tester {
public:

void basic_setup() {
Expand Down Expand Up @@ -91,7 +83,8 @@ class eosio_system_tester : public TESTER {
full
};

eosio_system_tester( setup_level l = setup_level::full ) {
eosio_system_tester( setup_level l = setup_level::full, setup_policy policy = setup_policy::full )
: validating_tester({}, nullptr, policy) {
if( l == setup_level::none ) return;

basic_setup();
Expand Down Expand Up @@ -1315,7 +1308,7 @@ class eosio_system_tester : public TESTER {
}
produce_blocks( 250);

auto trace_auth = TESTER::push_action(config::system_account_name, updateauth::get_name(), config::system_account_name, mvo()
auto trace_auth = validating_tester::push_action(config::system_account_name, updateauth::get_name(), config::system_account_name, mvo()
("account", name(config::system_account_name).to_string())
("permission", name(config::active_name).to_string())
("parent", name(config::owner_name).to_string())
Expand Down
10 changes: 7 additions & 3 deletions tests/eosio.system_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,7 +843,7 @@ BOOST_FIXTURE_TEST_CASE( producer_wtmsig, eosio_system_tester ) try {

produce_block();
produce_block( fc::minutes(2) );
produce_blocks(2);
produce_blocks(config::producer_repetitions * 2);
BOOST_REQUIRE_EQUAL( control->active_producers().version, 1u );
produce_block();
BOOST_REQUIRE_EQUAL( control->pending_block_producer(), "alice1111111"_n );
Expand Down Expand Up @@ -901,7 +901,7 @@ BOOST_FIXTURE_TEST_CASE( producer_wtmsig, eosio_system_tester ) try {

produce_block();
produce_block( fc::minutes(2) );
produce_blocks(2);
produce_blocks(config::producer_repetitions * 2);
BOOST_REQUIRE_EQUAL( control->active_producers().version, 2u );
produce_block();
BOOST_REQUIRE_EQUAL( control->pending_block_producer(), "alice1111111"_n );
Expand Down Expand Up @@ -933,7 +933,7 @@ BOOST_FIXTURE_TEST_CASE( producer_wtmsig_transition, eosio_system_tester ) try {

produce_block();
produce_block( fc::minutes(2) );
produce_blocks(2);
produce_blocks(config::producer_repetitions * 2);
BOOST_REQUIRE_EQUAL( control->active_producers().version, 1u );

auto convert_to_block_timestamp = [](const fc::variant& timestamp) -> eosio::chain::block_timestamp_type {
Expand Down Expand Up @@ -2925,6 +2925,10 @@ BOOST_FIXTURE_TEST_CASE(producer_onblock_check, eosio_system_tester) try {
BOOST_REQUIRE_EQUAL(success(), vote( "producvoterb"_n, vector<account_name>(producer_names.begin(), producer_names.begin()+21)));
BOOST_REQUIRE_EQUAL(success(), vote( "producvoterc"_n, vector<account_name>(producer_names.begin(), producer_names.end())));

int retries = 50;
while (produce_block()->producer == config::system_account_name && --retries);
BOOST_REQUIRE(retries > 0);

// give a chance for everyone to produce blocks
{
produce_blocks(21 * 12);
Expand Down
Loading