feat: enhance job readiness checks and implement retry logic for test stability

Author: aniket-shikhare-cstk

test/sanity-check/api/bulkOperation-test.js

@@ -40,7 +40,7 @@ function assetsWithValidUids () {
   return [assetUid1, assetUid2].filter(uid => uid && String(uid).trim()).map(uid => ({ uid }))
 }
 
-async function waitForJobReady (jobId, maxAttempts = 3) {
+async function waitForJobReady (jobId, maxAttempts = 15) {
   for (let attempt = 1; attempt <= maxAttempts; attempt++) {
     try {
       // GET /v3/bulk/jobs/{job_id} on AM2.0 requires management token auth (authtoken returns 401)
@@ -369,6 +369,7 @@ describe('BulkOperation api test', () => {
 
   it('should wait for jobs to be ready and get job status for the first publish job', async function () {
     this.timeout(60000)
+    this.retries(2)
 
     const response = await waitForJobReady(jobId1)
     expect(response).to.not.equal(undefined)
@@ -381,6 +382,7 @@ describe('BulkOperation api test', () => {
 
   it('should validate detailed job status response structure', async function () {
     this.timeout(60000)
+    this.retries(2)
     const response = await waitForJobReady(jobId1)
     expect(response).to.not.equal(undefined)
     expect(response.uid).to.not.equal(undefined)
@@ -394,6 +396,7 @@ describe('BulkOperation api test', () => {
 
   it('should get job status for the second publish job', async function () {
     this.timeout(60000)
+    this.retries(2)
 
     const response = await waitForJobReady(jobId2)
     expect(response).to.not.equal(undefined)
@@ -406,6 +409,7 @@ describe('BulkOperation api test', () => {
 
   it('should get job status for the third publish job', async function () {
     this.timeout(60000)
+    this.retries(2)
 
     const response = await waitForJobReady(jobId3)
     expect(response).to.not.equal(undefined)
@@ -418,6 +422,7 @@ describe('BulkOperation api test', () => {
 
   it('should get job status for publishAllLocalized=true job', async function () {
     this.timeout(60000)
+    this.retries(2)
 
     const response = await waitForJobReady(jobId4)
     expect(response).to.not.equal(undefined)
@@ -430,6 +435,7 @@ describe('BulkOperation api test', () => {
 
   it('should get job status for publishAllLocalized=false job', async function () {
     this.timeout(60000)
+    this.retries(2)
 
     const response = await waitForJobReady(jobId5)
     expect(response).to.not.equal(undefined)
@@ -442,6 +448,7 @@ describe('BulkOperation api test', () => {
 
   it('should get job status for asset publishAllLocalized job', async function () {
     this.timeout(60000)
+    this.retries(2)
 
     const response = await waitForJobReady(jobId6)
     expect(response).to.not.equal(undefined)
@@ -454,6 +461,7 @@ describe('BulkOperation api test', () => {
 
   it('should get job status for unpublishAllLocalized=true job', async function () {
     this.timeout(60000)
+    this.retries(2)
 
     const response = await waitForJobReady(jobId7)
     expect(response).to.not.equal(undefined)
@@ -466,6 +474,7 @@ describe('BulkOperation api test', () => {
 
   it('should get job status for unpublishAllLocalized=false job', async function () {
     this.timeout(60000)
+    this.retries(2)
 
     const response = await waitForJobReady(jobId8)
     expect(response).to.not.equal(undefined)
@@ -478,6 +487,7 @@ describe('BulkOperation api test', () => {
 
   it('should get job status for asset unpublishAllLocalized job', async function () {
     this.timeout(60000)
+    this.retries(2)
 
     const response = await waitForJobReady(jobId9)
     expect(response).to.not.equal(undefined)
@@ -490,6 +500,7 @@ describe('BulkOperation api test', () => {
 
   it('should get job status for multiple parameters job', async function () {
     this.timeout(60000)
+    this.retries(2)
 
     const response = await waitForJobReady(jobId10)
     expect(response).to.not.equal(undefined)
@@ -502,6 +513,7 @@ describe('BulkOperation api test', () => {
 
   it('should get job status with bulk_version parameter', async function () {
     this.timeout(60000)
+    this.retries(2)
 
     await waitForJobReady(jobId1)
     const response = await doBulkOperationWithManagementToken(tokenUidDev)
@@ -516,6 +528,7 @@ describe('BulkOperation api test', () => {
 
   it('should get job items for a completed job', async function () {
     this.timeout(60000)
+    this.retries(2)
 
     await waitForJobReady(jobId1)
     const response = await doBulkOperationWithManagementToken(tokenUidDev)
@@ -526,6 +539,7 @@ describe('BulkOperation api test', () => {
 
   it('should get job items with explicit api_version', async function () {
     this.timeout(60000)
+    this.retries(2)
 
     await waitForJobReady(jobId2)
     const response = await doBulkOperationWithManagementToken(tokenUidDev)

test/sanity-check/sanity.js

@@ -242,8 +242,17 @@ before(async function () {
 // GLOBAL CURL CAPTURE FOR ALL TESTS (PASSED AND FAILED)
 // ============================================================================
 
-// Clear request log and assertion tracker before each test
-beforeEach(function () {
+// Clear request log and assertion tracker before each test.
+// When a test has this.retries(N) and is being retried, waits 7 seconds first
+// so the server has time to recover from slowness before the next attempt.
+beforeEach(async function () {
+  const retryNum = (typeof this.currentRetry === 'function') ? this.currentRetry() : 0
+  if (retryNum > 0) {
+    const testTitle = (this.currentTest && this.currentTest.title) || 'unknown'
+    console.log(`  [retry] attempt ${retryNum + 1} for "${testTitle}" — waiting 7s for server recovery...`)
+    await new Promise(resolve => setTimeout(resolve, 7000))
+  }
+
   // Clear SDK plugin request capture
   testSetup.clearCapturedRequests()