Skip to content

Commit

Permalink
Further tests for previous-allocs row
Browse files Browse the repository at this point in the history
  • Loading branch information
@philrenaud
philrenaud committed Apr 18, 2023
1 parent a907b52 commit 258c237
Show file tree
Hide file tree
Showing 2 changed files with 113 additions and 23 deletions.
10 changes: 7 additions & 3 deletions ui/app/components/job-status/panel/deploying.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@
<div class="boxed-section-body">
<div class="deployment-allocations">
{{#if this.oldVersionAllocBlockIDs.length}}
<h4 class="title is-5">Previous Allocations: {{#if this.oldVersionAllocBlocks.running}}{{this.oldRunningHealthyAllocBlocks.length}} running{{/if}}</h4>
<JobStatus::AllocationStatusRow @allocBlocks={{this.oldVersionAllocBlocks}} @steady={{true}} />
<h4 class="title is-5" data-test-old-allocation-tally>Previous allocations: {{#if this.oldVersionAllocBlocks.running}}{{this.oldRunningHealthyAllocBlocks.length}} running{{/if}}</h4>
<div class="previous-allocations">
<JobStatus::AllocationStatusRow @allocBlocks={{this.oldVersionAllocBlocks}} @steady={{true}} />
</div>
<div class="legend-and-summary">
<legend>
<span class="legend-item {{if (eq (get this.oldRunningHealthyAllocBlocks "length") 0) "faded"}}">
Expand All @@ -54,7 +56,9 @@
{{/if}}

<h4 class="title is-5" data-test-new-allocation-tally>New allocations: {{this.newRunningHealthyAllocBlocks.length}}/{{this.totalAllocs}} running and healthy</h4>
<JobStatus::AllocationStatusRow @allocBlocks={{this.newVersionAllocBlocks}} />
<div class="new-allocations">
<JobStatus::AllocationStatusRow @allocBlocks={{this.newVersionAllocBlocks}} />
</div>
</div>

<div class="legend-and-summary">
Expand Down
126 changes: 106 additions & 20 deletions ui/tests/integration/components/job-status-panel-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ module(
});

test('the latest deployment section shows up for the currently running deployment: Ungrouped Allocations (small cluster)', async function (assert) {
assert.expect(19);
assert.expect(23);

this.server.create('node');

Expand Down Expand Up @@ -79,6 +79,15 @@ module(
status: 'failed',
});

const OLD_ALLOCATIONS_TO_SHOW = 25;
const OLD_ALLOCATIONS_TO_COMPLETE = 5;

this.server.createList('allocation', OLD_ALLOCATIONS_TO_SHOW, {
jobId: job.id,
jobVersion: 0,
clientStatus: 'running',
});

this.set('job', jobRecord);
await this.get('job.allocations');

Expand Down Expand Up @@ -109,13 +118,15 @@ module(
// Half the shown allocations are running, 1 is pending, 1 is failed; none are canaries or healthy.
// The rest (lost, unknown, etc.) all show up as "Unplaced"
assert
.dom('.allocation-status-row .represented-allocation')
.dom('.new-allocations .allocation-status-row .represented-allocation')
.exists(
{ count: NUMBER_OF_GROUPS * ALLOCS_PER_GROUP },
'All allocations are shown (ungrouped)'
);
assert
.dom('.allocation-status-row .represented-allocation.running')
.dom(
'.new-allocations .allocation-status-row .represented-allocation.running'
)
.exists(
{
count:
Expand All @@ -126,13 +137,19 @@ module(
'Correct number of running allocations are shown'
);
assert
.dom('.allocation-status-row .represented-allocation.running.canary')
.dom(
'.new-allocations .allocation-status-row .represented-allocation.running.canary'
)
.exists({ count: 0 }, 'No running canaries shown by default');
assert
.dom('.allocation-status-row .represented-allocation.running.healthy')
.dom(
'.new-allocations .allocation-status-row .represented-allocation.running.healthy'
)
.exists({ count: 0 }, 'No running healthy shown by default');
assert
.dom('.allocation-status-row .represented-allocation.failed')
.dom(
'.new-allocations .allocation-status-row .represented-allocation.failed'
)
.exists(
{
count:
Expand All @@ -143,10 +160,14 @@ module(
'Correct number of failed allocations are shown'
);
assert
.dom('.allocation-status-row .represented-allocation.failed.canary')
.dom(
'.new-allocations .allocation-status-row .represented-allocation.failed.canary'
)
.exists({ count: 0 }, 'No failed canaries shown by default');
assert
.dom('.allocation-status-row .represented-allocation.pending')
.dom(
'.new-allocations .allocation-status-row .represented-allocation.pending'
)
.exists(
{
count:
Expand All @@ -157,10 +178,14 @@ module(
'Correct number of pending allocations are shown'
);
assert
.dom('.allocation-status-row .represented-allocation.pending.canary')
.dom(
'.new-allocations .allocation-status-row .represented-allocation.pending.canary'
)
.exists({ count: 0 }, 'No pending canaries shown by default');
assert
.dom('.allocation-status-row .represented-allocation.unplaced')
.dom(
'.new-allocations .allocation-status-row .represented-allocation.unplaced'
)
.exists(
{
count:
Expand All @@ -179,7 +204,7 @@ module(
this.job.allocations.filter(
(a) =>
a.clientStatus === 'running' &&
a.deploymentStatus.Healthy === true
a.deploymentStatus?.Healthy === true
).length
}/${deployment.get('desiredTotal')} running and healthy`,
'Summary text shows accurate numbers when 0 are running/healthy'
Expand All @@ -197,15 +222,15 @@ module(
.forEach((alloc) =>
alloc.set('deploymentStatus', {
Canary: true,
Healthy: alloc.deploymentStatus.Healthy,
Healthy: alloc.deploymentStatus?.Healthy,
})
);
this.get('job.allocations')
.filter((a) => a.clientStatus === 'running')
.slice(0, NUMBER_OF_RUNNING_HEALTHY)
.forEach((alloc) =>
alloc.set('deploymentStatus', {
Canary: alloc.deploymentStatus.Canary,
Canary: alloc.deploymentStatus?.Canary,
Healthy: true,
})
);
Expand All @@ -215,7 +240,7 @@ module(
.forEach((alloc) =>
alloc.set('deploymentStatus', {
Canary: true,
Healthy: alloc.deploymentStatus.Healthy,
Healthy: alloc.deploymentStatus?.Healthy,
})
);
this.get('job.allocations')
Expand All @@ -224,33 +249,41 @@ module(
.forEach((alloc) =>
alloc.set('deploymentStatus', {
Canary: true,
Healthy: alloc.deploymentStatus.Healthy,
Healthy: alloc.deploymentStatus?.Healthy,
})
);

await render(hbs`
<JobStatus::Panel @job={{this.job}} />
`);
assert
.dom('.allocation-status-row .represented-allocation.running.canary')
.dom(
'.new-allocations .allocation-status-row .represented-allocation.running.canary'
)
.exists(
{ count: NUMBER_OF_RUNNING_CANARIES },
'Running Canaries shown when deployment info dictates'
);
assert
.dom('.allocation-status-row .represented-allocation.running.healthy')
.dom(
'.new-allocations .allocation-status-row .represented-allocation.running.healthy'
)
.exists(
{ count: NUMBER_OF_RUNNING_HEALTHY },
'Running Healthy allocs shown when deployment info dictates'
);
assert
.dom('.allocation-status-row .represented-allocation.failed.canary')
.dom(
'.new-allocations .allocation-status-row .represented-allocation.failed.canary'
)
.exists(
{ count: NUMBER_OF_FAILED_CANARIES },
'Failed Canaries shown when deployment info dictates'
);
assert
.dom('.allocation-status-row .represented-allocation.pending.canary')
.dom(
'.new-allocations .allocation-status-row .represented-allocation.pending.canary'
)
.exists(
{ count: NUMBER_OF_PENDING_CANARIES },
'Pending Canaries shown when deployment info dictates'
Expand All @@ -262,12 +295,65 @@ module(
this.job.allocations.filter(
(a) =>
a.clientStatus === 'running' &&
a.deploymentStatus.Healthy === true
a.deploymentStatus?.Healthy === true
).length
}/${deployment.get('desiredTotal')} running and healthy`,
'Summary text shows accurate numbers when some are running/healthy'
);

assert.equal(
find('[data-test-old-allocation-tally]').textContent.trim(),
`Previous allocations: ${
this.job.allocations.filter(
(a) =>
(a.clientStatus === 'running' || a.clientStatus === 'complete') &&
a.jobVersion !== deployment.versionNumber
).length
} running`,
'Old Alloc Summary text shows accurate numbers'
);

// Try setting a few of the old allocs to complete and make sure number ticks down
await Promise.all(
this.get('job.allocations')
.filter(
(a) =>
a.clientStatus === 'running' &&
a.jobVersion !== deployment.versionNumber
)
.slice(0, OLD_ALLOCATIONS_TO_COMPLETE)
.map(async (a) => await a.set('clientStatus', 'complete'))
);

assert
.dom(
'.previous-allocations .allocation-status-row .represented-allocation'
)
.exists(
{ count: OLD_ALLOCATIONS_TO_SHOW },
'All old allocations are shown'
);
assert
.dom(
'.previous-allocations .allocation-status-row .represented-allocation.complete'
)
.exists(
{ count: OLD_ALLOCATIONS_TO_COMPLETE },
'Correct number of old allocations are in completed state'
);

assert.equal(
find('[data-test-old-allocation-tally]').textContent.trim(),
`Previous allocations: ${
this.job.allocations.filter(
(a) =>
(a.clientStatus === 'running' || a.clientStatus === 'complete') &&
a.jobVersion !== deployment.versionNumber
).length - OLD_ALLOCATIONS_TO_COMPLETE
} running`,
'Old Alloc Summary text shows accurate numbers after some are marked complete'
);

await componentA11yAudit(
this.element,
assert,
Expand Down

0 comments on commit 258c237

Please sign in to comment.