Skip to content

[Entity Analytics] Fix CSV upload test to stop automated-resolution maintainer #264061

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

Closed
maxcold wants to merge 1 commit into from
Closed

[Entity Analytics] Fix CSV upload test to stop automated-resolution maintainer #264061

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 13 additions & 4 deletions ...s/entity_analytics/entity_resolution/trial_license_complete_tier/resolution_csv_upload.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { ENTITY_STORE_ROUTES, API_VERSIONS } from '@kbn/entity-store/common';
import { ENTITY_RESOLUTION_CSV_UPLOAD_URL } from '@kbn/security-solution-plugin/common/entity_analytics/entity_store/constants';
import type { FtrProviderContext } from '../../../../ftr_provider_context';
import { EntityStoreUtils } from '../../utils';
import { entityMaintainerRouteHelpersFactory } from '../../utils/entity_maintainers';

const TEST_PREFIX = 'csv-test:';

Expand Down Expand Up @@ -49,6 +50,7 @@ export default ({ getService }: FtrProviderContext) => {
const log = getService('log');
const retry = getService('retry');
const entityStoreUtils = EntityStoreUtils(getService);
const maintainerRoutes = entityMaintainerRouteHelpersFactory(supertest);

const uploadCsv = (csvContent: string) =>
supertest
Expand Down Expand Up @@ -116,11 +118,18 @@ export default ({ getService }: FtrProviderContext) => {

describe('@ess @serverless @skipInServerlessMKI Entity Resolution CSV Upload', () => {
before(async () => {
// Use enableEntityStoreV2 (without maintainer init) to prevent the
// automated resolution maintainer from racing with CSV upload tests.
// The maintainer would link entities sharing the same user.email,
// interfering with the test's own resolution assertions.
await entityStoreUtils.enableEntityStoreV2();

// Stop the automated resolution maintainer to prevent it from racing
// with CSV upload tests. The maintainer would link entities sharing
// the same user.email, interfering with the test's own assertions.
try {
await maintainerRoutes.stopMaintainer('automated-resolution');
} catch (e) {
// Maintainer may not be initialized yet (pre-#263732); safe to ignore.
log.debug(`Could not stop automated-resolution maintainer: ${e.message}`);
}

await cleanEntities();
await seedEntities();
await waitForEntities();
Expand Down
Loading