From 2ebe9c35b3fd005da4f93b542fc3ea8b979792ce Mon Sep 17 00:00:00 2001 From: jhockett Date: Wed, 9 Jun 2021 18:30:58 -0700 Subject: [PATCH 1/2] chore: update AMPLIFY_PATH env var in config for migration tests --- .circleci/config.base.yml | 6 ++++-- .circleci/config.yml | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.circleci/config.base.yml b/.circleci/config.base.yml index 5698219173a..6ad6fb1d403 100644 --- a/.circleci/config.base.yml +++ b/.circleci/config.base.yml @@ -287,7 +287,8 @@ jobs: amplify_migration_tests_non_multi_env_layers: <<: *defaults - + environment: + AMPLIFY_PATH: /home/circleci/.npm-global/lib/node_modules/@aws-amplify/cli/bin/amplify steps: - attach_workspace: at: ./ @@ -309,7 +310,8 @@ jobs: amplify_migration_tests_multi_env_layers: <<: *defaults - + environment: + AMPLIFY_PATH: /home/circleci/.npm-global/lib/node_modules/@aws-amplify/cli/bin/amplify steps: - attach_workspace: at: ./ diff --git a/.circleci/config.yml b/.circleci/config.yml index 038dcdede0d..d9621ee5666 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -297,6 +297,8 @@ jobs: working_directory: ~/repo docker: *ref_1 resource_class: large + environment: + AMPLIFY_PATH: /home/circleci/.npm-global/lib/node_modules/@aws-amplify/cli/bin/amplify steps: - attach_workspace: at: ./ @@ -322,6 +324,8 @@ jobs: working_directory: ~/repo docker: *ref_1 resource_class: large + environment: + AMPLIFY_PATH: /home/circleci/.npm-global/lib/node_modules/@aws-amplify/cli/bin/amplify steps: - attach_workspace: at: ./ From 97059195dc67df5b554e12e41f890b52d7ac8f0c Mon Sep 17 00:00:00 2001 From: jhockett Date: Wed, 9 Jun 2021 19:48:42 -0700 Subject: [PATCH 2/2] test: python layer accept matching string with extra escaped chars --- packages/amplify-e2e-tests/src/__tests__/function_4.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/amplify-e2e-tests/src/__tests__/function_4.test.ts b/packages/amplify-e2e-tests/src/__tests__/function_4.test.ts index 2e40fcf61d8..6560a53b647 100644 --- a/packages/amplify-e2e-tests/src/__tests__/function_4.test.ts +++ b/packages/amplify-e2e-tests/src/__tests__/function_4.test.ts @@ -314,6 +314,6 @@ describe('add function with layers for runtime python', () => { const payload = '{}'; const response = await functionCloudInvoke(projRoot, { funcName: functionName, payload: payload }); - expect(JSON.parse(response.Payload.toString()).body).toEqual(helloWorldSuccessOutput); + expect(JSON.parse(response.Payload.toString()).body).toMatch(helloWorldSuccessOutput); }); });