Merge pull request #2193 from opscode/sersut/no-lwrp-class-reload

Don't override LWRP resources or providers anymore in Chef 12.

4 files changed, 21 insertions, 17 deletions

diff --git a/spec/data/lwrp/providers/buck_passer.rb b/spec/data/lwrp/providers/buck_passer.rb
index 1f83e5098b..8d5156af81 100644
--- a/spec/data/lwrp/providers/buck_passer.rb
+++ b/spec/data/lwrp/providers/buck_passer.rb
@@ -1,3 +1,10 @@
-action :buck_stops_here do
-  log "This should be overwritten by ../lwrp_override/buck_passer.rb"
+action :pass_buck do
+  lwrp_foo :prepared_thumbs do
+    action :prepare_thumbs
+    provider :lwrp_thumb_twiddler
+  end
+  lwrp_foo :twiddled_thumbs do
+    action :twiddle_thumbs
+    provider :lwrp_thumb_twiddler
+  end
 end
diff --git a/spec/data/lwrp/resources/foo.rb b/spec/data/lwrp/resources/foo.rb
index c881c80530..0ee83f0cd0 100644
--- a/spec/data/lwrp/resources/foo.rb
+++ b/spec/data/lwrp/resources/foo.rb
@@ -1,3 +1,4 @@
-actions :never_execute
+actions :prepare_thumbs, :twiddle_thumbs
+default_action :pass_buck
 
-attribute :ever, :kind_of => String
+attribute :monkey, :kind_of => String
diff --git a/spec/data/lwrp_override/providers/buck_passer.rb b/spec/data/lwrp_override/providers/buck_passer.rb
index 75917a58c9..2061b391dc 100644
--- a/spec/data/lwrp_override/providers/buck_passer.rb
+++ b/spec/data/lwrp_override/providers/buck_passer.rb
@@ -1,10 +1,5 @@
-action :pass_buck do
-  lwrp_foo :prepared_thumbs do
-    action :prepare_thumbs
-    provider :lwrp_thumb_twiddler
-  end
-  lwrp_foo :twiddled_thumbs do
-    action :twiddle_thumbs
-    provider :lwrp_thumb_twiddler
-  end
-end
\ No newline at end of file
+# Starting with Chef 12 reloading an LWRP shouldn't reload the file anymore
+
+action :buck_stops_here do
+  log "This should be overwritten by ../lwrp_override/buck_passer.rb"
+end
diff --git a/spec/data/lwrp_override/resources/foo.rb b/spec/data/lwrp_override/resources/foo.rb
index 0ee83f0cd0..14decb9634 100644
--- a/spec/data/lwrp_override/resources/foo.rb
+++ b/spec/data/lwrp_override/resources/foo.rb
@@ -1,4 +1,5 @@
-actions :prepare_thumbs, :twiddle_thumbs
-default_action :pass_buck
+# Starting with Chef 12 reloading an LWRP shouldn't reload the file anymore
 
-attribute :monkey, :kind_of => String
+actions :never_execute
+
+attribute :ever, :kind_of => String