(chocolateyGH-1133) autouninstaller - skip if package is missing

When the package information comes back null, skip the uninstaller.
DamianMaslanka5 · Aug 29, 2017 · e480224 · e480224
1 parent df22c3a
commit e480224
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 0 deletions.
diff --git a/src/chocolatey.tests/infrastructure.app/services/AutomaticUninstallerServiceSpecs.cs b/src/chocolatey.tests/infrastructure.app/services/AutomaticUninstallerServiceSpecs.cs
@@ -175,6 +175,34 @@ public void should_log_why_it_skips_auto_uninstaller()
                 MockLogger.Verify(l => l.Info(" Skipping auto uninstaller - No registry snapshot."), Times.Once);
             }
 
+            [Fact]
+            public void should_not_call_command_executor()
+            {
+                commandExecutor.Verify(
+                    c => c.execute(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<int>(), It.IsAny<Action<object, DataReceivedEventArgs>>(), It.IsAny<Action<object, DataReceivedEventArgs>>(), It.IsAny<bool>()),
+                    Times.Never);
+            }
+        }  
+
+        public class when_package_is_missing : AutomaticUninstallerServiceSpecsBase
+        {
+            public override void Context()
+            {
+                base.Context();
+                packageInformation.Package = null;
+            }
+
+            public override void Because()
+            {
+                service.run(packageResult, config);
+            }
+
+            [Fact]
+            public void should_log_why_it_skips_auto_uninstaller()
+            {
+                MockLogger.Verify(l => l.Info(" Skipping auto uninstaller - No package in package information."), Times.Once);
+            }
+
             [Fact]
             public void should_not_call_command_executor()
             {

diff --git a/src/chocolatey/infrastructure.app/services/AutomaticUninstallerService.cs b/src/chocolatey/infrastructure.app/services/AutomaticUninstallerService.cs
@@ -28,6 +28,7 @@ namespace chocolatey.infrastructure.app.services
     using domain.installers;
     using filesystem;
     using infrastructure.commands;
+    using logging;
     using results;
 
     public class AutomaticUninstallerService : IAutomaticUninstallerService
@@ -83,6 +84,13 @@ public void run(PackageResult packageResult, ChocolateyConfiguration config)
                 return;
             }
 
+            var package = pkgInfo.Package;
+            if (package == null)
+            {
+                this.Log().Info(" Skipping auto uninstaller - No package in package information.");
+                return;
+            }
+
             this.Log().Info(" Running auto uninstaller...");
             if (WaitForCleanup)
             {