Skip to content

Commit 4b743a2

Browse files
committed
Update to match new test method
Signed-off-by: luke <luke.parkin@arm.com>
1 parent 959ee9e commit 4b743a2

1 file changed

Lines changed: 11 additions & 6 deletions

File tree

e2e/runtime_test.go

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -219,10 +219,13 @@ func TestRuntimeProxyKeepsHostNamespaceWhenNotRoot(t *testing.T) {
219219
runtimeBin, err := repo.BuildRuntimeBin(t.TempDir(), rootDir, limavm.BinBuildEnv)
220220
require.NoError(t, err)
221221

222-
vm, err := limavm.NewWithPodman(rootDir, "../testdata", runtimeBin)
222+
vm, err := limavm.NewDebian(rootDir)
223223
require.NoError(t, err)
224224
t.Cleanup(vm.Cleanup)
225225

226+
installedRuntime, err := vm.InstallBin(runtimeBin)
227+
require.NoError(t, err)
228+
226229
sim := remoteproc.NewSimulator(rootDir).WithName(remoteprocName)
227230
if err := sim.Start(); err != nil {
228231
t.Fatalf("failed to run simulator: %s", err)
@@ -237,18 +240,17 @@ func TestRuntimeProxyKeepsHostNamespaceWhenNotRoot(t *testing.T) {
237240
specs.LinuxNamespace{Type: specs.MountNamespace},
238241
))
239242

240-
_, stderr, err := vm.RunCommand(
241-
"remoteproc-runtime",
243+
_, stderr, err := installedRuntime.Run(
242244
"create", "--bundle", bundlePath,
243245
containerName,
244246
)
245247
require.NoError(t, err, "stderr: %s", stderr)
246248
t.Cleanup(func() {
247-
_, _, _ = vm.RunCommand("remoteproc-runtime", "delete", containerName)
249+
_, _, _ = installedRuntime.Run("delete", containerName)
248250
})
249251

250252
pid, err := checkContainerRunning(func() (specs.State, error) {
251-
stdout, stderr, err := vm.RunCommand("remoteproc-runtime", "state", containerName)
253+
stdout, stderr, err := installedRuntime.Run("state", containerName)
252254
if err != nil {
253255
return specs.State{}, fmt.Errorf("stderr: %s: %w", stderr, err)
254256
}
@@ -276,10 +278,13 @@ func TestRuntimeProxyKeepsHostNamespaceWhenRootInLimaVM(t *testing.T) {
276278
runtimeBin, err := repo.BuildRuntimeBin(t.TempDir(), rootDir, limavm.BinBuildEnv)
277279
require.NoError(t, err)
278280

279-
vm, err := limavm.NewWithPodman(rootDir, "../testdata", runtimeBin)
281+
vm, err := limavm.NewDebian(rootDir)
280282
require.NoError(t, err)
281283
t.Cleanup(vm.Cleanup)
282284

285+
installedRuntime, err := vm.InstallBin(runtimeBin)
286+
require.NoError(t, err)
287+
283288
sim := remoteproc.NewSimulator(rootDir).WithName(remoteprocName)
284289
if err := sim.Start(); err != nil {
285290
t.Fatalf("failed to run simulator: %s", err)

0 commit comments

Comments
 (0)