Skip to content

Commit 20fabe4

Browse files
committed
Remove prepareStorageUsageReportingScenarios wrapper function
Call prepareMetricsScenarios directly in the Before hook instead of going through an unnecessary indirection layer. Issue: ZENKO-5202
1 parent ac54083 commit 20fabe4

File tree

2 files changed

+9
-18
lines changed

2 files changed

+9
-18
lines changed

tests/ctst/common/hooks.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ import Zenko from '../world/Zenko';
99
import { CacheHelper, Identity } from 'cli-testing';
1010
import { prepareQuotaScenarios, teardownQuotaScenarios } from 'steps/quotas/quotas';
1111
import { prepareUtilizationScenarios } from 'steps/utilization/utilizationAPI';
12-
import {
13-
prepareStorageUsageReportingScenarios,
14-
} from 'steps/reporting/storageUsageReporting';
12+
import { prepareMetricsScenarios } from './utils';
1513
import { cleanS3Bucket } from './common';
1614
import { cleanAzureContainer, cleanZenkoLocation } from 'steps/azureArchive';
1715
import { displayDebuggingInformation, preparePRA } from 'steps/pra';
@@ -64,7 +62,13 @@ Before({ tags: '@UtilizationAPI', timeout: 1200000 }, async function (scenarioOp
6462
});
6563

6664
Before({ tags: '@PrepareStorageUsageReportingScenarios', timeout: 1200000 }, async function (scenarioOptions) {
67-
await prepareStorageUsageReportingScenarios(this as Zenko, scenarioOptions);
65+
await prepareMetricsScenarios(this as Zenko, scenarioOptions, {
66+
versioning: '',
67+
jobNamespace: 'storage-usage-reporting-setup',
68+
jobName: 'end2end-ops-count-items',
69+
objectSize: 200,
70+
objectCount: 3,
71+
});
6872
});
6973

7074
After(async function (this: Zenko, results) {

tests/ctst/steps/reporting/storageUsageReporting.ts

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import { When, Then, ITestCaseHookParameter } from '@cucumber/cucumber';
1+
import { When, Then } from '@cucumber/cucumber';
22
import { strict as assert } from 'assert';
33
import Zenko from '../../world/Zenko';
44
import { IdentityEnum } from 'cli-testing';
5-
import { prepareMetricsScenarios } from '../../common/utils';
65

76
interface LocationUsage {
87
bytesTotal: number;
@@ -15,18 +14,6 @@ interface ReportingUsageResponse {
1514
accounts: Record<string, Record<string, LocationUsage>>;
1615
}
1716

18-
export async function prepareStorageUsageReportingScenarios(
19-
world: Zenko, scenarioConfiguration: ITestCaseHookParameter,
20-
) {
21-
await prepareMetricsScenarios(world, scenarioConfiguration, {
22-
versioning: '',
23-
jobNamespace: 'storage-usage-reporting-setup',
24-
jobName: 'end2end-ops-count-items',
25-
objectSize: 200,
26-
objectCount: 3,
27-
});
28-
}
29-
3017
When('the user retrieves the storage usage report',
3118
async function (this: Zenko) {
3219
const result = await this.managementAPIRequest(

0 commit comments

Comments
 (0)