Ok.
On Jun 16, 2010, at 2:17 PM, Matt Robinson wrote:
I don't think this breaks anyone's expectations since this doesn't
affect anything external facing like an API, and if anything I'm
sure other are tired of seeing this warning sprinkled through their
test runs and puppet logs too. It sucks that we're having to make
this change in response to a change in something external, but we've
also discussed that we shouldn't be requiring active_record so early
in the code anyway.
On Wed, Jun 16, 2010 at 11:52 AM, Luke Kanies <[email protected]>
wrote:
Isn't it a bad idea to make this fix in 0.25.5? That is, this isn't
a real bug, is it? If not, then thixing this breaks people's
expectations for this release cycle.
On Jun 16, 2010, at 1:32 PM, Matt Robinson wrote:
I fixed this in a commit for 0.25.x branch, but there were some
files in
master that didn't exist in 0.25.x when I first made this change.
Signed-off-by: Matt Robinson <[email protected]>
---
spec/unit/parser/scope.rb | 4 ++--
spec/unit/util/logging.rb | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/spec/unit/parser/scope.rb b/spec/unit/parser/scope.rb
index 7093279..f21f09e 100755
--- a/spec/unit/parser/scope.rb
+++ b/spec/unit/parser/scope.rb
@@ -65,14 +65,14 @@ describe Puppet::Parser::Scope do
mod = Module.new
Puppet
::Parser::Functions.expects(:environment_module).with(env).returns mod
- Puppet::Parser::Scope.new(:compiler =>
compiler).metaclass.ancestors.should be_include(mod)
+ Puppet::Parser::Scope.new(:compiler =>
compiler).singleton_class.ancestors.should be_include(mod)
end
it "should extend itself with the default Functions module if
it has no environment" do
mod = Module.new
Puppet
::Parser::Functions.expects(:environment_module).with(nil).returns mod
- Puppet::Parser::Scope.new().metaclass.ancestors.should
be_include(mod)
+
Puppet::Parser::Scope.new().singleton_class.ancestors.should
be_include(mod)
end
end
diff --git a/spec/unit/util/logging.rb b/spec/unit/util/logging.rb
index d6c38fd..aee308e 100755
--- a/spec/unit/util/logging.rb
+++ b/spec/unit/util/logging.rb
@@ -76,7 +76,7 @@ describe Puppet::Util::Logging do
[:file, :line, :version, :tags].each do |attr|
it "should include #{attr} if available" do
- @logger.metaclass.send(:attr_accessor, attr)
+ @logger.singleton_class.send(:attr_accessor, attr)
@logger.send(attr.to_s + "=", "myval")
--
1.7.1
--
You received this message because you are subscribed to the Google
Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected]
.
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en
.
--
I don't deserve this award, but I have arthritis and I don't deserve
that either. -- Jack Benny
---------------------------------------------------------------------
Luke Kanies -|- http://puppetlabs.com -|- +1(615)594-8199
--
You received this message because you are subscribed to the Google
Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected]
.
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en
.
--
You received this message because you are subscribed to the Google
Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected]
.
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en
.
--
If you can't be a good example, then you'll just have to be a
horrible warning. -- Catherine Aird
---------------------------------------------------------------------
Luke Kanies -|- http://puppetlabs.com -|- +1(615)594-8199
--
You received this message because you are subscribed to the Google Groups "Puppet
Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
