fix: minor tweaks for message consistency and stability

Signed-off-by: Nathan Klick <[email protected]>

Author: nathanklick

src/core/listr_lease.ts

@@ -60,7 +60,7 @@ export class ListrLease {
                 task.title = `${title} - ${chalk.gray(`lease exists, attempting again in ${lease.DurationSeconds} seconds`)}` +
                     `, attempt: ${chalk.cyan((attempt + 1).toString())}/${chalk.cyan(maxAttempts.toString())}`
 
-                if (attempt === maxAttempts - 1) {
+                if (attempt >= maxAttempts) {
                     innerError = e
                 }
             }
@@ -69,6 +69,6 @@ export class ListrLease {
         task.title = `${title} - ${chalk.red('failed to acquire lease, max attempts reached!')}` +
             `, attempt: ${chalk.cyan(attempt.toString())}/${chalk.cyan(maxAttempts.toString())}`
 
-        throw new LeaseAcquisitionError(`Failed to acquire lease, max attempts reached (${attempt}/${maxAttempts})`, innerError)
+        throw new LeaseAcquisitionError(`Failed to acquire lease, max attempts reached (${attempt + 1}/${maxAttempts})`, innerError)
     }
 }

test/e2e/integration/core/lease.test.ts

@@ -41,7 +41,7 @@ describe('Lease', async function () {
         this.timeout(defaultTimeout)
         if (await k8.hasNamespace(testNamespace)) {
             await k8.deleteNamespace(testNamespace)
-            await sleep(500)
+            await sleep(5 * SECONDS)
         }
 
         await k8.createNamespace(testNamespace)

test/e2e/integration/core/lease_renewal.test.ts

@@ -41,7 +41,7 @@ describe('LeaseRenewalService', async function () {
         this.timeout(defaultTimeout)
         if (await k8.hasNamespace(testNamespace)) {
             await k8.deleteNamespace(testNamespace)
-            await sleep(500)
+            await sleep(5 * SECONDS)
         }
 
         await k8.createNamespace(testNamespace)