test against the system’s opinion of its host (#11)

Refs denoland/node_shims#152

Author: mxcl

.github/workflows/ci.yml

@@ -18,8 +18,8 @@ jobs:
     strategy:
       matrix:
         os:
-          - ubuntu-latest
           - macos-latest
+          - ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: teaxyz/setup@v0
@@ -31,7 +31,7 @@ jobs:
         with:
           path-to-lcov: cov_profile.lcov
           parallel: true
-          flag-name: ${{ matrix.os }}
+          flag-name: ${{ matrix.platform.id }}
 
   upload-coverage:
     needs: tests
@@ -42,7 +42,15 @@ jobs:
         parallel-finished: true
 
   dnt:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - [self-hosted, macOS, X64]
+          - [self-hosted, linux, X64]
+          - [self-hosted, macOS, ARM64]
+          - [self-hosted, linux, ARM64]
     steps:
       - uses: actions/checkout@v3
       - uses: teaxyz/setup@v0

src/hooks/useCellar.test.ts

@@ -1,5 +1,5 @@
 import SemVer, * as semver from "../utils/semver.ts"
-import { useTestConfig } from "./useConfig.test.ts"
+import { useTestConfig } from "./useTestConfig.ts"
 import install from "../prefab/install.ts"
 import useCellar from "./useCellar.ts"
 

src/hooks/useConfig.test.ts

@@ -1,5 +1,7 @@
 import { assert, assertEquals, assertFalse, assertThrows } from "deno/testing/asserts.ts"
-import useConfig, { _internals } from "./useConfig.ts"
+import { _internals, ConfigDefault } from "./useConfig.ts"
+import { useTestConfig } from "./useTestConfig.ts"
+import Path from "../utils/Path.ts"
 
 Deno.test("useConfig", () => {
   let config = useTestConfig()
@@ -30,19 +32,3 @@ Deno.test("useConfig empty TEA_PANTRY_PATH is ignored", () => {
   assertEquals(ConfigDefault({ TEA_PANTRY_PATH: "" }).pantries, [])
   assertEquals(ConfigDefault({ TEA_PANTRY_PATH: "  : :" }).pantries, [])
 })
-
-import { ConfigDefault } from "./useConfig.ts"
-import Path from "../utils/Path.ts"
-
-export function useTestConfig(env?: Record<string, string>) {
-  env ??= {}
-
-  /// always prefer a new prefix
-  env.TEA_PREFIX ??= Path.mktemp().string
-
-  /// reuse these unless the test overrides them to speed up testing
-  env.TEA_CACHE_DIR ??= Path.home().join(".tea/tea.xyz/var/www").string
-  env.TEA_PANTRY_PATH ??= Path.home().join(".tea/tea.xyz/var/pantry").string
-
-  return useConfig(ConfigDefault(env))
-}

src/hooks/useDownload.test.ts

@@ -1,4 +1,4 @@
-import { useTestConfig } from "./useConfig.test.ts"
+import { useTestConfig } from "./useTestConfig.ts"
 import { assert } from "deno/testing/asserts.ts"
 import useDownload from "./useDownload.ts"
 

src/hooks/useMoustaches.test.ts

@@ -1,5 +1,5 @@
 import { assertEquals } from "deno/testing/asserts.ts"
-import { useTestConfig } from "./useConfig.test.ts"
+import { useTestConfig } from "./useTestConfig.ts"
 import useMoustaches from "./useMoustaches.ts"
 import { Package } from "../types.ts"
 import SemVer from "../utils/semver.ts"

src/hooks/usePantry.test.ts

@@ -1,7 +1,7 @@
 import { assert, assertEquals } from "deno/testing/asserts.ts"
-import usePantry from './usePantry.ts'
 import { _internals } from "../utils/host.ts"
 import { stub } from "deno/testing/mock.ts"
+import usePantry from "./usePantry.ts"
 
 Deno.test("provides()", async () => {
   const exenames = await usePantry().project("python.org").provides()

src/hooks/useShellEnv.test.ts

@@ -1,22 +1,28 @@
+import { useTestConfig } from "./useTestConfig.ts"
+import { execSync } from "node:child_process"
 import * as semver from "../utils/semver.ts"
 import useShellEnv from "./useShellEnv.ts"
 import hydrate from "../prefab/hydrate.ts"
 import resolve from "../prefab/resolve.ts"
-import { useTestConfig } from "./useConfig.test.ts"
 import install from "../prefab/install.ts"
 
 Deno.test("useShellEnv", async () => {
-
+  const { map, flatten } = useShellEnv()
   useTestConfig()
 
   const rv1 = await hydrate({ project: "python.org", constraint: new semver.Range("^3.11") })
-  const rv2 = await resolve(rv1.wet)
+  const rv2 = await resolve(rv1.pkgs)
 
   const installations = rv2.installed
   for (const pkg of rv2.pending) {
     const installed = await install(pkg)
     installations.push(installed)
   }
 
-  await useShellEnv().map({ installations })
+  const env = await map({ installations })
+
+  // test that we installed the correct platform binaries
+  // ※ https://github.com/teaxyz/lib/pull/11/checks
+  execSync("python --version", { env: flatten(env) })
+  //NOTE ^^ using execSync rather than Deno.run as the shim doesn’t behave consistently between deno and node
 })

src/hooks/useSync.test.ts

@@ -1,4 +1,4 @@
-import { useTestConfig } from "./useConfig.test.ts"
+import { useTestConfig } from "./useTestConfig.ts"
 import { assert } from "deno/testing/asserts.ts"
 import usePantry from "./usePantry.ts"
 import useSync from "./useSync.ts"

src/hooks/useTestConfig.ts

@@ -0,0 +1,15 @@
+import useConfig, { ConfigDefault } from "./useConfig.ts"
+import Path from "../utils/Path.ts"
+
+export function useTestConfig(env?: Record<string, string>) {
+  env ??= {}
+
+  /// always prefer a new prefix
+  env.TEA_PREFIX ??= Path.mktemp().string
+
+  /// reuse these unless the test overrides them to speed up testing
+  env.TEA_CACHE_DIR ??= Path.home().join(".tea/tea.xyz/var/www").string
+  env.TEA_PANTRY_PATH ??= Path.home().join(".tea/tea.xyz/var/pantry").string
+
+  return useConfig(ConfigDefault(env))
+}

src/prefab/install.test.ts

@@ -1,4 +1,4 @@
-import { useTestConfig as useTestConfigBase } from "../hooks/useConfig.test.ts"
+import { useTestConfig as useTestConfigBase } from "../hooks/useTestConfig.ts"
 import { assert, assertEquals, assertFalse } from "deno/testing/asserts.ts"
 import install, { ConsoleLogger, Logger } from "./install.ts"
 import { stub } from "deno/testing/mock.ts"