fixup! (chocolatey#3461,chocolatey#3487) Add test packages for added …

…tests
corbob · Sep 27, 2024 · dc713f1 · dc713f1
1 parent acdf0ba
commit dc713f1
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 14 deletions.
diff --git a/tests/packages/dependencyfailure/dependencyfailure.nuspec b/tests/packages/dependencyfailure/dependencyfailure.nuspec
@@ -7,8 +7,12 @@
     <authors>__REPLACE_AUTHORS_OF_SOFTWARE_COMMA_SEPARATED__</authors>
     <projectUrl>https://_Software_Location_REMOVE_OR_FILL_OUT_</projectUrl>
     <tags>dependencyfailure admin SPACE_SEPARATED</tags>
-    <summary>__REPLACE__</summary>
-    <description>__REPLACE__MarkDown_Okay </description>
+    <summary>Package includes a dependency for a package that is known to fail installation.</summary>
+    <description>
+      Package includes a dependency for a package that is known to fail installation.
+
+      It can be used in tests to ensure that failing dependencies do not allow the package to install.
+    </description>
     <dependencies>
       <dependency id="failingdependency" version="1.0.0" />
     </dependencies>

diff --git a/tests/packages/failingdependency/failingdependency.nuspec b/tests/packages/failingdependency/failingdependency.nuspec
@@ -7,8 +7,8 @@
     <authors>__REPLACE_AUTHORS_OF_SOFTWARE_COMMA_SEPARATED__</authors>
     <projectUrl>https://_Software_Location_REMOVE_OR_FILL_OUT_</projectUrl>
     <tags>dependencyfailure admin SPACE_SEPARATED</tags>
-    <summary>__REPLACE__</summary>
-    <description>__REPLACE__MarkDown_Okay </description>
+    <summary>Package that fails to install. Used as part of dependency tree.</summary>
+    <description>Package that fails to install. Used as part of dependency tree.</description>
   </metadata>
   <files>
     <file src="tools\**" target="tools" />

diff --git a/tests/packages/failingdependency/tools/chocolateyinstall.ps1 b/tests/packages/failingdependency/tools/chocolateyinstall.ps1
@@ -1,3 +1,2 @@
 Write-Error "This should fail!"
 $env:ChocolateyExitCode = '15608'
-#throw "This is crap"
diff --git a/tests/packages/hasfailingnesteddependency/1.0.0/hasfailingnesteddependency.nuspec b/tests/packages/hasfailingnesteddependency/1.0.0/hasfailingnesteddependency.nuspec
@@ -7,8 +7,12 @@
         <authors>__REPLACE_AUTHORS_OF_SOFTWARE__</authors>
         <owners>__REPLACE_YOUR_NAME__</owners>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>__REPLACE__</description>
-        <summary>__REPLACE__</summary>
+        <description>
+          Package that contains dependencies that have dependencies that may fail to install.
+
+          Used for testing dependency resolution and ensuring dependency failures do not allow package installation.
+        </description>
+        <summary>Package that contains dependencies that have dependencies that may fail to install.</summary>
         <releaseNotes />
         <copyright />
         <tags>hasfailingnesteddependency admin</tags>

diff --git a/tests/packages/upgradedowngradesdependency/1.0.0/downgradesdependency.nuspec b/tests/packages/upgradedowngradesdependency/1.0.0/downgradesdependency.nuspec
@@ -7,7 +7,14 @@
         <authors>__REPLACE_AUTHORS_OF_SOFTWARE__</authors>
         <owners>__REPLACE_YOUR_NAME__</owners>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>__REPLACE__</description>
+        <description>
+          These packages can be used to test the installation or upgrading of packages that require an existing package to downgrade.
+
+Each version is available as `upgradedowngradesdependency` and `downgradesdependency`. This is to allow testing of scenarios where `choco upgrade all` would process the dependency before and after the parent package.
+
+- Version 1.0.0 contains a range that can be used in an upgrade scenario and has a dependency on `isdependency 1.0.0 or greater`
+- Version 2.0.0 contains an exact dependency on `isdependency` with a version of `1.0.0`
+        </description>
         <summary>Package to test for out of range dependencies. This 1st version have a valid exact range.</summary>
         <releaseNotes />
         <copyright />

diff --git a/tests/packages/upgradedowngradesdependency/1.0.0/upgradedowngradesdependency.nuspec b/tests/packages/upgradedowngradesdependency/1.0.0/upgradedowngradesdependency.nuspec
@@ -7,7 +7,14 @@
         <authors>__REPLACE_AUTHORS_OF_SOFTWARE__</authors>
         <owners>__REPLACE_YOUR_NAME__</owners>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>__REPLACE__</description>
+        <description>
+          These packages can be used to test the installation or upgrading of packages that require an existing package to downgrade.
+
+Each version is available as `upgradedowngradesdependency` and `downgradesdependency`. This is to allow testing of scenarios where `choco upgrade all` would process the dependency before and after the parent package.
+
+- Version 1.0.0 contains a range that can be used in an upgrade scenario and has a dependency on `isdependency 1.0.0 or greater`
+- Version 2.0.0 contains an exact dependency on `isdependency` with a version of `1.0.0`
+        </description>
         <summary>Package to test for out of range dependencies. This 1st version have a valid exact range.</summary>
         <releaseNotes />
         <copyright />

diff --git a/tests/packages/upgradedowngradesdependency/2.0.0/downgradesdependency.nuspec b/tests/packages/upgradedowngradesdependency/2.0.0/downgradesdependency.nuspec
@@ -7,7 +7,14 @@
         <authors>__REPLACE_AUTHORS_OF_SOFTWARE__</authors>
         <owners>__REPLACE_YOUR_NAME__</owners>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>__REPLACE__</description>
+        <description>
+          These packages can be used to test the installation or upgrading of packages that require an existing package to downgrade.
+
+Each version is available as `upgradedowngradesdependency` and `downgradesdependency`. This is to allow testing of scenarios where `choco upgrade all` would process the dependency before and after the parent package.
+
+- Version 1.0.0 contains a range that can be used in an upgrade scenario and has a dependency on `isdependency 1.0.0 or greater`
+- Version 2.0.0 contains an exact dependency on `isdependency` with a version of `1.0.0`
+        </description>
         <summary>Package to test for out of range dependencies. This version uses a dependency that require a lower version.</summary>
         <releaseNotes />
         <copyright />

diff --git a/tests/packages/upgradedowngradesdependency/2.0.0/upgradedowngradesdependency.nuspec b/tests/packages/upgradedowngradesdependency/2.0.0/upgradedowngradesdependency.nuspec
@@ -7,7 +7,14 @@
         <authors>__REPLACE_AUTHORS_OF_SOFTWARE__</authors>
         <owners>__REPLACE_YOUR_NAME__</owners>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>__REPLACE__</description>
+        <description>
+          These packages can be used to test the installation or upgrading of packages that require an existing package to downgrade.
+
+Each version is available as `upgradedowngradesdependency` and `downgradesdependency`. This is to allow testing of scenarios where `choco upgrade all` would process the dependency before and after the parent package.
+
+- Version 1.0.0 contains a range that can be used in an upgrade scenario and has a dependency on `isdependency 1.0.0 or greater`
+- Version 2.0.0 contains an exact dependency on `isdependency` with a version of `1.0.0`
+        </description>
         <summary>Package to test for out of range dependencies. This version uses a dependency that require a lower version.</summary>
         <releaseNotes />
         <copyright />

diff --git a/tests/packages/upgradedowngradesdependency/Readme.md b/tests/packages/upgradedowngradesdependency/Readme.md
@@ -1,6 +1,6 @@
-These packages can be used to test the installation or upgrading of packages that have require an existing package to downgrade.
+These packages can be used to test the installation or upgrading of packages that require an existing package to downgrade.
 
 Each version is available as `upgradedowngradesdependency` and `downgradesdependency`. This is to allow testing of scenarios where `choco upgrade all` would process the dependency before and after the parent package.
 
-- Version 1.0.0 Contains a range that can be used in an upgrade scenario and has a dependency on `isdependency 1.0.0 or greater`
-- Version 2.0.0 Contains an exact dependency on `isdependency` with a version of `1.0.0`
+- Version 1.0.0 contains a range that can be used in an upgrade scenario and has a dependency on `isdependency 1.0.0 or greater`
+- Version 2.0.0 contains an exact dependency on `isdependency` with a version of `1.0.0`