Resolve test failures

Signed-off-by: Tim Smith <tsmith@chef.io>

6 files changed, 16 insertions, 15 deletions

diff --git a/.travis.yml b/.travis.yml
index 219bc38f6f..a409071d64 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -140,7 +140,7 @@ matrix:
   #     - cat .kitchen/logs/kitchen.log
   #   env:
   #     - AMAZON=LATEST
-  #     - KITCHEN_YAML=.kitchen.travis.yml
+  #     - KITCHEN_YAML=kitchen.travis.yml
   - rvm: 2.4.5
     services: docker
     sudo: required
@@ -157,7 +157,7 @@ matrix:
       - cat .kitchen/logs/kitchen.log
     env:
       - UBUNTU=14.04
-      - KITCHEN_YAML=.kitchen.travis.yml
+      - KITCHEN_YAML=kitchen.travis.yml
   - rvm: 2.4.5
     services: docker
     sudo: required
@@ -174,7 +174,7 @@ matrix:
       - cat .kitchen/logs/kitchen.log
     env:
       - UBUNTU=16.04
-      - KITCHEN_YAML=.kitchen.travis.yml
+      - KITCHEN_YAML=kitchen.travis.yml
   - rvm: 2.4.5
     services: docker
     sudo: required
@@ -191,7 +191,7 @@ matrix:
       - cat .kitchen/logs/kitchen.log
     env:
       - DEBIAN=7
-      - KITCHEN_YAML=.kitchen.travis.yml
+      - KITCHEN_YAML=kitchen.travis.yml
   - rvm: 2.4.5
     services: docker
     sudo: required
@@ -208,7 +208,7 @@ matrix:
       - cat .kitchen/logs/kitchen.log
     env:
       - DEBIAN=8
-      - KITCHEN_YAML=.kitchen.travis.yml
+      - KITCHEN_YAML=kitchen.travis.yml
   - rvm: 2.4.5
     services: docker
     sudo: required
@@ -225,7 +225,7 @@ matrix:
       - cat .kitchen/logs/kitchen.log
     env:
       - DEBIAN=9
-      - KITCHEN_YAML=.kitchen.travis.yml
+      - KITCHEN_YAML=kitchen.travis.yml
   - rvm: 2.4.5
     services: docker
     sudo: required
@@ -242,7 +242,7 @@ matrix:
       - cat .kitchen/logs/kitchen.log
     env:
       - CENTOS=6
-      - KITCHEN_YAML=.kitchen.travis.yml
+      - KITCHEN_YAML=kitchen.travis.yml
   - rvm: 2.4.5
     services: docker
     sudo: required
@@ -259,7 +259,7 @@ matrix:
       - cat .kitchen/logs/kitchen.log
     env:
       - CENTOS=7
-      - KITCHEN_YAML=.kitchen.travis.yml
+      - KITCHEN_YAML=kitchen.travis.yml
   - rvm: 2.4.5
     services: docker
     sudo: required
@@ -276,7 +276,7 @@ matrix:
      - cat .kitchen/logs/kitchen.log
     env:
      - FEDORA=latest
-     - KITCHEN_YAML=.kitchen.travis.yml
+     - KITCHEN_YAML=kitchen.travis.yml
   - rvm: 2.4.5
     services: docker
     sudo: required
@@ -293,7 +293,7 @@ matrix:
      - cat .kitchen/logs/kitchen.log
     env:
      - OPENSUSELEAP=42
-     - KITCHEN_YAML=.kitchen.travis.yml
+     - KITCHEN_YAML=kitchen.travis.yml
 #  - rvm: 2.4.5
 #    services: docker
 #    sudo: required
@@ -310,7 +310,7 @@ matrix:
 #      - cat .kitchen/logs/kitchen.log
 #    env:
 #      - AWESOME_CUSTOMERS_UBUNTU=1
-#      - KITCHEN_YAML=.kitchen.travis.yml
+#      - KITCHEN_YAML=kitchen.travis.yml
 #  - rvm: 2.4.5
 #    services: docker
 #    sudo: required
@@ -327,7 +327,7 @@ matrix:
 #      - cat .kitchen/logs/kitchen.log
 #    env:
 #      - AWESOME_CUSTOMERS_RHEL=1
-#      - KITCHEN_YAML=.kitchen.travis.yml
+#      - KITCHEN_YAML=kitchen.travis.yml
 #    ### END TEST KITCHEN ONLY ###
   - rvm: 2.4.5
     sudo: required
diff --git a/Gemfile.lock b/Gemfile.lock
index e46e7c0602..5259d1c3ca 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -11,6 +11,7 @@ PATH
       ffi-yajl (~> 2.2)
       highline (~> 1.6, >= 1.6.9)
       iniparse (~> 1.4)
+      iso8601 (~> 0.12.1)
       mixlib-archive (~> 0.4)
       mixlib-authentication (~> 1.4)
       mixlib-cli (~> 1.7)
diff --git a/chef-universal-mingw32.gemspec b/chef-universal-mingw32.gemspec
index 1cd6dee2f3..ffa84f7f88 100644
--- a/chef-universal-mingw32.gemspec
+++ b/chef-universal-mingw32.gemspec
@@ -15,7 +15,6 @@ gemspec.add_dependency "win32-process", "~> 0.8.2"
 gemspec.add_dependency "win32-service", "~> 1.0"
 gemspec.add_dependency "windows-api", "~> 0.4.4"
 gemspec.add_dependency "wmi-lite", "~> 1.0"
-gemspec.add_dependency "iso8601", "~> 0.12.1"
 gemspec.extensions << "ext/win32-eventlog/Rakefile"
 gemspec.files += Dir.glob("{distro,ext}/**/*")
 
diff --git a/chef.gemspec b/chef.gemspec
index 8359432f15..a489691485 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
   s.add_dependency "plist", "~> 3.2"
   s.add_dependency "iniparse", "~> 1.4"
   s.add_dependency "addressable"
+  s.add_dependency "iso8601", "~> 0.12.1"
 
   # Audit mode requires these, so they are non-developmental dependencies now
   %w{rspec-core rspec-expectations rspec-mocks}.each { |gem| s.add_dependency gem, "~> 3.5", "< 3.8" }
diff --git a/kitchen-tests/Berksfile b/kitchen-tests/Berksfile
index e7438cd1d5..50e09ebf3b 100644
--- a/kitchen-tests/Berksfile
+++ b/kitchen-tests/Berksfile
@@ -1,3 +1,3 @@
 source "https://supermarket.chef.io"
 
-cookbook "end_to_end", path: "cookbooks/end_to_end"
\ No newline at end of file
+cookbook "end_to_end", path: "cookbooks/end_to_end"
diff --git a/lib/chef/provider/windows_task.rb b/lib/chef/provider/windows_task.rb
index ce0e72a389..d8f9094fd1 100644
--- a/lib/chef/provider/windows_task.rb
+++ b/lib/chef/provider/windows_task.rb
@@ -18,7 +18,7 @@
 
 require "chef/mixin/shell_out"
 require "rexml/document"
-require "iso8601" if Chef::Platform.windows?
+require "iso8601"
 require "chef/mixin/powershell_out"
 
 class Chef