diff options
| author | Rob Mensching <rob@firegiant.com> | 2024-12-24 18:11:55 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2025-02-11 23:14:49 -0800 |
| commit | eda11c7eb726da970de68c5b353f946d1da0a7a3 (patch) | |
| tree | 65a1780392a7213ba12a1865dba51cedbcdc561c /src/test | |
| parent | 5b4a6538ee06988c75b717bd905197fb670e6142 (diff) | |
| download | wix-eda11c7eb726da970de68c5b353f946d1da0a7a3.tar.gz wix-eda11c7eb726da970de68c5b353f946d1da0a7a3.tar.bz2 wix-eda11c7eb726da970de68c5b353f946d1da0a7a3.zip | |
Group creation and update PR nits and feedback fixes
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/burn/WixTestTools/RuntimeFactAttribute.cs | 9 | ||||
| -rw-r--r-- | src/test/burn/WixTestTools/UserGroupVerifier.cs | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/test/burn/WixTestTools/RuntimeFactAttribute.cs b/src/test/burn/WixTestTools/RuntimeFactAttribute.cs index 76004f26..d7f56f70 100644 --- a/src/test/burn/WixTestTools/RuntimeFactAttribute.cs +++ b/src/test/burn/WixTestTools/RuntimeFactAttribute.cs | |||
| @@ -10,6 +10,8 @@ namespace WixTestTools | |||
| 10 | 10 | ||
| 11 | public class RuntimeFactAttribute : SkippableFactAttribute | 11 | public class RuntimeFactAttribute : SkippableFactAttribute |
| 12 | { | 12 | { |
| 13 | private bool domainRequired; | ||
| 14 | |||
| 13 | const string RequiredEnvironmentVariableName = "RuntimeTestsEnabled"; | 15 | const string RequiredEnvironmentVariableName = "RuntimeTestsEnabled"; |
| 14 | const string RequiredDomainEnvironmentVariableName = "RuntimeDomainTestsEnabled"; | 16 | const string RequiredDomainEnvironmentVariableName = "RuntimeDomainTestsEnabled"; |
| 15 | 17 | ||
| @@ -47,17 +49,16 @@ namespace WixTestTools | |||
| 47 | RuntimeDomainTestsEnabled = Boolean.TryParse(domainTestsEnabledString, out var domainTestsEnabled) && domainTestsEnabled; | 49 | RuntimeDomainTestsEnabled = Boolean.TryParse(domainTestsEnabledString, out var domainTestsEnabled) && domainTestsEnabled; |
| 48 | } | 50 | } |
| 49 | 51 | ||
| 50 | private bool _domainRequired; | ||
| 51 | public bool DomainRequired | 52 | public bool DomainRequired |
| 52 | { | 53 | { |
| 53 | get | 54 | get |
| 54 | { | 55 | { |
| 55 | return _domainRequired; | 56 | return this.domainRequired; |
| 56 | } | 57 | } |
| 57 | set | 58 | set |
| 58 | { | 59 | { |
| 59 | _domainRequired = value; | 60 | this.domainRequired = value; |
| 60 | if (_domainRequired && String.IsNullOrEmpty(this.Skip) && (!RunningInDomain || !RuntimeDomainTestsEnabled)) | 61 | if (this.domainRequired && String.IsNullOrEmpty(this.Skip) && (!RunningInDomain || !RuntimeDomainTestsEnabled)) |
| 61 | { | 62 | { |
| 62 | 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")})."; | 63 | 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")})."; |
| 63 | } | 64 | } |
diff --git a/src/test/burn/WixTestTools/UserGroupVerifier.cs b/src/test/burn/WixTestTools/UserGroupVerifier.cs index 52a1a6bf..8c2da46e 100644 --- a/src/test/burn/WixTestTools/UserGroupVerifier.cs +++ b/src/test/burn/WixTestTools/UserGroupVerifier.cs | |||
| @@ -29,7 +29,7 @@ namespace WixTestTools | |||
| 29 | } | 29 | } |
| 30 | 30 | ||
| 31 | /// <summary> | 31 | /// <summary> |
| 32 | /// Deletes a local gorup from the machine | 32 | /// Deletes a local group from the machine |
| 33 | /// </summary> | 33 | /// </summary> |
| 34 | /// <param name="groupName">group name to delete</param> | 34 | /// <param name="groupName">group name to delete</param> |
| 35 | /// <remarks>Has to be run as an Admin</remarks> | 35 | /// <remarks>Has to be run as an Admin</remarks> |
