From 6f98a7f4ed8442be5802674ebafb15cca717795b Mon Sep 17 00:00:00 2001 From: Austin Godber Date: Thu, 28 Jan 2021 13:58:08 -0700 Subject: [PATCH] Add new for TSError and use reject.toThrow --- .../cluster/services/cluster/backends/kubernetes/k8s.js | 4 ++-- .../services/cluster/backends/kubernetes/k8s-spec.js | 9 ++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/packages/teraslice/lib/cluster/services/cluster/backends/kubernetes/k8s.js b/packages/teraslice/lib/cluster/services/cluster/backends/kubernetes/k8s.js index 4af8bcbeba3..86a890f78cd 100644 --- a/packages/teraslice/lib/cluster/services/cluster/backends/kubernetes/k8s.js +++ b/packages/teraslice/lib/cluster/services/cluster/backends/kubernetes/k8s.js @@ -204,9 +204,9 @@ class K8s { } if (jobs.items.length === 0) { const msg = `Teraslice ${objType} matching the following selector was not found: ${selector} (retriable)`; this.logger.warn(msg); - throw TSError(msg, { retryable: true }); + throw new TSError(msg, { retryable: true }); } else { - throw TSError(`Unexpected number of Teraslice ${objType}s matching the following selector: ${selector}`, { + throw new TSError(`Unexpected number of Teraslice ${objType}s matching the following selector: ${selector}`, { retryable: true }); } diff --git a/packages/teraslice/test/lib/cluster/services/cluster/backends/kubernetes/k8s-spec.js b/packages/teraslice/test/lib/cluster/services/cluster/backends/kubernetes/k8s-spec.js index 0f72549a823..bba3f8b5c51 100644 --- a/packages/teraslice/test/lib/cluster/services/cluster/backends/kubernetes/k8s-spec.js +++ b/packages/teraslice/test/lib/cluster/services/cluster/backends/kubernetes/k8s-spec.js @@ -121,13 +121,8 @@ describe('k8s', () => { .query({ labelSelector: 'app=teraslice' }) .reply(200, { items: [] }); - try { - await k8s.nonEmptyList('app=teraslice', 'jobs'); - } catch (error) { - expect(error).toEqual( - Error('Teraslice jobs matching the following selector was not found: app=teraslice (retriable)') - ); - } + await expect(k8s.nonEmptyList('app=teraslice', 'jobs')) + .rejects.toThrowError('Teraslice jobs matching the following selector was not found: app=teraslice (retriable)'); }); });