Merge pull request #9993 from chef/snap

Disable snap dokken tests for now

3 files changed, 15 insertions, 11 deletions

diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/_snap.rb b/kitchen-tests/cookbooks/end_to_end/recipes/_snap.rb
index d062d27de6..0a4ba48a58 100644
--- a/kitchen-tests/cookbooks/end_to_end/recipes/_snap.rb
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/_snap.rb
@@ -1,14 +1,14 @@
-package 'snapd' do
+package "snapd" do
   action :upgrade
 end
 
-service 'snapd' do
+service "snapd" do
   action :start
 end
 
-execute 'sleep 5'
+execute "sleep 5"
 
-snap_package 'black' do
+snap_package "black" do
   action :upgrade
-  channel 'beta'
+  channel "beta"
 end
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb b/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb
index 063ce1726a..da5265359d 100644
--- a/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb
@@ -109,7 +109,6 @@ end
 
 include_recipe "::_apt" if platform_family?("debian")
 include_recipe "::_zypper" if suse?
-include_recipe "::_snap" if platform?("ubuntu")
 include_recipe "::_chef-vault" unless includes_recipe?("end_to_end::chef-vault")
 include_recipe "::_sudo"
 include_recipe "::_sysctl"
@@ -118,3 +117,7 @@ include_recipe "::_cron"
 include_recipe "::_ohai_hint"
 include_recipe "::_openssl"
 include_recipe "::_tests"
+
+# at the moment these do not run properly in docker
+# we need to investage if this is a snap on docker issue or a chef issue
+# include_recipe "::_snap" if platform?("ubuntu")
diff --git a/lib/chef/provider/package/snap.rb b/lib/chef/provider/package/snap.rb
index 7fdedd0078..7aaaf3f30f 100644
--- a/lib/chef/provider/package/snap.rb
+++ b/lib/chef/provider/package/snap.rb
@@ -140,7 +140,7 @@ class Chef
           # socket is /run/snapd.socket note - unixsocket is not defined on
           # windows systems
           if defined?(::UNIXSocket)
-            UNIXSocket.open('/run/snapd.socket') do |socket|
+            UNIXSocket.open("/run/snapd.socket") do |socket|
               # send request, read the response, split the response and parse
               # the body
               socket.write(request)
@@ -169,7 +169,7 @@ class Chef
               # - jaymzh
 
               Chef::Log.trace(
-                "snap_package[#{new_resource.package_name}]: reading headers",
+                "snap_package[#{new_resource.package_name}]: reading headers"
               )
               loop do
                 response = socket.readline
@@ -177,15 +177,16 @@ class Chef
               end
               Chef::Log.trace(
                 "snap_package[#{new_resource.package_name}]: past headers, " +
-                'onto the body...',
+                "onto the body..."
               )
               result = nil
-              body = ''
+              body = ""
               socket.each_char do |c|
                 body << c
                 # we know we're not done if we don't have a char that
                 # can end JSON
-                next unless ['}', ']'].include?(c)
+                next unless ["}", "]"].include?(c)
+
                 begin
                   result = JSON.parse(body)
                   # if we get here, we were able to parse the json so we