Can you squash this into the other patch, using rebase -i?
On May 4, 2009, at 11:01 AM, Francois Deppierraz wrote:

>
> Conflicts:
>
>       spec/unit/type/ssh_authorized_key.rb
>
> Signed-off-by: Francois Deppierraz <[email protected]>
> ---
> spec/unit/type/ssh_authorized_key.rb |    9 +++++++++
> 1 files changed, 9 insertions(+), 0 deletions(-)
>
> diff --git a/spec/unit/type/ssh_authorized_key.rb b/spec/unit/type/ 
> ssh_authorized_key.rb
> index db38986..f1e9963 100755
> --- a/spec/unit/type/ssh_authorized_key.rb
> +++ b/spec/unit/type/ssh_authorized_key.rb
> @@ -121,4 +121,13 @@ describe ssh_authorized_key do
>             resource.should(:target).should == target
>         end
>     end
> +
> +    describe "when calling validate" do
> +        it "should not crash on a non-existant user" do
> +            resource = @class.create(
> +                :name   => "Test",
> +                :user   => "ihopesuchuserdoesnotexist")
> +            proc { resource.validate }.should_not raise_error
> +        end
> +    end
> end
> -- 
> 1.6.0.4
>
>
> >


-- 
I happen to feel that the degree of a person's intelligence is directly
reflected by the number of conflicting attitudes she can bring to bear
on the same topic. -- Lisa Alther
---------------------------------------------------------------------
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
-~----------~----~----~----~------~----~------~--~---

Reply via email to