On Sep 19, 2008, at 11:12 AM, Paul Nasrat wrote:
>
>
> On 19 Sep 2008, at 16:59, Luke Kanies wrote:
>
>>
>> Can you compare this to the current state of the class in the master
>> branch?
>
> Sure.
>
> Looking at the code it looks as the issue fixed in this patch is
> present there too:
>
> master is at:
> 5b9dd01326a61b9ae89ae978e29a8170f76deb5e Merge commit 'turnbull/
> 0.24.x'
>
> If I just apply the rspec part of the patch I get the failures the
> fixes fixup:
>
> 1)
> TypeError in 'Puppet::FileServing::Metadata when collecting attributes
> when managing files should give a mtime checksum when checksum_type is
> set'
> can't convert nil into String
> /Users/pnasrat/Development/puppet/lib/puppet/file_serving/metadata.rb:
> 63:in `+'
> /Users/pnasrat/Development/puppet/lib/puppet/file_serving/metadata.rb:
> 63:in `collect_attributes'
> ./unit/file_serving/metadata.rb:106:
> /Users/pnasrat/Development/puppet/spec/monkey_patches/
> add_confine_and_runnable_to_rspec_dsl.rb:19:in `run'
> /Users/pnasrat/Development/puppet/spec/monkey_patches/
> add_confine_and_runnable_to_rspec_dsl.rb:17:in `each'
> /Users/pnasrat/Development/puppet/spec/monkey_patches/
> add_confine_and_runnable_to_rspec_dsl.rb:17:in `run'
>
> 2)
> 'Puppet::FileServing::Metadata when collecting attributes when
> managing directories should only use checksums of type 'ctime' for
> directories even if checksum_type set' FAILED
> expected: "{ctime}Fri Sep 19 17:08:19 +0100 2008",
> got: "{mtime}" (using ==)
> ./unit/file_serving/metadata.rb:131:
> /Users/pnasrat/Development/puppet/spec/monkey_patches/
> add_confine_and_runnable_to_rspec_dsl.rb:19:in `run'
> /Users/pnasrat/Development/puppet/spec/monkey_patches/
> add_confine_and_runnable_to_rspec_dsl.rb:17:in `each'
> /Users/pnasrat/Development/puppet/spec/monkey_patches/
> add_confine_and_runnable_to_rspec_dsl.rb:17:in `run'
>
> Finished in 0.069676 seconds
>
> 1 - is due to the fact that we try and concat an instance of time
> without to_s
> 2 - is due to the fact that we loosely match on /time/ not ctime
>
> My patch applies cleanly onto master.
>
>> I thought this was all working in master; if it's not, I'd obviously
>> want to merge the fix, but if it is, I'd prefer to backport the fix
>> rather than creating a similar but not-quite-the-same fix in 0.24.x.
>
> I'm really having a hard time seeing how it would - the flow is pretty
> much the same and suffers from the same problem that the fileserver
> doesn't know what the client has set as checksum as far as I can see.
I'll just wait to have this merged into master from 0.24.x, then.
--
Censorship, like charity, should begin at home; but, unlike charity, it
should end there. --Clare Booth Luce
---------------------------------------------------------------------
Luke Kanies | http://reductivelabs.com | http://madstop.com
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
