Skip to content

Commit 8886638

Browse files
mk-oracle: drop ts_quotas from the default sections
CMK-37533 Change-Id: I8bcb7b3bcfa8865b85995d18b063d368dc0de81e (cherry picked from commit 921aca4)
1 parent 9f07568 commit 8886638

3 files changed

Lines changed: 7 additions & 15 deletions

File tree

packages/mk-oracle/src/config/section.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ pub enum SectionKind {
8080
Disabled,
8181
}
8282

83-
const PREDEFINED_SECTIONS: [&str; 20] = [
83+
const PREDEFINED_SECTIONS: [&str; 19] = [
8484
names::INSTANCE,
8585
names::ASM_INSTANCE,
8686
names::SESSIONS,
@@ -100,7 +100,6 @@ const PREDEFINED_SECTIONS: [&str; 20] = [
100100
names::RESUMABLE,
101101
names::IO_STATS,
102102
names::ASM_DISK_GROUP,
103-
names::TS_QUOTAS,
104103
];
105104

106105
const PREDEFINED_ASYNC_SECTIONS: [&str; 6] = [
@@ -658,7 +657,7 @@ sections:
658657
.unwrap()
659658
.sections()
660659
.len(),
661-
20
660+
19
662661
);
663662
assert_eq!(s.sections.len(), PREDEFINED_SECTIONS.len());
664663
s.sections.iter().for_each(|s| {

tests/system/mk_oracle/test_docker_oracle.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -273,12 +273,11 @@ def test_mk_oracle_section_systemparameter(
273273
_assert_rows_start_with_sid(rows, oracle.SID)
274274

275275

276-
def test_mk_oracle_section_ts_quotas(
277-
oracle: OracleDatabase, mk_oracle_sections: dict[str, list[str]]
276+
def test_mk_oracle_section_ts_quotas_absent(
277+
mk_oracle_sections: dict[str, list[str]],
278278
) -> None:
279-
rows = mk_oracle_sections.get("oracle_ts_quotas", [])
280-
assert rows, "oracle_ts_quotas is empty"
281-
_assert_rows_start_with_sid(rows, oracle.SID)
279+
"""ts_quotas is not in the default section set and no check plugin parses it."""
280+
assert "oracle_ts_quotas" not in mk_oracle_sections
282281

283282

284283
def test_mk_oracle_section_jobs(

tests/system/mk_oracle/test_plugin_comparison.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,7 @@
2424
# a rationale; anything not listed is treated as a regression and fails the test.
2525
KNOWN_DEVIATIONS: dict[str, set[str]] = {
2626
"only_in_old": set(),
27-
"only_in_new": {
28-
# The new plugin emits an oracle_ts_quotas section (bare header + :sep(124)
29-
# data variant); the old bash plugin does not produce it under the default
30-
# section set. New-plugin addition.
31-
"oracle_ts_quotas",
32-
"oracle_ts_quotas:sep(124)",
33-
},
27+
"only_in_new": set(),
3428
"different": {
3529
# oracle_performance: two independent, accepted differences —
3630
# * the OLD plugin emits a noise/debug row for the PDB

0 commit comments

Comments
 (0)