A bunch of test fixes for linux and macOS. Also added linux testing to the persistent tests. Switched the linux tests over to tart instead of docker.

Author: kevinwang5658

.cirrus.yml

@@ -24,15 +24,16 @@ integration_test_dev_macos_task:
     - npm run test:integration -- --disable-console-intercept $DEBUG --no-file-parallelism
 
 integration_test_dev_linux_task:
-  arm_container:
-    image: kevinwang5658/codify-test-linux:latest
+# trick cirrus CI to use tart here to run a linux instance
+  macos_instance:
+    image: codify-test-vm-linux
 #  node_modules_cache:
 #    folder: node_modules
 #    fingerprint_script: cat package-lock.json
 #    populate_script: npm ci
   test_script:
-    - adduser --disabled-password --gecos '' newuser
-    - su - newuser
+#    - adduser --disabled-password --gecos '' newuser
+#    - su - newuser
     - npm ci
     - npm run test:integration -- --disable-console-intercept $DEBUG --no-file-parallelism
 

.run/test_integration_dev.run.xml

@@ -7,6 +7,9 @@
     </scripts>
     <node-interpreter value="project" />
     <envs />
+    <EXTENSION ID="com.intellij.javascript.debugger.execution.StartBrowserRunConfigurationExtension">
+      <browser with-js-debugger="true" />
+    </EXTENSION>
     <method v="2" />
   </configuration>
 </component>

package-lock.json

@@ -55,7 +55,7 @@
     "@types/node": "^18",
     "@types/plist": "^3.0.5",
     "@types/semver": "^7.5.4",
-    "codify-plugin-test": "0.0.53-beta15",
+    "codify-plugin-test": "0.0.53-beta17",
     "commander": "^12.1.0",
     "eslint": "^8.51.0",
     "eslint-config-oclif": "^5",

package.json

@@ -1,5 +1,5 @@
 import { Shell, SpawnStatus, VerbosityLevel } from 'codify-plugin-lib';
-import { testSpawn } from 'codify-plugin-test';
+import { testSpawn, TestUtils } from 'codify-plugin-test';
 import { Command } from 'commander';
 import { spawn } from 'node:child_process';
 import * as inspector from 'node:inspector';
@@ -27,7 +27,7 @@ async function main(argument: string, args: { operatingSystem: string; persisten
   }
 
   if (args.launchPersistent) {
-    await launchPersistentVm();
+    await launchPersistentVm(args.operatingSystem);
     return process.exit(0);
   }
 
@@ -69,7 +69,9 @@ async function launchSingleTest(test: string, debug: boolean, operatingSystem: s
 }
 
 async function launchPersistentTest(test: string, debug: boolean, operatingSystem: string) {
-  if (operatingSystem === 'darwin') {
+  const shell = operatingSystem === 'darwin' ? 'zsh' : 'bash';
+
+  // if (operatingSystem === 'darwin') {
     const { data: vmList } = await codifySpawn('tart list --format json');
     console.log(vmList);
 
@@ -80,7 +82,8 @@ async function launchPersistentTest(test: string, debug: boolean, operatingSyste
     }
 
     const vmName = runningVm.Name;
-    const dir = '/Users/admin/codify-homebrew-plugin';
+    const dir = '~/codify-homebrew-plugin';
+    // const dir = '/Volumes/My\\ Shared\\ Files/plugin'
 
     const debugFlag = debug ? ' -e DEBUG="--inspect-brk=9229"' : ''
 
@@ -93,15 +96,18 @@ async function launchPersistentTest(test: string, debug: boolean, operatingSyste
 
     console.log('Done refreshing files on VM. Starting tests...');
     VerbosityLevel.set(3);
-    await codifySpawn(`tart exec -i ${vmName} zsh -i -c "cd ${dir} && FORCE_COLOR=true npm run test -- ${test} --disable-console-intercept ${debugFlag} --no-file-parallelism"`);
-  }
+    await codifySpawn(`tart exec ${vmName} ${shell} -c "cd ${dir} && FORCE_COLOR=true npm run test -- ${test} --disable-console-intercept ${debugFlag} --no-file-parallelism"`, { throws: false });
+  // }
 }
 
-async function launchPersistentVm() {
+async function launchPersistentVm(operatingSystem: string) {
   const newVmName = `codify-test-vm-${Date.now()}`;
+  const shell = operatingSystem === 'darwin' ? 'zsh' : 'bash';
+
   console.log(`Cloning new VM... ${newVmName}`);
 
-  await testSpawn(`tart clone codify-test-vm ${newVmName}`);
+  const image = (operatingSystem === 'darwin') ? 'codify-test-vm' : 'codify-test-vm-linux';
+  await testSpawn(`tart clone ${image} ${newVmName}`);
   testSpawn(`tart run ${newVmName}`)
     .then(cleanupVm)
 
@@ -115,7 +121,7 @@ async function launchPersistentVm() {
 
   const { data: ipAddr } = await testSpawn(`tart ip ${newVmName}`);
   await testSpawn(`sshpass -p "admin" rsync -avz -e 'ssh -o PubkeyAuthentication=no -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null' --exclude 'node_modules' --exclude '.git' --exclude 'dist' --exclude '.fleet' ${process.cwd()} admin@${ipAddr}:~`);
-  await testSpawn(`tart exec ${newVmName} zsh -i -c "cd ~/codify-homebrew-plugin && npm ci"`);
+  await testSpawn(`tart exec ${newVmName} ${shell} -i -c "cd ~/codify-homebrew-plugin && npm ci"`);
   console.log('Finished installing dependencies. Start tests in a new terminal window.');
 
   await sleep(1_000_000_000);

scripts/run-tests.ts

@@ -141,20 +141,22 @@ export class AsdfInstallResource extends Resource<AsdfInstallConfig> {
 
       // Uninstall plugin versions listed in .tool-versions
       for (const { plugin, version } of desiredTools) {
-        await $.spawn(`asdf uninstall ${plugin} ${version}`, { interactive: true });
+        await $.spawn(`asdf uninstall ${plugin} ${version === 'latest'? `$(asdf latest ${plugin})` : version}`, { interactive: true });
       }
 
       return;
     }
 
     // Other path is uninstalled through the stateful parameter
-    await $.spawn(`asdf uninstall ${plan.currentConfig?.plugin} ${plan.currentConfig.versions?.join(' ')}`, { interactive: true });
+    await $.spawn(`asdf uninstall ${plan.currentConfig?.plugin} ${plan.currentConfig.versions
+      ?.map(version => version === 'latest'? `$(asdf latest ${plan.currentConfig?.plugin})` : version)
+      .join(' ')}`, { interactive: true });
   }
 
   private async getToolVersions(directory: string): Promise<Array<{ plugin: string; version: string }>> {
     const toolsVersions = (await fs.readFile(path.join(directory, '.tool-versions'))).toString();
 
-    return toolsVersions.split(/\n/)
+    return toolsVersions.split(/\n/g)
       .filter(Boolean)
       .map((l) => {
         const matches = l.match(TOOL_VERSIONS_REGEX);
@@ -164,6 +166,6 @@ export class AsdfInstallResource extends Resource<AsdfInstallConfig> {
 
         return matches.slice(1, 3)
       })
-      .map(([plugin, version, file]) => ({ plugin, version, file }));
+      .map(([plugin, version]) => ({ plugin, version }));
   }
 }

src/resources/asdf/asdf-install.ts

@@ -46,7 +46,6 @@ export class AsdfResource extends Resource<AsdfConfig> {
       }
 
       await $.spawn('brew install asdf', { interactive: true, env: { HOMEBREW_NO_AUTO_UPDATE: 1 } });
-
     }
 
     if (Utils.isLinux()) {
@@ -65,20 +64,12 @@ export class AsdfResource extends Resource<AsdfConfig> {
       await fs.chmod(path.join(asdfDir, 'asdf'), 0o755);
 
       await fs.rm(tmpDir, { recursive: true, force: true });
+
+      await FileUtils.addPathToShellRc(path.join(os.homedir(), '.local', 'bin'), true);
     }
 
-    await FileUtils.addPathToShellRc(path.join(os.homedir(), '.local', 'bin'), true);
     // eslint-disable-next-line no-template-curly-in-string
     await FileUtils.addToShellRc('export PATH="${ASDF_DATA_DIR:-$HOME/.asdf}/shims:$PATH"')
-
-    // TODO: Move OsUtils to a separate name space? All things that have to do with the os.
-    // TODO: Add a way to run multiple commands in sequence
-    // TODO: Change all plugins to install to ~/.local/bin
-
-    await $.spawnSafe('which asdf', { interactive: true });
-    await $.spawnSafe('ls ~/.local/bin');
-    console.log((await $.spawnSafe('echo $PATH', { interactive: true })).data);
-
   }
 
   async destroy(): Promise<void> {

src/resources/asdf/asdf.ts

@@ -93,7 +93,7 @@ export class DockerResource extends Resource<DockerConfig> {
 
   async destroy(plan: DestroyPlan<DockerConfig>): Promise<void> {
     const $ = getPty();
-    await $.spawnSafe('/Applications/Docker.app/Contents/MacOS/uninstall')
+    await $.spawnSafe('/Applications/Docker.app/Contents/MacOS/uninstall', { interactive: true, requiresRoot: true })
     await fs.rm(path.join(os.homedir(), 'Library/Group\\ Containers/group.com.docker'), { recursive: true, force: true });
     await fs.rm(path.join(os.homedir(), 'Library/Containers/com.docker.docker/Data'), { recursive: true, force: true });
     await fs.rm(path.join(os.homedir(), '.docker'), { recursive: true, force: true });

src/resources/docker/docker.ts

@@ -45,7 +45,7 @@ export class XcodeToolsResource extends Resource<XCodeToolsConfig> {
       const { data } = await $.spawn('softwareupdate -l', { interactive: true });
 
       // This regex will only match the label because it doesn't match commas.
-      const labelRegex = /(Command Line Tools[^,]*\d+\.\d+)/g
+      const labelRegex = /(Command Line Tools[^,]*\d+\.\d+?)(?=\s+)/g
       const xcodeToolsVersion = data.match(labelRegex);
 
       if (!xcodeToolsVersion || xcodeToolsVersion.length === 0 || !xcodeToolsVersion[0]) {
@@ -67,6 +67,8 @@ export class XcodeToolsResource extends Resource<XCodeToolsConfig> {
           return compare(coerce(currentVer)!, coerce(prevVer)!) > 0 ? current : prev;
         }) : xcodeToolsVersion.at(0)!;
 
+      console.log('Latest version', latestVersion);
+
       await $.spawn(`softwareupdate -i "${latestVersion}" --verbose`, { requiresRoot: true, interactive: true });
 
     } finally {

src/resources/xcode-tools/xcode-tools.ts

@@ -2,9 +2,9 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import { PluginTester, testSpawn } from 'codify-plugin-test';
 import * as path from 'node:path';
 import { TestUtils } from '../test-utils.js';
-import { SpawnStatus } from 'codify-plugin-lib';
+import { SpawnStatus, Utils } from 'codify-plugin-lib';
 
-describe('Apt resource integration tests', () => {
+describe('Apt resource integration tests', { skip: !Utils.isLinux() }, () => {
   const pluginPath = path.resolve('./src/index.ts');
 
   it('Can install and uninstall apt packages', { timeout: 300000 }, async () => {