Skip to content

Commit 3167b72

Browse files
benhillisBen Hillis
andauthored
test: enable virtiofs tests and enable WSLG during testing (#14387)
* test: enable virtiofs tests and enable WSLG during testing * test fix --------- Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>
1 parent 218b71b commit 3167b72

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

test/windows/Common.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1450,8 +1450,6 @@ std::wstring LxssGenerateTestConfig(TestConfigDefaults Default)
14501450
return value;
14511451
};
14521452

1453-
// TODO: Reset guiApplications to true by default once the virtio hang is solved.
1454-
14551453
std::wstring newConfig =
14561454
L"[wsl2]\n"
14571455
L"crashDumpFolder=" +
@@ -1464,7 +1462,7 @@ std::wstring LxssGenerateTestConfig(TestConfigDefaults Default)
14641462
EscapePath(kernelLogs) +
14651463
L"\n"
14661464
L"telemetry=false\n" +
1467-
boolOptionToString(L"safeMode", Default.safeMode, false) + boolOptionToString(L"guiApplications", Default.guiApplications, false) +
1465+
boolOptionToString(L"safeMode", Default.safeMode, false) + boolOptionToString(L"guiApplications", Default.guiApplications, true) +
14681466
L"earlyBootLogging=false\n" + networkingModeToString(Default.networkingMode) + drvFsModeToString(Default.drvFsMode);
14691467

14701468
if (Default.kernel.has_value())

test/windows/DrvFsTests.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1341,12 +1341,10 @@ class WSL1 : public DrvFsTests
13411341

13421342
WSL2_DRVFS_TEST_CLASS(Plan9);
13431343

1344+
WSL2_DRVFS_TEST_CLASS(VirtioFs);
1345+
13441346
// Disabled while an issue with the 6.1 Linux kernel causing disk corruption is investigated.
13451347
// TODO: Enable again once the issue is resolved
13461348
// WSL2_DRVFS_TEST_CLASS(Virtio9p);
13471349

1348-
// Disabled because it causes too much noise.
1349-
// TODO: Enable again once virtiofs is stable
1350-
// WSL2_DRVFS_TEST_CLASS(VirtioFs);
1351-
13521350
} // namespace DrvFsTests

test/windows/UnitTests.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@ class UnitTests
271271
};
272272

273273
// Validate user sessions state with gui apps disabled.
274+
WslConfigChange config(LxssGenerateTestConfig({.guiApplications = false}));
274275
{
275276
validateUserSession();
276277

@@ -284,7 +285,7 @@ class UnitTests
284285

285286
// Validate user sessions state with gui apps enabled.
286287
{
287-
WslConfigChange config(LxssGenerateTestConfig({.guiApplications = true}));
288+
config.Update(LxssGenerateTestConfig({.guiApplications = true}));
288289

289290
validateUserSession();
290291
auto [out, err] = LxsstuLaunchWslAndCaptureOutput(std::format(L"--user {} echo $DISPLAY", LXSST_TEST_USERNAME));

0 commit comments

Comments
 (0)