archive-gh-me/serverless
1
0
Fork 0
mirror of https://github.com/serverless/serverless.git synced 2026-02-01 16:07:28 +00:00
Code Issues Projects Releases Wiki Activity

test(AWS Websocket): Remove temporary workaround (#11847)

Browse Source
This commit is contained in:
Duy Tran 2023-03-23 20:38:28 +08:00 committed by GitHub
parent 77c91f27d6
commit d0de42b3eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/integration/aws/websocket.test.js
View File

@ -24,8 +24,6 @@ describe('AWS - API Gateway Websocket Integration Test', function () {
let serviceName;
let serviceDir;
let updateConfig;
// TODO: Remove once occasional test fail is debugged
let twoWayPassed;
const stage = 'dev';
before(async () => {
@ -36,10 +34,7 @@ describe('AWS - API Gateway Websocket Integration Test', function () {
return deployService(serviceDir);
});
after(() => {
if (!twoWayPassed) return null;
return removeService(serviceDir);
});
after(() => removeService(serviceDir));
async function getWebSocketServerUrl() {
const result = await awsRequest(CloudFormationService, 'describeStacks', {
@ -81,7 +76,6 @@ describe('AWS - API Gateway Websocket Integration Test', function () {
ws.on('close', resolve);
ws.on('message', (event) => {
twoWayPassed = true;
clearTimeout(timeoutId);
try {
log.debug(`Received WebSocket message: ${event}`);
@ -95,8 +89,7 @@ describe('AWS - API Gateway Websocket Integration Test', function () {
});
describe('Minimal Setup', () => {
it('should expose an accessible websocket endpoint', async function () {
if (!twoWayPassed) this.skip();
it('should expose an accessible websocket endpoint', async () => {
const webSocketServerUrl = await getWebSocketServerUrl();
log.debug(`WebSocket Server URL ${webSocketServerUrl}`);
@ -137,8 +130,7 @@ describe('AWS - API Gateway Websocket Integration Test', function () {
// NOTE: this test should be at the very end because we're using an external REST API here
describe('when using an existing websocket API', () => {
let websocketApiId;
before(async function () {
if (!twoWayPassed) this.skip();
before(async () => {
// create an external websocket API
const externalWebsocketApiName = `${stage}-${serviceName}-ext-api`;
const wsApiMeta = await createApi(externalWebsocketApiName);
@ -154,7 +146,6 @@ describe('AWS - API Gateway Websocket Integration Test', function () {
after(async () => {
// NOTE: deleting the references to the old, external websocket API
if (!twoWayPassed) return;
await updateConfig({
provider: {
apiGateway: { websocketApiId: null },