From 5e35a6703e22714e9f2f467815567118ac84a2a7 Mon Sep 17 00:00:00 2001 From: Eric Promislow Date: Fri, 17 Feb 2023 15:05:35 -0800 Subject: [PATCH 1/2] Switching container-engines is better tested in bats. Signed-off-by: Eric Promislow --- e2e/rdctl.e2e.spec.ts | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/e2e/rdctl.e2e.spec.ts b/e2e/rdctl.e2e.spec.ts index 77a76a10269..3bd42fc65ac 100644 --- a/e2e/rdctl.e2e.spec.ts +++ b/e2e/rdctl.e2e.spec.ts @@ -1415,37 +1415,6 @@ test.describe('Command server', () => { } }); }); - test('should verify nerdctl can talk to containerd', async() => { - const { stdout } = await rdctl(['list-settings']); - const settings: Settings = JSON.parse(stdout); - - if (settings.containerEngine.name !== ContainerEngine.CONTAINERD) { - const payloadObject: RecursivePartial = { - version: CURRENT_SETTINGS_VERSION, - containerEngine: { name: ContainerEngine.CONTAINERD }, - }; - const navPage = new NavPage(page); - - await tool('rdctl', 'api', '/v1/settings', '--method', 'PUT', '--body', JSON.stringify(payloadObject)); - await waitForRestartVM(page.locator('.progress')); - await navPage.progressBecomesReady(); - } - const output = await retry(() => tool('nerdctl', 'info')); - - expect(output).toMatch(/Server Version:\s+v?[.0-9]+/); - }); - test('should verify docker can talk to dockerd', async() => { - const navPage = new NavPage(page); - - await tool('rdctl', 'set', '--container-engine', 'moby'); - await expect(navPage.progressBar).not.toBeHidden(); - await waitForRestartVM(navPage.progressBar); - await navPage.progressBecomesReady(); - await expect(navPage.progressBar).toBeHidden(); - const output = await retry(() => tool('docker', 'info'), { delay: 500, tries: 60 }); - - expect(output).toMatch(/Server Version:\s+v?[.0-9]+/); - }); }); // Where is the test that pushes a supported update, you may be wondering? From 15cff4db33a202f345455dad023f5da60d7655dc Mon Sep 17 00:00:00 2001 From: Eric Promislow Date: Tue, 12 Sep 2023 15:31:28 -0700 Subject: [PATCH 2/2] Remove unused import. Signed-off-by: Eric Promislow --- e2e/rdctl.e2e.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/rdctl.e2e.spec.ts b/e2e/rdctl.e2e.spec.ts index 3bd42fc65ac..4369fd55bf7 100644 --- a/e2e/rdctl.e2e.spec.ts +++ b/e2e/rdctl.e2e.spec.ts @@ -29,7 +29,7 @@ import yaml from 'yaml'; import { NavPage } from './pages/nav-page'; import { - createDefaultSettings, getAlternateSetting, kubectl, retry, startRancherDesktop, teardown, tool, waitForRestartVM, + createDefaultSettings, getAlternateSetting, kubectl, retry, startRancherDesktop, teardown, waitForRestartVM, } from './utils/TestUtils'; import {