Merge pull request #92 from nunit/issue-91

Support for pluggable agents

Author: CharliePoole

recipe/chocolatey-package.cake

@@ -41,4 +41,12 @@ public class ChocolateyPackage : PackageDefinition
                 ArgumentCustomization = args => args.Append($"BIN_DIR={BuildSettings.OutputDirectory}")
             });
     }
+
+    protected override bool IsRemovableExtension(string id)
+    {
+        return
+            id.StartsWith("nunit-extension-") &&
+            !id.StartsWith(PackageId) &&
+            !id.Contains("pluggable-agent");
+    }
 }

recipe/nuget-package.cake

@@ -99,4 +99,12 @@ public class NuGetPackage : PackageDefinition
         else
             throw new Exception("Verification failed!");
     }
+
+    protected override bool IsRemovableExtension(string id)
+    {
+        return
+            id.StartsWith("NUnit.Extension.") &&
+            !id.StartsWith(PackageId) &&
+            !id.Contains("PluggableAgent");
+    }
 }

recipe/package-definition.cake

@@ -210,7 +210,15 @@ public abstract class PackageDefinition
         // Ensure we start out each package with no extensions installed.
         // If any package test installs an extension, it remains available
         // for subsequent tests of the same package only.
-        RemoveExtensions();
+        foreach (DirectoryPath dirPath in _context.GetDirectories(ExtensionInstallDirectory + "*"))
+        {
+            string dirName = dirPath.Segments.Last();
+            if (IsRemovableExtension(dirName))
+            {
+                _context.DeleteDirectory(dirPath, new DeleteDirectorySettings() { Recursive = true });
+                _context.Information("Deleted directory " + dirPath.GetDirectoryName());
+            }
+        }
 
         // Package was defined with one or more TestRunners. These
         // may or may not require installation.
@@ -297,20 +305,7 @@ public abstract class PackageDefinition
             extension.InstallExtension(this);
     }
 
-    // Remove all extensions prior to starting a run. Note that we avoid removing the the
-    // package being developed, which may actually be an extension itself.
-    protected void RemoveExtensions()
-    {
-        foreach (DirectoryPath dirPath in _context.GetDirectories(ExtensionInstallDirectory + "*"))
-        {
-            string dirName = dirPath.Segments.Last();
-            if ((dirName.StartsWith("NUnit.Extension.") || dirName.StartsWith("nunit-extension-")) && !dirName.StartsWith(PackageId))
-            {
-                _context.DeleteDirectory(dirPath, new DeleteDirectorySettings() { Recursive = true });
-                _context.Information("Deleted directory " + dirPath.GetDirectoryName());
-            }
-        }
-    }
+    protected abstract bool IsRemovableExtension(string dirName);
 
     private void InstallRunners(IEnumerable<IPackageTestRunner> runners)
     {

recipe/zip-package.cake

@@ -65,4 +65,12 @@ public class ZipPackage : PackageDefinition
 
         _context.CopyDirectory(BuildSettings.ExtensionsDirectory, BuildSettings.ZipImageDirectory);
     }
+
+    protected override bool IsRemovableExtension(string id)
+    {
+        return
+            id.StartsWith("NUnit.Extension.") &&
+            !id.StartsWith(PackageId) &&
+            !id.Contains("PluggableAgent");
+    }
 }