Skip to content

Commit

Permalink
Merge branch 'main' into split-types-from-code-on-kbn-ui-shared-deps-src
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine authored Jan 18, 2022
2 parents 0d97e63 + d296c6f commit 36030d4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion x-pack/test/functional/apps/security/users.ts
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});
});

describe('Deactivate/Activate user', () => {
// FLAKY: https://github.com/elastic/kibana/issues/118728
describe.skip('Deactivate/Activate user', () => {
it('deactivates user when confirming', async () => {
await PageObjects.security.deactivatesUser(optionalUser);
const users = keyBy(await PageObjects.security.getElasticsearchUsers(), 'username');
Expand Down
3 changes: 2 additions & 1 deletion x-pack/test/licensing_plugin/server/updates.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ export default function (ftrContext: FtrProviderContext) {

const scenario = createScenario(ftrContext);

describe('changes in license types', () => {
// FLAKY: https://github.com/elastic/kibana/issues/110938
describe.skip('changes in license types', () => {
after(async () => {
await scenario.teardown();
});
Expand Down

0 comments on commit 36030d4

Please sign in to comment.