From 8f5130afdc60f4957086e41d62cfe9f8d70d5321 Mon Sep 17 00:00:00 2001 From: Bevan Weiss Date: Fri, 3 Jan 2025 15:06:15 +1100 Subject: Fix ups for Domain Group creation / removal. Signed-off-by: Bevan Weiss --- src/test/burn/WixTestTools/RuntimeFactAttribute.cs | 4 ++-- src/test/msi/WixToolsetTest.MsiE2E/UtilExtensionGroupTests.cs | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/test') diff --git a/src/test/burn/WixTestTools/RuntimeFactAttribute.cs b/src/test/burn/WixTestTools/RuntimeFactAttribute.cs index d7f56f70..2644a1cc 100644 --- a/src/test/burn/WixTestTools/RuntimeFactAttribute.cs +++ b/src/test/burn/WixTestTools/RuntimeFactAttribute.cs @@ -47,6 +47,8 @@ namespace WixTestTools var domainTestsEnabledString = Environment.GetEnvironmentVariable(RequiredDomainEnvironmentVariableName); RuntimeDomainTestsEnabled = Boolean.TryParse(domainTestsEnabledString, out var domainTestsEnabled) && domainTestsEnabled; + + RunningOnWindowsServer = IsWindowsServer(); } public bool DomainRequired @@ -63,8 +65,6 @@ namespace WixTestTools this.Skip = $"These tests require the test host to be running as a domain member ({(RunningInDomain ? "passed" : "failed")}). These tests affect both MACHINE AND DOMAIN state. To accept the consequences, set the {RequiredDomainEnvironmentVariableName} environment variable to true ({(RuntimeDomainTestsEnabled ? "passed" : "failed")})."; } } - - RunningOnWindowsServer = IsWindowsServer(); } private bool _RequireWindowsServer; diff --git a/src/test/msi/WixToolsetTest.MsiE2E/UtilExtensionGroupTests.cs b/src/test/msi/WixToolsetTest.MsiE2E/UtilExtensionGroupTests.cs index cee357a6..e379047d 100644 --- a/src/test/msi/WixToolsetTest.MsiE2E/UtilExtensionGroupTests.cs +++ b/src/test/msi/WixToolsetTest.MsiE2E/UtilExtensionGroupTests.cs @@ -151,12 +151,14 @@ namespace WixToolsetTest.MsiE2E [RuntimeFact] public void FailsIfRestrictedDomain() { + var testDomain = "DOESNOTEXIST"; + var testGroup = "testName1"; var productRestrictedDomain = this.CreatePackageInstaller("ProductRestrictedDomain"); - string logFile = productRestrictedDomain.InstallProduct(MSIExec.MSIExecReturnCode.ERROR_INSTALL_FAILURE, "TESTDOMAIN=DOESNOTEXIST"); + string logFile = productRestrictedDomain.InstallProduct(MSIExec.MSIExecReturnCode.ERROR_INSTALL_FAILURE, $"TESTDOMAIN={testDomain}"); // Verify expected error message in the log file - Assert.True(LogVerifier.MessageInLogFile(logFile, "CreateGroup: Error 0x8007054b: failed to find Domain DOESNOTEXIST.")); + Assert.True(LogVerifier.MessageInLogFile(logFile, $"ConfigureGroups: Error 0x8007054b: Domain does not exist for vital group: {testDomain}\\{testGroup} - aborting")); } // Verify that a group can be created with a group comment -- cgit v1.2.3-55-g6feb