Skip to content

Commit adb4662

Browse files
committed
(PUP-11022) Fix generator type collision
The additional_resource_generator_spec.rb test removes the `generator` type that both it and the transaction_spec.rb defined. Change the latter to register a different name. This resolves errors like: Failure/Error: Puppet::Type.type(:generator).new :title => "generator" } NoMethodError: undefined method `new' for nil:NilClass
1 parent f6c6fac commit adb4662

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

spec/unit/transaction/additional_resource_generator_spec.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ def generate()
9393
end
9494
end
9595

96-
97-
9896
after(:each) do
9997
Puppet::Type.rmtype(:gen_empty)
10098
Puppet::Type.rmtype(:eval_after)

spec/unit/transaction_spec.rb

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@
55
require 'puppet/transaction'
66
require 'fileutils'
77

8-
Puppet::Type.newtype(:generator) do
9-
newparam(:name) { isnamevar }
10-
11-
def generate
12-
end
13-
end
14-
158
describe Puppet::Transaction do
169
include PuppetSpec::Files
1710
include PuppetSpec::Compiler
@@ -27,6 +20,19 @@ def transaction_with_resource(resource)
2720
transaction
2821
end
2922

23+
before(:all) do
24+
Puppet::Type.newtype(:transaction_generator) do
25+
newparam(:name) { isnamevar }
26+
27+
def generate
28+
end
29+
end
30+
end
31+
32+
after(:all) do
33+
Puppet::Type.rmtype(:transaction_generator)
34+
end
35+
3036
before do
3137
@basepath = make_absolute("/what/ever")
3238
@transaction = Puppet::Transaction.new(Puppet::Resource::Catalog.new, nil, Puppet::Graph::SequentialPrioritizer.new)
@@ -330,9 +336,9 @@ def transaction_with_resource(resource)
330336
describe "when generating resources before traversal" do
331337
let(:catalog) { Puppet::Resource::Catalog.new }
332338
let(:transaction) { Puppet::Transaction.new(catalog, nil, Puppet::Graph::SequentialPrioritizer.new) }
333-
let(:generator) { Puppet::Type.type(:generator).new :title => "generator" }
339+
let(:generator) { Puppet::Type.type(:transaction_generator).new :title => "generator" }
334340
let(:generated) do
335-
%w[a b c].map { |name| Puppet::Type.type(:generator).new(:name => name) }
341+
%w[a b c].map { |name| Puppet::Type.type(:transaction_generator).new(:name => name) }
336342
end
337343

338344
before :each do
@@ -673,7 +679,7 @@ def transaction_with_resource(resource)
673679
end
674680

675681
describe "and new resources are generated" do
676-
let(:generator) { Puppet::Type.type(:generator).new :title => "generator" }
682+
let(:generator) { Puppet::Type.type(:transaction_generator).new :title => "generator" }
677683
let(:generated) do
678684
%w[a b c].map { |name| Puppet::Type.type(:package).new :title => "foo", :name => name, :provider => :apt }
679685
end

0 commit comments

Comments
 (0)