clearasmudd · muddman · Mar 6, 2020 · Mar 6, 2020 · Mar 6, 2020 · Mar 12, 2020
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -108,11 +108,9 @@ for:
       - ps: $ErrorActionPreference = "Continue";
       - ps: mkdir c:\results
       # - ps: if ($LastExitCode -ne 0) {write-host "last exit code $LastExitCode"; $host.SetShouldExit($LastExitCode)}
-
     test_script:
       - ps: Write-Host "test_script for $env:APPVEYOR_JOB_NAME"
       - ps: c:\opscode\chefdk\bin\chef.bat exec kitchen test
-
     deploy: off
     on_failure:
       - ps: >

diff --git a/.kitchen.yml b/.kitchen.yml
@@ -155,11 +155,11 @@ platforms:
 suites:
   - name: py3
     provisioner:
-      salt_bootstrap_options: "-version 2019.2.3 -pythonVersion 3"
+      salt_bootstrap_options: "-version 3000 -pythonVersion 3"
       # salt_version: latest
-      # - name: py3-3000
-      #   provisioner:
-      #     salt_bootstrap_options: "-version 3000 -pythonVersion 3"
+  - name: py3-2019.2.3
+    provisioner:
+      salt_bootstrap_options: "-version 2019.2.3 -pythonVersion 3"
       # - name: py2
       #   provisioner:
       #     salt_bootstrap_options: "-version 2019.2.3 -pythonVersion 2"
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -0,0 +1,19 @@
+---
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: docs/conf.py
+
+# Optionally build your docs in additional formats such as PDF and ePub
+formats: all
+
+# Optionally set the version of Python and requirements required to build your docs
+python:
+  version: 3.7
+  install:
+    - requirements: docs/requirements.txt
diff --git a/scripts/kitchen_test.sh b/scripts/kitchen_test.sh
@@ -53,7 +53,7 @@ function log_test_kitchen_test() {
     git rev-parse HEAD | tee -a "$my_log"
     echo "CURRENT RELEASE TAG" | tee -a "$my_log"
     git tag --sort=committerdate | tail -1 | tee -a "$my_log"
-    kitchen test "$SERVER" --no-color --destroy passing | tee -a "$my_log"
+    kitchen test "$SERVER" --no-color --destroy always | tee -a "$my_log"
     return_code=${PIPESTATUS[0]}
     if [ ! "$return_code" -eq 0 ]; then
       echo "KITCHEN TEST DID NOT COMPLETE SUCCESSFULLY." | tee -a "$my_log"
@@ -91,11 +91,9 @@ if [ ${#failures_array[@]} -eq 0 ]; then
   if [[ $REPLY =~ ^[Yy]$ ]]; then
     git add -A test/results
     git commit -m "$commit_message"
-    git push
   else
     echo git add test/results/*
-    echo git commit -m \""$commit_message"\"
-    echo git push
+    echo git commit -m "$commit_message"
   fi
 else
   for failure in "${!failures[@]}"; do

diff --git a/test/results/py3-2019.2.3-windows-10-1709.inspec.results.json b/test/results/py3-2019.2.3-windows-10-1709.inspec.results.json
diff --git a/test/results/py3-2019.2.3-windows-10-1709.inspec.results.txt b/test/results/py3-2019.2.3-windows-10-1709.inspec.results.txt
@@ -0,0 +1,71 @@
+
+windows_10_enterprise_evaluation
+  should include "windows"
+
+Windows AppX Provisioned Package `Microsoft.MicrosoftSolitaireCollection`
+  should not be installed
+
+Windows AppX Provisioned Package `Microsoft.Wallet`
+  should not be installed
+
+Windows AppX Provisioned Package `Microsoft.ZuneMusic`
+  should not be installed
+
+Windows AppX Provisioned Package `Microsoft.ZuneVideo`
+  should not be installed
+
+Windows AppX Provisioned Package `Microsoft.MixedReality.Portal`
+  should not be installed
+
+Chocolatey package notepadplusplus
+  should be installed
+
+Chocolatey package windirstat
+  should be installed
+  version
+    should cmp == "1.1.2.20161210"
+
+No-op
+  Skipped control due to only_if condition: only supported on servers (PENDING: Not yet implemented)
+
+Command: `choco`
+  should exist
+
+`Eastern Standard Time` timezone (converted from America/New_York)
+  should be set
+
+Windows Optional Feature: `TelnetClient`
+  should be installed
+
+System Information
+  hostname
+    should cmp == "saltstack1"
+
+Registry Key HKLM\SYSTEM\CurrentControlSet\Control\ComputerName\ComputerName
+  ComputerName
+    should cmp == "saltstack1"
+
+Powershell
+  stdout
+    should match "Saltstack Computer Description"
+
+System Package Git
+  should be installed
+
+System Package 7-Zip
+  should be installed
+  version
+    should cmp == "18.06.00.0"
+
+System Package KDiff3
+  should be installed
+
+Pending: (Failures listed here are expected and do not affect your suite's status)
+
+  1) No-op Skipped control due to only_if condition: only supported on servers
+     # Not yet implemented
+     # 
+
+Finished in 3.4 seconds (files took 6 minutes 39 seconds to load)
+20 examples, 0 failures, 1 pending
+
diff --git a/test/results/py3-2019.2.3-windows-10-1709.inspec.results.xml b/test/results/py3-2019.2.3-windows-10-1709.inspec.results.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0'?>
+<testsuites>
+  <testsuite name='default' tests='20' failed='0' failures='0'>
+    <testcase name='windows_10_enterprise_evaluation should include &quot;windows&quot;' classname='default.Operating System' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='9.44e-05'/>
+    <testcase name='Windows AppX Provisioned Package `Microsoft.MicrosoftSolitaireCollection` should not be installed' classname='default.Windows AppX Provisioned Package Uninstalled' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.350731'/>
+    <testcase name='Windows AppX Provisioned Package `Microsoft.Wallet` should not be installed' classname='default.Windows AppX Provisioned Package Uninstalled' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.03218'/>
+    <testcase name='Windows AppX Provisioned Package `Microsoft.ZuneMusic` should not be installed' classname='default.Windows AppX Provisioned Package Uninstalled' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.0295685'/>
+    <testcase name='Windows AppX Provisioned Package `Microsoft.ZuneVideo` should not be installed' classname='default.Windows AppX Provisioned Package Uninstalled' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.0364491'/>
+    <testcase name='Windows AppX Provisioned Package `Microsoft.MixedReality.Portal` should not be installed' classname='default.Windows AppX Provisioned Package Uninstalled' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.0310896'/>
+    <testcase name='Chocolatey package notepadplusplus should be installed' classname='default.Chocolatey Package Installed' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.00013'/>
+    <testcase name='Chocolatey package windirstat should be installed' classname='default.Chocolatey Package Installed' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='7.99e-05'/>
+    <testcase name='Chocolatey package windirstat version should cmp == &quot;1.1.2.20161210&quot;' classname='default.Chocolatey Package Installed' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.0001115'/>
+    <testcase name='No-op' classname='default.Windows Features' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='7.3e-06'>
+      <skipped/>
+    </testcase>
+    <testcase name='Command: `choco` should exist' classname='default.Chocolatey Installed' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.0484423'/>
+    <testcase name='`Eastern Standard Time` timezone (converted from America/New_York) should be set' classname='default.Windows Timezone' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.4355977'/>
+    <testcase name='Windows Optional Feature: `TelnetClient` should be installed' classname='default.Windows Optional Features' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='1.749142'/>
+    <testcase name='System Information hostname should cmp == &quot;saltstack1&quot;' classname='default.Windows Computer Hostname' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.0170259'/>
+    <testcase name='Registry Key HKLM\SYSTEM\CurrentControlSet\Control\ComputerName\ComputerName ComputerName should cmp == &quot;saltstack1&quot;' classname='default.Windows Computer Hostname' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.0001445'/>
+    <testcase name='Powershell stdout should match &quot;Saltstack Computer Description&quot;' classname='default.Windows Computer Description' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.1087256'/>
+    <testcase name='System Package Git should be installed' classname='default.Saltstack Package Installed' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.1303018'/>
+    <testcase name='System Package 7-Zip should be installed' classname='default.Saltstack Package Installed' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.1354642'/>
+    <testcase name='System Package 7-Zip version should cmp == &quot;18.06.00.0&quot;' classname='default.Saltstack Package Installed' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.1204744'/>
+    <testcase name='System Package KDiff3 should be installed' classname='default.Saltstack Package Installed' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.1378658'/>
+  </testsuite>
+</testsuites>
diff --git a/test/results/py3-2019.2.3-windows-10-1803.inspec.results.json b/test/results/py3-2019.2.3-windows-10-1803.inspec.results.json
diff --git a/test/results/py3-2019.2.3-windows-10-1803.inspec.results.txt b/test/results/py3-2019.2.3-windows-10-1803.inspec.results.txt
@@ -0,0 +1,71 @@
+
+windows_10_enterprise_evaluation
+  should include "windows"
+
+Windows AppX Provisioned Package `Microsoft.MicrosoftSolitaireCollection`
+  should not be installed
+
+Windows AppX Provisioned Package `Microsoft.Wallet`
+  should not be installed
+
+Windows AppX Provisioned Package `Microsoft.ZuneMusic`
+  should not be installed
+
+Windows AppX Provisioned Package `Microsoft.ZuneVideo`
+  should not be installed
+
+Windows AppX Provisioned Package `Microsoft.MixedReality.Portal`
+  should not be installed
+
+Chocolatey package notepadplusplus
+  should be installed
+
+Chocolatey package windirstat
+  should be installed
+  version
+    should cmp == "1.1.2.20161210"
+
+No-op
+  Skipped control due to only_if condition: only supported on servers (PENDING: Not yet implemented)
+
+Command: `choco`
+  should exist
+
+`Eastern Standard Time` timezone (converted from America/New_York)
+  should be set
+
+Windows Optional Feature: `TelnetClient`
+  should be installed
+
+System Information
+  hostname
+    should cmp == "saltstack1"
+
+Registry Key HKLM\SYSTEM\CurrentControlSet\Control\ComputerName\ComputerName
+  ComputerName
+    should cmp == "saltstack1"
+
+Powershell
+  stdout
+    should match "Saltstack Computer Description"
+
+System Package Git
+  should be installed
+
+System Package 7-Zip
+  should be installed
+  version
+    should cmp == "18.06.00.0"
+
+System Package KDiff3
+  should be installed
+
+Pending: (Failures listed here are expected and do not affect your suite's status)
+
+  1) No-op Skipped control due to only_if condition: only supported on servers
+     # Not yet implemented
+     # 
+
+Finished in 3.13 seconds (files took 4 minutes 24.3 seconds to load)
+20 examples, 0 failures, 1 pending
+
diff --git a/test/results/py3-2019.2.3-windows-10-1803.inspec.results.xml b/test/results/py3-2019.2.3-windows-10-1803.inspec.results.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0'?>
+<testsuites>
+  <testsuite name='default' tests='20' failed='0' failures='0'>
+    <testcase name='windows_10_enterprise_evaluation should include &quot;windows&quot;' classname='default.Operating System' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.0001099'/>
+    <testcase name='Windows AppX Provisioned Package `Microsoft.MicrosoftSolitaireCollection` should not be installed' classname='default.Windows AppX Provisioned Package Uninstalled' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.2208062'/>
+    <testcase name='Windows AppX Provisioned Package `Microsoft.Wallet` should not be installed' classname='default.Windows AppX Provisioned Package Uninstalled' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.02939'/>
+    <testcase name='Windows AppX Provisioned Package `Microsoft.ZuneMusic` should not be installed' classname='default.Windows AppX Provisioned Package Uninstalled' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.0311448'/>
+    <testcase name='Windows AppX Provisioned Package `Microsoft.ZuneVideo` should not be installed' classname='default.Windows AppX Provisioned Package Uninstalled' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.0523379'/>
+    <testcase name='Windows AppX Provisioned Package `Microsoft.MixedReality.Portal` should not be installed' classname='default.Windows AppX Provisioned Package Uninstalled' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.048231'/>
+    <testcase name='Chocolatey package notepadplusplus should be installed' classname='default.Chocolatey Package Installed' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.0001291'/>
+    <testcase name='Chocolatey package windirstat should be installed' classname='default.Chocolatey Package Installed' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='7.97e-05'/>
+    <testcase name='Chocolatey package windirstat version should cmp == &quot;1.1.2.20161210&quot;' classname='default.Chocolatey Package Installed' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.0001318'/>
+    <testcase name='No-op' classname='default.Windows Features' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='8.6e-06'>
+      <skipped/>
+    </testcase>
+    <testcase name='Command: `choco` should exist' classname='default.Chocolatey Installed' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.0489046'/>
+    <testcase name='`Eastern Standard Time` timezone (converted from America/New_York) should be set' classname='default.Windows Timezone' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.4430225'/>
+    <testcase name='Windows Optional Feature: `TelnetClient` should be installed' classname='default.Windows Optional Features' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='1.5439187'/>
+    <testcase name='System Information hostname should cmp == &quot;saltstack1&quot;' classname='default.Windows Computer Hostname' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.0176204'/>
+    <testcase name='Registry Key HKLM\SYSTEM\CurrentControlSet\Control\ComputerName\ComputerName ComputerName should cmp == &quot;saltstack1&quot;' classname='default.Windows Computer Hostname' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.0001588'/>
+    <testcase name='Powershell stdout should match &quot;Saltstack Computer Description&quot;' classname='default.Windows Computer Description' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.0999918'/>
+    <testcase name='System Package Git should be installed' classname='default.Saltstack Package Installed' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.1357269'/>
+    <testcase name='System Package 7-Zip should be installed' classname='default.Saltstack Package Installed' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.1436397'/>
+    <testcase name='System Package 7-Zip version should cmp == &quot;18.06.00.0&quot;' classname='default.Saltstack Package Installed' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.1315567'/>
+    <testcase name='System Package KDiff3 should be installed' classname='default.Saltstack Package Installed' target='winrm://vagrant@http://127.0.0.1:55985/wsman:3389' time='0.1477687'/>
+  </testsuite>
+</testsuites>
diff --git a/test/results/py3-2019.2.3-windows-10-1809.inspec.results.json b/test/results/py3-2019.2.3-windows-10-1809.inspec.results.json
diff --git a/test/results/py3-2019.2.3-windows-10-1809.inspec.results.txt b/test/results/py3-2019.2.3-windows-10-1809.inspec.results.txt
@@ -0,0 +1,71 @@
+
+windows_10_enterprise_evaluation
+  should include "windows"
+
+Windows AppX Provisioned Package `Microsoft.MicrosoftSolitaireCollection`
+  should not be installed
+
+Windows AppX Provisioned Package `Microsoft.Wallet`
+  should not be installed
+
+Windows AppX Provisioned Package `Microsoft.ZuneMusic`
+  should not be installed
+
+Windows AppX Provisioned Package `Microsoft.ZuneVideo`
+  should not be installed
+
+Windows AppX Provisioned Package `Microsoft.MixedReality.Portal`
+  should not be installed
+
+Chocolatey package notepadplusplus
+  should be installed
+
+Chocolatey package windirstat
+  should be installed
+  version
+    should cmp == "1.1.2.20161210"
+
+No-op
+  Skipped control due to only_if condition: only supported on servers (PENDING: Not yet implemented)
+
+Command: `choco`
+  should exist
+
+`Eastern Standard Time` timezone (converted from America/New_York)
+  should be set
+
+Windows Optional Feature: `TelnetClient`
+  should be installed
+
+System Information
+  hostname
+    should cmp == "saltstack1"
+
+Registry Key HKLM\SYSTEM\CurrentControlSet\Control\ComputerName\ComputerName
+  ComputerName
+    should cmp == "saltstack1"
+
+Powershell
+  stdout
+    should match "Saltstack Computer Description"
+
+System Package Git
+  should be installed
+
+System Package 7-Zip
+  should be installed
+  version
+    should cmp == "18.06.00.0"
+
+System Package KDiff3
+  should be installed
+
+Pending: (Failures listed here are expected and do not affect your suite's status)
+
+  1) No-op Skipped control due to only_if condition: only supported on servers
+     # Not yet implemented
+     # 
+
+Finished in 3.47 seconds (files took 4 minutes 23 seconds to load)
+20 examples, 0 failures, 1 pending
+