From 00e153408bb2db44763d52bd48a82e52e2a2b7b2 Mon Sep 17 00:00:00 2001 From: Ilya Verbin <iverbin@tarantool.org> Date: Sat, 29 Jun 2024 17:29:46 +0300 Subject: [PATCH] test: do not test errinj.info() output There is no much sense in testing it, but it is sensitive to source code changes, especially `ERRINJ_*_COUNTDOWN` injections, e.g. see commit 697123d0d5d5 ("box: use maximal space id instead of _schema.max_id"). Needed for tarantool/tarantool-ee#712 NO_DOC=test NO_CHANGELOG=test (cherry picked from commit dc0fd81cb5289bcb0f7093c8db7f082db494c99b) --- test/box/errinj.result | 151 --------------------------------------- test/box/errinj.test.lua | 14 ---- 2 files changed, 165 deletions(-) diff --git a/test/box/errinj.result b/test/box/errinj.result index 36744df085..918dd92260 100644 --- a/test/box/errinj.result +++ b/test/box/errinj.result @@ -23,157 +23,6 @@ space = box.schema.space.create('tweedledum') index = space:create_index('primary', { type = 'hash' }) --- ... --- --- Print all error keys in sorted order to minimize diff output --- when new ones are merged in. -ekeys = {} ---- -... -evals = {} ---- -... -for k, v in pairs(errinj.info()) do \ - table.insert(ekeys, k) \ -end ---- -... -table.sort(ekeys) ---- -... -for i, k in ipairs(ekeys) do \ - evals[i] = {[k] = errinj.get(k)} \ -end ---- -... -evals ---- -- - ERRINJ_APPLIER_DESTROY_DELAY: false - - ERRINJ_APPLIER_READ_TX_ROW_DELAY: false - - ERRINJ_APPLIER_SLOW_ACK: false - - ERRINJ_APPLIER_STOP_DELAY: false - - ERRINJ_BUILD_INDEX: -1 - - ERRINJ_BUILD_INDEX_DELAY: false - - ERRINJ_BUILD_INDEX_ON_ROLLBACK_ALLOC: false - - ERRINJ_CHECK_FORMAT_DELAY: false - - ERRINJ_COIO_SENDFILE_CHUNK: -1 - - ERRINJ_COIO_WRITE_CHUNK: false - - ERRINJ_DYN_MODULE_COUNT: 0 - - ERRINJ_ENGINE_JOIN_DELAY: false - - ERRINJ_FIBER_MADVISE: false - - ERRINJ_FIBER_MPROTECT: -1 - - ERRINJ_FLIGHTREC_LOG_DELAY: 0 - - ERRINJ_FLIGHTREC_RECREATE_RENAME: false - - ERRINJ_HASH_INDEX_REPLACE: false - - ERRINJ_HTTPC_EXECUTE: false - - ERRINJ_HTTP_RESPONSE_ADD_WAIT: false - - ERRINJ_INDEX_ALLOC: false - - ERRINJ_INDEX_ITERATOR_NEW: false - - ERRINJ_INDEX_RESERVE: false - - ERRINJ_IPROTO_CFG_LISTEN: 0 - - ERRINJ_IPROTO_DISABLE_ID: false - - ERRINJ_IPROTO_DISABLE_WATCH: false - - ERRINJ_IPROTO_FLIP_FEATURE: -1 - - ERRINJ_IPROTO_SET_VERSION: -1 - - ERRINJ_IPROTO_TX_DELAY: false - - ERRINJ_IPROTO_WRITE_ERROR_DELAY: false - - ERRINJ_LOG_ROTATE: false - - ERRINJ_MAIN_MAKE_FILE_ON_RETURN: false - - ERRINJ_MEMTX_DELAY_GC: false - - ERRINJ_NETBOX_DISABLE_ID: false - - ERRINJ_NETBOX_FLIP_FEATURE: -1 - - ERRINJ_NETBOX_IO_DELAY: false - - ERRINJ_NETBOX_IO_ERROR: false - - ERRINJ_PORT_DUMP: false - - ERRINJ_RAFT_WAIT_TERM_PERSISTED_DELAY: false - - ERRINJ_RELAY_BREAK_LSN: -1 - - ERRINJ_RELAY_EXIT_DELAY: 0 - - ERRINJ_RELAY_FASTER_THAN_TX: false - - ERRINJ_RELAY_FINAL_JOIN: false - - ERRINJ_RELAY_FINAL_SLEEP: false - - ERRINJ_RELAY_FROM_TX_DELAY: false - - ERRINJ_RELAY_READ_ACK_DELAY: false - - ERRINJ_RELAY_REPORT_INTERVAL: 0 - - ERRINJ_RELAY_SEND_DELAY: false - - ERRINJ_RELAY_TIMEOUT: 0 - - ERRINJ_RELAY_WAL_START_DELAY: false - - ERRINJ_REPLICASET_VCLOCK: false - - ERRINJ_REPLICA_JOIN_DELAY: false - - ERRINJ_SIGILL_MAIN_THREAD: false - - ERRINJ_SIGILL_NONMAIN_THREAD: false - - ERRINJ_SIO_READ_MAX: -1 - - ERRINJ_SNAP_COMMIT_DELAY: false - - ERRINJ_SNAP_COMMIT_FAIL: false - - ERRINJ_SNAP_SKIP_ALL_ROWS: false - - ERRINJ_SNAP_SKIP_DDL_ROWS: false - - ERRINJ_SNAP_WRITE_CORRUPTED_INSERT_ROW: false - - ERRINJ_SNAP_WRITE_DELAY: false - - ERRINJ_SNAP_WRITE_INVALID_SYSTEM_ROW: false - - ERRINJ_SNAP_WRITE_MISSING_SPACE_ROW: false - - ERRINJ_SNAP_WRITE_UNKNOWN_ROW_TYPE: false - - ERRINJ_SPACE_UPGRADE_DELAY: false - - ERRINJ_SWIM_FD_ONLY: false - - ERRINJ_TESTING: false - - ERRINJ_TUPLE_ALLOC: false - - ERRINJ_TUPLE_FIELD: false - - ERRINJ_TUPLE_FIELD_COUNT_LIMIT: -1 - - ERRINJ_TUPLE_FORMAT_COUNT: -1 - - ERRINJ_TXN_COMMIT_ASYNC: false - - ERRINJ_TXN_LIMBO_BEGIN_DELAY: false - - ERRINJ_TX_DELAY_PRIO_ENDPOINT: 0 - - ERRINJ_VYRUN_DATA_READ: false - - ERRINJ_VY_COMPACTION_DELAY: false - - ERRINJ_VY_DELAY_PK_LOOKUP: false - - ERRINJ_VY_DUMP_DELAY: false - - ERRINJ_VY_GC: false - - ERRINJ_VY_INDEX_DUMP: -1 - - ERRINJ_VY_INDEX_FILE_RENAME: false - - ERRINJ_VY_LOG_FILE_RENAME: false - - ERRINJ_VY_LOG_FLUSH: false - - ERRINJ_VY_LOG_FLUSH_DELAY: false - - ERRINJ_VY_POINT_ITER_WAIT: false - - ERRINJ_VY_QUOTA_DELAY: false - - ERRINJ_VY_READ_PAGE: false - - ERRINJ_VY_READ_PAGE_DELAY: false - - ERRINJ_VY_READ_PAGE_TIMEOUT: 0 - - ERRINJ_VY_READ_VIEW_MERGE_FAIL: false - - ERRINJ_VY_RUN_DISCARD: false - - ERRINJ_VY_RUN_FILE_RENAME: false - - ERRINJ_VY_RUN_OPEN: -1 - - ERRINJ_VY_RUN_WRITE: false - - ERRINJ_VY_RUN_WRITE_DELAY: false - - ERRINJ_VY_RUN_WRITE_STMT_TIMEOUT: 0 - - ERRINJ_VY_SCHED_TIMEOUT: 0 - - ERRINJ_VY_SQUASH_TIMEOUT: 0 - - ERRINJ_VY_STMT_ALLOC: -1 - - ERRINJ_VY_TASK_COMPLETE: false - - ERRINJ_VY_WRITE_ITERATOR_START_FAIL: false - - ERRINJ_WAIT_QUORUM_COUNT: 0 - - ERRINJ_WAL_BREAK_LSN: -1 - - ERRINJ_WAL_DELAY: false - - ERRINJ_WAL_DELAY_COUNTDOWN: -3 - - ERRINJ_WAL_FALLOCATE: 0 - - ERRINJ_WAL_IO: false - - ERRINJ_WAL_ROTATE: false - - ERRINJ_WAL_SYNC: false - - ERRINJ_WAL_SYNC_DELAY: false - - ERRINJ_WAL_WRITE: false - - ERRINJ_WAL_WRITE_COUNT: 2 - - ERRINJ_WAL_WRITE_DISK: false - - ERRINJ_WAL_WRITE_EOF: false - - ERRINJ_WAL_WRITE_PARTIAL: -1 - - ERRINJ_XLOG_GARBAGE: false - - ERRINJ_XLOG_META: false - - ERRINJ_XLOG_READ: -1 - - ERRINJ_XLOG_RENAME_DELAY: false - - ERRINJ_XLOG_WRITE_CORRUPTED_BODY: false - - ERRINJ_XLOG_WRITE_CORRUPTED_HEADER: false - - ERRINJ_XLOG_WRITE_INVALID_BODY: false - - ERRINJ_XLOG_WRITE_INVALID_HEADER: false - - ERRINJ_XLOG_WRITE_INVALID_KEY: false - - ERRINJ_XLOG_WRITE_INVALID_VALUE: false - - ERRINJ_XLOG_WRITE_UNKNOWN_KEY: false - - ERRINJ_XLOG_WRITE_UNKNOWN_TYPE: false -... errinj.set("some-injection", true) --- - 'error: can''t find error injection ''some-injection''' diff --git a/test/box/errinj.test.lua b/test/box/errinj.test.lua index a8a6e34d1f..83ccf3107f 100644 --- a/test/box/errinj.test.lua +++ b/test/box/errinj.test.lua @@ -11,20 +11,6 @@ net_box = require('net.box') space = box.schema.space.create('tweedledum') index = space:create_index('primary', { type = 'hash' }) --- --- Print all error keys in sorted order to minimize diff output --- when new ones are merged in. -ekeys = {} -evals = {} -for k, v in pairs(errinj.info()) do \ - table.insert(ekeys, k) \ -end -table.sort(ekeys) -for i, k in ipairs(ekeys) do \ - evals[i] = {[k] = errinj.get(k)} \ -end -evals - errinj.set("some-injection", true) errinj.set("some-injection") -- check error space:select{222444} -- GitLab