Failures were seen in MSI Unit Tests around Firewall rules within

Windows Sandbox.

This is potentially a Windows OS bug (it was from a Windows Insider build),
however shows that it's possible in the Firewall API to have multiple rules
which differ only in their Grouping.
So the testbench should consider different Grouping as making for a unique
firewall rule.


Signed-off-by: Bevan Weiss <bevan.weiss@gmail.com>

1 files changed, 8 insertions, 0 deletions

diff --git a/src/test/burn/WixTestTools/Firewall/UniqueCheck.cs b/src/test/burn/WixTestTools/Firewall/UniqueCheck.cs
index 598350f9..7bc2e527 100644
--- a/src/test/burn/WixTestTools/Firewall/UniqueCheck.cs
+++ b/src/test/burn/WixTestTools/Firewall/UniqueCheck.cs
@@ -23,6 +23,7 @@ namespace WixTestTools.Firewall
             this.ApplicationName = details.ApplicationName;
             this.LocalUserOwner = details.LocalUserOwner;
             this.RemoteAddresses = details.RemoteAddresses;
+            this.Grouping = details.Grouping;
         }
 
 
@@ -40,6 +41,8 @@ namespace WixTestTools.Firewall
 
         public string RemoteAddresses { get; set; }
 
+        public string Grouping { get; set; }
+
         public bool FirewallRuleIsUnique(INetFwRule3 rule)
         {
             if (this.Name != null && rule.Name != this.Name)
@@ -77,6 +80,11 @@ namespace WixTestTools.Firewall
                 return false;
             }
 
+            if (this.Grouping != null && rule.Grouping != this.Grouping)
+            {
+                return false;
+            }
+
             return true;
         }
     }