Merge pull request #1239 from zowe/next-fix-ci-tests

[next] Fix socket connection error on macOS in daemon mode
zowe · Dec 20, 2021 · 1778fc7 · 1778fc7
2 parents 7ca67a8 + 352097d
commit 1778fc7
Show file tree

Hide file tree

Showing 111 changed files with 309 additions and 994 deletions.
diff --git a/.github/workflows/zowe-cli.yml b/.github/workflows/zowe-cli.yml
@@ -105,6 +105,13 @@ jobs:
       if: ${{ always() && steps.build.outcome == 'success' && matrix.os == 'ubuntu-latest' }}
       uses: t1m0thyj/unlock-keyring@master
 
+    - name: Start Daemon
+      id: start-daemon
+      if: ${{ always() && steps.build.outcome == 'success' && matrix.os == 'windows-latest' && (github.event.inputs.test-type == 'binary' || github.event_name == 'push') }}
+      run: ./__tests__/__resources__/daemon_instances/zowe
+      env:
+        PATH: ${{ github.workspace }}\__tests__\__resources__\application_instances;${{ env.PATH }}
+
     - name: Integration Tests
       id: integration
       if: ${{ always() && steps.build.outcome == 'success' }}

diff --git a/__tests__/__packages__/cli-test-utils/CHANGELOG.md b/__tests__/__packages__/cli-test-utils/CHANGELOG.md
@@ -2,7 +2,12 @@
 
 All notable changes to the Zowe CLI test utils package will be documented in this file.
 
+## Recent Changes
+
+- BugFix: Removed usage of internal Imperative method to delete team config profiles.
+
 ## `7.0.0-next.202110211759`
+
 - Add option to create team configuration or old style profiles.
 
 ## `7.0.0-next.202108302038`

diff --git a/__tests__/__packages__/cli-test-utils/package.json b/__tests__/__packages__/cli-test-utils/package.json
@@ -43,7 +43,7 @@
   },
   "devDependencies": {
     "@types/node": "^14.14.37",
-    "@zowe/imperative": "5.0.0-next.202112132158",
+    "@zowe/imperative": "5.0.0-next.202112201553",
     "eslint": "^7.32.0",
     "rimraf": "^3.0.2",
     "typescript": "^4.2.3"

diff --git a/__tests__/__packages__/cli-test-utils/src/environment/TempTestProfiles.ts b/__tests__/__packages__/cli-test-utils/src/environment/TempTestProfiles.ts
@@ -214,7 +214,7 @@ export class TempTestProfiles {
 
         // Remove profile from config JSON
         config.delete(config.api.profiles.expandPath(profileName));
-        if (config.layerActive().properties.defaults[profileType] === profileName) {
+        if (config.api.layers.get().properties.defaults[profileType] === profileName) {
             config.delete(`defaults.${profileType}`);
         }
         await config.api.layers.write();

diff --git a/__tests__/__resources__/application_instances/bright b/__tests__/__resources__/application_instances/bright
diff --git a/__tests__/__resources__/application_instances/zowe.cmd b/__tests__/__resources__/application_instances/zowe.cmd
@@ -0,0 +1 @@
+node "%~dp0\..\..\..\packages\cli\lib\main.js" %*
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		node "%~dp0\..\..\..\packages\cli\lib\main.js" %*