fix test

aliyun · Aug 29, 2019 · a63d50f · a63d50f
1 parent 6827db3
commit a63d50f
Show file tree

Hide file tree

Showing 12 changed files with 115 additions and 114 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -2,3 +2,4 @@
 *.min.js
 node_modules/*
 assets/scripts/lib/*
+test/project/node_modules/*
diff --git a/deploy/aliyunDeploy.test.js b/deploy/aliyunDeploy.test.js
@@ -270,12 +270,12 @@ describe('AliyunDeploy', () => {
         .then(() => aliyunDeploy.hooks['deploy:deploy']())
         .then(() => {
           const logs = [
-            'Creating log project sls-accountid-logs...',
-            'Created log project sls-accountid-logs',
-            'Creating log store sls-accountid-logs/my-service-dev...',
-            'Created log store sls-accountid-logs/my-service-dev',
-            'Creating log index for sls-accountid-logs/my-service-dev...',
-            'Created log index for sls-accountid-logs/my-service-dev',
+            'Creating log project sls-accountid-cn-shanghai-logs...',
+            'Created log project sls-accountid-cn-shanghai-logs',
+            'Creating log store sls-accountid-cn-shanghai-logs/my-service-dev...',
+            'Created log store sls-accountid-cn-shanghai-logs/my-service-dev',
+            'Creating log index for sls-accountid-cn-shanghai-logs/my-service-dev...',
+            'Created log index for sls-accountid-cn-shanghai-logs/my-service-dev',
             'Creating RAM role sls-my-service-dev-exec-role...',
             'Created RAM role sls-my-service-dev-exec-role',
             'Creating RAM policy fc-my-service-dev-access...',
@@ -284,10 +284,10 @@ describe('AliyunDeploy', () => {
             'Attached RAM policy fc-my-service-dev-access to sls-my-service-dev-exec-role',
             'Creating service my-service-dev...',
             'Created service my-service-dev',
-            'Creating bucket sls-accountid...',
-            'Created bucket sls-accountid',
-            'Uploading serverless/my-service/dev/1500622721413-2017-07-21T07:38:41.413Z/my-service.zip to OSS bucket sls-accountid...',
-            'Uploaded serverless/my-service/dev/1500622721413-2017-07-21T07:38:41.413Z/my-service.zip to OSS bucket sls-accountid',
+            'Creating bucket sls-accountid-cn-shanghai...',
+            'Created bucket sls-accountid-cn-shanghai',
+            'Uploading serverless/my-service/dev/1500622721413-2017-07-21T07:38:41.413Z/my-service.zip to OSS bucket sls-accountid-cn-shanghai...',
+            'Uploaded serverless/my-service/dev/1500622721413-2017-07-21T07:38:41.413Z/my-service.zip to OSS bucket sls-accountid-cn-shanghai',
             'Creating function my-service-dev-postTest...',
             'Created function my-service-dev-postTest',
             'Creating function my-service-dev-getTest...',
@@ -372,16 +372,16 @@ describe('AliyunDeploy', () => {
       deployApiStub.returns(Promise.resolve());
 
       const logs = [
-        'Log project sls-accountid-logs already exists.',
-        'Log store sls-accountid-logs/my-service-dev already exists.',
-        'Log store sls-accountid-logs/my-service-dev already has an index.',
+        'Log project sls-accountid-cn-shanghai-logs already exists.',
+        'Log store sls-accountid-cn-shanghai-logs/my-service-dev already exists.',
+        'Log store sls-accountid-cn-shanghai-logs/my-service-dev already has an index.',
         'RAM role sls-my-service-dev-exec-role exists.',
         'RAM policy fc-my-service-dev-access exists.',
         'RAM policy fc-my-service-dev-access has been attached to sls-my-service-dev-exec-role.',
         'Service my-service-dev already exists.',
-        'Bucket sls-accountid already exists.',
-        'Uploading serverless/my-service/dev/1500622721413-2017-07-21T07:38:41.413Z/my-service.zip to OSS bucket sls-accountid...',
-        'Uploaded serverless/my-service/dev/1500622721413-2017-07-21T07:38:41.413Z/my-service.zip to OSS bucket sls-accountid',
+        'Bucket sls-accountid-cn-shanghai already exists.',
+        'Uploading serverless/my-service/dev/1500622721413-2017-07-21T07:38:41.413Z/my-service.zip to OSS bucket sls-accountid-cn-shanghai...',
+        'Uploaded serverless/my-service/dev/1500622721413-2017-07-21T07:38:41.413Z/my-service.zip to OSS bucket sls-accountid-cn-shanghai',
         'Updating function my-service-dev-postTest...',
         'Updated function my-service-dev-postTest',
         'Updating function my-service-dev-getTest...',

diff --git a/deploy/aliyunDeployFunction.test.js b/deploy/aliyunDeployFunction.test.js
@@ -280,12 +280,12 @@ describe('AliyunDeployFunction', () => {
       const logs = [
         'Packaging function: postTest...',
         'Compiling function "postTest"...',
-        'Creating log project sls-accountid-logs...',
-        'Created log project sls-accountid-logs',
-        'Creating log store sls-accountid-logs/my-service-dev...',
-        'Created log store sls-accountid-logs/my-service-dev',
-        'Creating log index for sls-accountid-logs/my-service-dev...',
-        'Created log index for sls-accountid-logs/my-service-dev',
+        'Creating log project sls-accountid-cn-shanghai-logs...',
+        'Created log project sls-accountid-cn-shanghai-logs',
+        'Creating log store sls-accountid-cn-shanghai-logs/my-service-dev...',
+        'Created log store sls-accountid-cn-shanghai-logs/my-service-dev',
+        'Creating log index for sls-accountid-cn-shanghai-logs/my-service-dev...',
+        'Created log index for sls-accountid-cn-shanghai-logs/my-service-dev',
         'Creating RAM role sls-my-service-dev-exec-role...',
         'Created RAM role sls-my-service-dev-exec-role',
         'Creating RAM policy fc-my-service-dev-access...',
@@ -294,10 +294,10 @@ describe('AliyunDeployFunction', () => {
         'Attached RAM policy fc-my-service-dev-access to sls-my-service-dev-exec-role',
         'Creating service my-service-dev...',
         'Created service my-service-dev',
-        'Creating bucket sls-accountid...',
-        'Created bucket sls-accountid',
-        'Uploading serverless/my-service/dev/1500622721413-2017-07-21T07:38:41.413Z/postTest.zip to OSS bucket sls-accountid...',
-        'Uploaded serverless/my-service/dev/1500622721413-2017-07-21T07:38:41.413Z/postTest.zip to OSS bucket sls-accountid',
+        'Creating bucket sls-accountid-cn-shanghai...',
+        'Created bucket sls-accountid-cn-shanghai',
+        'Uploading serverless/my-service/dev/1500622721413-2017-07-21T07:38:41.413Z/postTest.zip to OSS bucket sls-accountid-cn-shanghai...',
+        'Uploaded serverless/my-service/dev/1500622721413-2017-07-21T07:38:41.413Z/postTest.zip to OSS bucket sls-accountid-cn-shanghai',
         'Creating function my-service-dev-postTest...',
         'Created function my-service-dev-postTest',
         'Creating RAM role sls-my-service-dev-invoke-role...',
@@ -371,16 +371,16 @@ describe('AliyunDeployFunction', () => {
       const logs = [
         'Packaging function: postTest...',
         'Compiling function "postTest"...',
-        'Log project sls-accountid-logs already exists.',
-        'Log store sls-accountid-logs/my-service-dev already exists.',
-        'Log store sls-accountid-logs/my-service-dev already has an index.',
+        'Log project sls-accountid-cn-shanghai-logs already exists.',
+        'Log store sls-accountid-cn-shanghai-logs/my-service-dev already exists.',
+        'Log store sls-accountid-cn-shanghai-logs/my-service-dev already has an index.',
         'RAM role sls-my-service-dev-exec-role exists.',
         'RAM policy fc-my-service-dev-access exists.',
         'RAM policy fc-my-service-dev-access has been attached to sls-my-service-dev-exec-role.',
         'Service my-service-dev already exists.',
-        'Bucket sls-accountid already exists.',
-        'Uploading serverless/my-service/dev/1500622721413-2017-07-21T07:38:41.413Z/postTest.zip to OSS bucket sls-accountid...',
-        'Uploaded serverless/my-service/dev/1500622721413-2017-07-21T07:38:41.413Z/postTest.zip to OSS bucket sls-accountid',
+        'Bucket sls-accountid-cn-shanghai already exists.',
+        'Uploading serverless/my-service/dev/1500622721413-2017-07-21T07:38:41.413Z/postTest.zip to OSS bucket sls-accountid-cn-shanghai...',
+        'Uploaded serverless/my-service/dev/1500622721413-2017-07-21T07:38:41.413Z/postTest.zip to OSS bucket sls-accountid-cn-shanghai',
         'Updating function my-service-dev-postTest...',
         'Updated function my-service-dev-postTest',
         'RAM role sls-my-service-dev-invoke-role exists.',

diff --git a/deploy/lib/setupService.test.js b/deploy/lib/setupService.test.js
@@ -145,30 +145,30 @@ describe('setupServices', () => {
 
       return aliyunDeploy.setupService().then(() => {
         expect(getLogProjectStub.calledOnce).toEqual(true);
-        expect(getLogProjectStub.calledWithExactly('sls-accountid-logs')).toEqual(true);
+        expect(getLogProjectStub.calledWithExactly('sls-accountid-cn-shanghai-logs')).toEqual(true);
 
         expect(createLogProjectStub.calledAfter(getLogProjectStub)).toEqual(true);
         expect(createLogProjectStub.calledOnce).toEqual(true);
         expect(createLogProjectStub.getCall(0).args)
-          .toEqual(['sls-accountid-logs', logProject]);
+          .toEqual(['sls-accountid-cn-shanghai-logs', logProject]);
 
         expect(getLogStoreStub.calledAfter(createLogProjectStub)).toEqual(true);
         expect(getLogStoreStub.calledOnce).toEqual(true);
-        expect(getLogStoreStub.calledWithExactly('sls-accountid-logs', 'my-service-dev')).toEqual(true);
+        expect(getLogStoreStub.calledWithExactly('sls-accountid-cn-shanghai-logs', 'my-service-dev')).toEqual(true);
 
         expect(createLogStoreStub.calledAfter(getLogStoreStub)).toEqual(true);
         expect(createLogStoreStub.calledOnce).toEqual(true);
         expect(createLogStoreStub.getCall(0).args)
-          .toEqual(['sls-accountid-logs', 'my-service-dev', logStore]);
+          .toEqual(['sls-accountid-cn-shanghai-logs', 'my-service-dev', logStore]);
 
         expect(getLogIndexStub.calledAfter(createLogStoreStub)).toEqual(true);
         expect(getLogIndexStub.calledOnce).toEqual(true);
-        expect(getLogIndexStub.calledWithExactly('sls-accountid-logs', 'my-service-dev')).toEqual(true);
+        expect(getLogIndexStub.calledWithExactly('sls-accountid-cn-shanghai-logs', 'my-service-dev')).toEqual(true);
 
         expect(createLogIndexStub.calledAfter(getLogIndexStub)).toEqual(true);
         expect(createLogIndexStub.calledOnce).toEqual(true);
         expect(createLogIndexStub.getCall(0).args)
-          .toEqual(['sls-accountid-logs', 'my-service-dev', logIndex]);
+          .toEqual(['sls-accountid-cn-shanghai-logs', 'my-service-dev', logIndex]);
 
         expect(setupRoleStub.calledAfter(createLogIndexStub)).toEqual(true);
         expect(setupRoleStub.calledOnce).toEqual(true);
@@ -186,27 +186,27 @@ describe('setupServices', () => {
 
         expect(getBucketStub.calledAfter(createServiceStub)).toEqual(true);
         expect(getBucketStub.calledOnce).toEqual(true);
-        expect(getBucketStub.calledWithExactly('sls-accountid')).toEqual(true);
+        expect(getBucketStub.calledWithExactly('sls-accountid-cn-shanghai')).toEqual(true);
 
         expect(createBucketStub.calledAfter(getBucketStub)).toEqual(true);
         expect(createBucketStub.calledOnce).toEqual(true);
-        expect(createBucketStub.calledWithExactly('sls-accountid')).toEqual(true);
+        expect(createBucketStub.calledWithExactly('sls-accountid-cn-shanghai')).toEqual(true);
 
         expect(resetOssClientStub.calledAfter(createBucketStub)).toEqual(true);
         expect(resetOssClientStub.calledOnce).toEqual(true);
-        expect(resetOssClientStub.calledWithExactly('sls-accountid')).toEqual(true);
+        expect(resetOssClientStub.calledWithExactly('sls-accountid-cn-shanghai')).toEqual(true);
 
         const logs = [
-          'Creating log project sls-accountid-logs...',
-          'Created log project sls-accountid-logs',
-          'Creating log store sls-accountid-logs/my-service-dev...',
-          'Created log store sls-accountid-logs/my-service-dev',
-          'Creating log index for sls-accountid-logs/my-service-dev...',
-          'Created log index for sls-accountid-logs/my-service-dev',
+          'Creating log project sls-accountid-cn-shanghai-logs...',
+          'Created log project sls-accountid-cn-shanghai-logs',
+          'Creating log store sls-accountid-cn-shanghai-logs/my-service-dev...',
+          'Created log store sls-accountid-cn-shanghai-logs/my-service-dev',
+          'Creating log index for sls-accountid-cn-shanghai-logs/my-service-dev...',
+          'Created log index for sls-accountid-cn-shanghai-logs/my-service-dev',
           'Creating service my-service-dev...',
           'Created service my-service-dev',
-          'Creating bucket sls-accountid...',
-          'Created bucket sls-accountid'
+          'Creating bucket sls-accountid-cn-shanghai...',
+          'Created bucket sls-accountid-cn-shanghai'
         ];
         expect(consoleLogStub.callCount).toEqual(logs.length);
         for (var i = 0; i < consoleLogStub.callCount; ++i) {
@@ -234,19 +234,19 @@ describe('setupServices', () => {
 
       return aliyunDeploy.setupService().then(() => {
         expect(getLogProjectStub.calledOnce).toEqual(true);
-        expect(getLogProjectStub.calledWithExactly('sls-accountid-logs')).toEqual(true);
+        expect(getLogProjectStub.calledWithExactly('sls-accountid-cn-shanghai-logs')).toEqual(true);
 
         expect(createLogProjectStub.called).toEqual(false);
 
         expect(getLogStoreStub.calledAfter(getLogProjectStub)).toEqual(true);
         expect(getLogStoreStub.calledOnce).toEqual(true);
-        expect(getLogStoreStub.calledWithExactly('sls-accountid-logs', 'my-service-dev')).toEqual(true);
+        expect(getLogStoreStub.calledWithExactly('sls-accountid-cn-shanghai-logs', 'my-service-dev')).toEqual(true);
 
         expect(createLogStoreStub.called).toEqual(false);
 
         expect(getLogIndexStub.calledAfter(getLogStoreStub)).toEqual(true);
         expect(getLogIndexStub.calledOnce).toEqual(true);
-        expect(getLogIndexStub.calledWithExactly('sls-accountid-logs', 'my-service-dev')).toEqual(true);
+        expect(getLogIndexStub.calledWithExactly('sls-accountid-cn-shanghai-logs', 'my-service-dev')).toEqual(true);
 
         expect(createLogIndexStub.called).toEqual(false);
 
@@ -261,20 +261,20 @@ describe('setupServices', () => {
 
         expect(getBucketStub.calledAfter(getServiceStub)).toEqual(true);
         expect(getBucketStub.calledOnce).toEqual(true);
-        expect(getBucketStub.calledWithExactly('sls-accountid')).toEqual(true);
+        expect(getBucketStub.calledWithExactly('sls-accountid-cn-shanghai')).toEqual(true);
 
         expect(createBucketStub.calledOnce).toEqual(false);
 
         expect(resetOssClientStub.calledAfter(getBucketStub)).toEqual(true);
         expect(resetOssClientStub.calledOnce).toEqual(true);
-        expect(resetOssClientStub.calledWithExactly('sls-accountid')).toEqual(true);
+        expect(resetOssClientStub.calledWithExactly('sls-accountid-cn-shanghai')).toEqual(true);
 
         const logs = [
-          'Log project sls-accountid-logs already exists.',
-          'Log store sls-accountid-logs/my-service-dev already exists.',
-          'Log store sls-accountid-logs/my-service-dev already has an index.',
+          'Log project sls-accountid-cn-shanghai-logs already exists.',
+          'Log store sls-accountid-cn-shanghai-logs/my-service-dev already exists.',
+          'Log store sls-accountid-cn-shanghai-logs/my-service-dev already has an index.',
           'Service my-service-dev already exists.',
-          'Bucket sls-accountid already exists.'
+          'Bucket sls-accountid-cn-shanghai already exists.'
         ];
         expect(consoleLogStub.callCount).toEqual(logs.length);
         for (var i = 0; i < consoleLogStub.callCount; ++i) {

diff --git a/deploy/lib/uploadArtifacts.test.js b/deploy/lib/uploadArtifacts.test.js
@@ -65,8 +65,8 @@ describe('UploadArtifacts', () => {
             '/projects/.serverless/my-service.zip'
           )).toEqual(true);
           const logs = [
-            'Uploading serverless/my-service/dev/1500622721413-2017-07-21T07:38:41.413Z/my-service.zip to OSS bucket sls-accountid...',
-            'Uploaded serverless/my-service/dev/1500622721413-2017-07-21T07:38:41.413Z/my-service.zip to OSS bucket sls-accountid'
+            'Uploading serverless/my-service/dev/1500622721413-2017-07-21T07:38:41.413Z/my-service.zip to OSS bucket sls-accountid-cn-shanghai...',
+            'Uploaded serverless/my-service/dev/1500622721413-2017-07-21T07:38:41.413Z/my-service.zip to OSS bucket sls-accountid-cn-shanghai'
           ];
           expect(consoleLogStub.callCount).toEqual(logs.length);
           for (var i = 0; i < consoleLogStub.callCount; ++i) {

diff --git a/logs/lib/retrieveLogs.test.js b/logs/lib/retrieveLogs.test.js
@@ -70,7 +70,7 @@ describe('DisplayServiceLogs', () => {
       expect(consoleLogStub.getCall(0).args[0].split('\n')).toEqual(expectedOutput);
       expect(getLogsIfAvailableStub.calledOnce).toEqual(true);
       expect(getLogsIfAvailableStub.getCall(0).args).toEqual([
-        'sls-accountid-logs',
+        'sls-accountid-cn-shanghai-logs',
         'my-service-dev',
         1,
         { functionName: 'my-service-dev-postTest' },
@@ -137,7 +137,7 @@ describe('DisplayServiceLogs', () => {
       await aliyunLogs.retrieveLogs();
       expect(consoleLogStub.getCall(0).args[0].split('\n')).toEqual(expectedOutput);
       expect(getLogsIfAvailableStub.getCall(0).args).toEqual([
-        'sls-accountid-logs',
+        'sls-accountid-cn-shanghai-logs',
         'my-service-dev',
         1,
         { functionName: 'my-service-dev-postTest' },

diff --git a/package/lib/compileFunctions.test.js b/package/lib/compileFunctions.test.js
@@ -77,7 +77,7 @@ describe('CompileFunctions', () => {
             'timeout': 30,
             'runtime': 'nodejs6',
             'code': {
-              'ossBucketName': 'sls-accountid',
+              'ossBucketName': 'sls-accountid-cn-shanghai',
               'ossObjectName': 'serverless/my-service/dev/1500622721413-2017-07-21T07:38:41.413Z/my-service.zip'
             }
           }
@@ -116,7 +116,7 @@ describe('CompileFunctions', () => {
             'timeout': 30,
             'runtime': 'nodejs6',
             'code': {
-              'ossBucketName': 'sls-accountid',
+              'ossBucketName': 'sls-accountid-cn-shanghai',
               'ossObjectName': 'serverless/my-service/dev/1500622721413-2017-07-21T07:38:41.413Z/my-service.zip'
             }
           }
@@ -155,7 +155,7 @@ describe('CompileFunctions', () => {
             'timeout': 120,
             'runtime': 'nodejs6',
             'code': {
-              'ossBucketName': 'sls-accountid',
+              'ossBucketName': 'sls-accountid-cn-shanghai',
               'ossObjectName': 'serverless/my-service/dev/1500622721413-2017-07-21T07:38:41.413Z/my-service.zip'
             }
           }
@@ -194,7 +194,7 @@ describe('CompileFunctions', () => {
             'timeout': 120,
             'runtime': 'nodejs6',
             'code': {
-              'ossBucketName': 'sls-accountid',
+              'ossBucketName': 'sls-accountid-cn-shanghai',
               'ossObjectName': 'serverless/my-service/dev/1500622721413-2017-07-21T07:38:41.413Z/my-service.zip'
             }
           }