@@ -78,6 +78,8 @@ const PLUGIN_UPDATE_PROBE_PATH = "scripts/e2e/lib/plugin-update/probe.mjs";
|
78 | 78 | const PLUGIN_LIFECYCLE_MATRIX_DOCKER_E2E_PATH = "scripts/e2e/plugin-lifecycle-matrix-docker.sh"; |
79 | 79 | const DOCTOR_SWITCH_DOCKER_E2E_PATH = "scripts/e2e/doctor-install-switch-docker.sh"; |
80 | 80 | const DOCTOR_SWITCH_SCENARIO_PATH = "scripts/e2e/lib/doctor-install-switch/scenario.sh"; |
| 81 | +const DOCTOR_SWITCH_LOGINCTL_SHIM_PATH = "scripts/e2e/lib/doctor-install-switch/shims/loginctl"; |
| 82 | +const DOCTOR_SWITCH_SYSTEMCTL_SHIM_PATH = "scripts/e2e/lib/doctor-install-switch/shims/systemctl"; |
81 | 83 | const PACKAGE_COMPAT_PATH = "scripts/e2e/lib/package-compat.mjs"; |
82 | 84 | const UPGRADE_SURVIVOR_DOCKER_E2E_PATH = "scripts/e2e/upgrade-survivor-docker.sh"; |
83 | 85 | const UPDATE_CHANNEL_SWITCH_DOCKER_E2E_PATH = "scripts/e2e/update-channel-switch-docker.sh"; |
@@ -3863,6 +3865,8 @@ output="$(cat "$sampler_log")"
|
3863 | 3865 | const pluginUpdateProbe = readFileSync(PLUGIN_UPDATE_PROBE_PATH, "utf8"); |
3864 | 3866 | const updateChannelAssertions = readFileSync(UPDATE_CHANNEL_SWITCH_ASSERTIONS_PATH, "utf8"); |
3865 | 3867 | const packageCompat = readFileSync(PACKAGE_COMPAT_PATH, "utf8"); |
| 3868 | +const doctorLoginctlShim = readFileSync(DOCTOR_SWITCH_LOGINCTL_SHIM_PATH, "utf8"); |
| 3869 | +const doctorSystemctlShim = readFileSync(DOCTOR_SWITCH_SYSTEMCTL_SHIM_PATH, "utf8"); |
3866 | 3870 | const scripts = [ |
3867 | 3871 | doctorScenario, |
3868 | 3872 | updateChannel, |
@@ -3878,6 +3882,11 @@ output="$(cat "$sampler_log")"
|
3878 | 3882 | expect(readFileSync(DOCTOR_SWITCH_DOCKER_E2E_PATH, "utf8")).toContain( |
3879 | 3883 | "scripts/e2e/lib/doctor-install-switch/scenario.sh", |
3880 | 3884 | ); |
| 3885 | +expect(doctorScenario).toContain("cp scripts/e2e/lib/doctor-install-switch/shims/systemctl"); |
| 3886 | +expect(doctorScenario).toContain("cp scripts/e2e/lib/doctor-install-switch/shims/loginctl"); |
| 3887 | +expect(doctorLoginctlShim).toContain("Linger=yes"); |
| 3888 | +expect(doctorSystemctlShim).toContain("ActiveState=inactive"); |
| 3889 | +expect(doctorSystemctlShim).toContain('unit_path="$HOME/.config/systemd/user/${unit}"'); |
3881 | 3890 | expect(readFileSync(PLUGINS_DOCKER_E2E_PATH, "utf8")).toContain( |
3882 | 3891 | "scripts/e2e/lib/plugins/sweep.sh", |
3883 | 3892 | ); |
|
