Skip to content

Commit

Permalink
[8.12] [Tech debt] Removes commented out code (#172858) (#172904)
Browse files Browse the repository at this point in the history
# Backport

This will backport the following commits from `main` to `8.12`:
- [[Tech debt] Removes commented out code
(#172858)](#172858)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Christiane (Tina)
Heiligers","email":"christiane.heiligers@elastic.co"},"sourceCommit":{"committedDate":"2023-12-08T07:31:17Z","message":"[Tech
debt] Removes commented out code (#172858)\n\ncode cleanup from
https://github.com/elastic/kibana/pull/172732\r\n\r\nCo-authored-by:
Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"22df91900bcd436d32d029e58bca829c767143bb","branchLabelMapping":{"^v8.13.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["chore","release_note:skip","Feature:Migrations","backport:all-open","v8.13.0"],"number":172858,"url":"https://github.com/elastic/kibana/pull/172858","mergeCommit":{"message":"[Tech
debt] Removes commented out code (#172858)\n\ncode cleanup from
https://github.com/elastic/kibana/pull/172732\r\n\r\nCo-authored-by:
Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"22df91900bcd436d32d029e58bca829c767143bb"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.13.0","labelRegex":"^v8.13.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/172858","number":172858,"mergeCommit":{"message":"[Tech
debt] Removes commented out code (#172858)\n\ncode cleanup from
https://github.com/elastic/kibana/pull/172732\r\n\r\nCo-authored-by:
Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"22df91900bcd436d32d029e58bca829c767143bb"}}]}]
BACKPORT-->

Co-authored-by: Christiane (Tina) Heiligers <christiane.heiligers@elastic.co>
  • Loading branch information
kibanamachine and TinaHeiligers authored Dec 8, 2023
1 parent 641da4e commit b817537
Showing 1 changed file with 1 addition and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ describe('migration v2', () => {
});

it('clean ups if migration fails', async () => {
const { runMigrations /* , client */ } = await setupNextMinor();
const { runMigrations } = await setupNextMinor();

await expect(runMigrations()).rejects.toThrowErrorMatchingInlineSnapshot(`
"Unable to complete saved object migrations for the [${defaultKibanaIndex}] index: Migrations failed. Reason: 1 corrupt saved object documents were found: corrupt:2baf4de0-a6d4-11ed-ba5a-39196fc76e60
Expand All @@ -63,19 +63,6 @@ describe('migration v2', () => {
);

expect(logRecordWithPit).toBeTruthy();
/* TEMPORARILY DISABLE
const pitId = logRecordWithPit.right.pitId;
expect(pitId).toBeTruthy();
await expect(
client.search({
body: {
pit: { id: pitId },
},
})
// throws an exception that cannot search with closed PIT
).rejects.toThrow(/search_phase_execution_exception/);
*/
});

afterEach(async () => {
Expand Down

0 comments on commit b817537

Please sign in to comment.