Commit graph

484 commits

Author SHA1 Message Date
Patrick Carlisle
cdd4529833 Merge branch '2.3.x' into 2.4.x
* 2.3.x:
  Make sure functions are loaded for each test
  Use rvalue functions correctly
  (Maint) Don't mock with mocha
  (Maint) Fix up the get_module_path parser function
  (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope (2.3.x)
  (Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}
  (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope
  (Maint) Fix interpreter lines
  Update CHANGELOG, Modulefile for 2.3.3
  fix regression in #11017 properly
  Fix spec tests using the new spec_helper
  Update CHANGELOG for 2.3.2 release
  Make file_line default to ensure => present
  Memoize file_line spec instance variables
  Fix spec tests using the new spec_helper
  Revert "Merge remote-tracking branch 'eshamow/tickets/bug/13595_restrict_initialize_everything_for_tests' into 2.2.x"
  (#13595) initialize_everything_for_tests couples modules Puppet ver
2012-08-09 14:52:08 -07:00
Patrick Carlisle
424b56da61 Make sure functions are loaded for each test
The test_helper code in Puppet now resets function state between each test.
This patch fixes two spec files where the function was not actually loaded in
the tests, causing them to fail.
2012-08-09 14:51:37 -07:00
Patrick Carlisle
94c96f8035 Merge branch '2.2.x' into 2.3.x
* 2.2.x:
  Use rvalue functions correctly
2012-08-09 14:51:33 -07:00
Patrick Carlisle
09322ad943 Use rvalue functions correctly
A bug fix in Puppet exposed that several tests were using rvalue functions
incorrectly (this was not properly checked by puppet before). This fixes those
tests.
2012-08-09 14:49:51 -07:00
Jeff McCune
15e13fb6b9 Merge branch 'fix/master/fix_scope_dependency'
* fix/master/fix_scope_dependency:
  (Maint) use PuppetlabsSpec::PuppetInternals.scope (master)
2012-07-23 16:11:08 -07:00
Jeff McCune
3c867cc331 (Maint) use PuppetlabsSpec::PuppetInternals.scope (master)
This patch is the same approach as the one that want into 2.3.x.  It
covers the functions in master that do not exist in 2.3.x.

Without this patch all of the spec tests for parser functions in stdlib
would instantiate their own scope instances.  This is a problem because
the standard library is tightly coupled with the internal behavior of
Puppet.  Tight coupling like this creates failures when we change the
internal behavior of Puppet.  This is exactly what happened recently
when we changed the method signature for the initializer of
Puppet::Parser::Scope instances.

This patch fixes the problem by creating scope instances using the
puppet labs spec helper.  The specific method that provides scope
instances in Puppet-version-independent way is something like this:

    let(:scope) { PuppetlabsSpec::PuppetInternals.scope }

This patch simply implements this across the board.

Paired-with: Andrew Parker <andy@puppetlabs.com>
2012-07-23 16:08:20 -07:00
Jeff McCune
243c7c2a49 Merge branch '2.3.x'
* 2.3.x:
  (Maint) Don't mock with mocha
  (Maint) Fix up the get_module_path parser function
  (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope (2.3.x)
  (Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}
  (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope
  (Maint) Fix interpreter lines

Conflicts:
	spec/spec_helper.rb
	spec/unit/puppet/parser/functions/get_module_path_spec.rb
2012-07-23 15:59:52 -07:00
Jeff McCune
effdfb8450 Merge branch 'maint/2.3.x/fix_rspec_puppet_load_order_issue' into 2.3.x
* maint/2.3.x/fix_rspec_puppet_load_order_issue:
  (Maint) Don't mock with mocha
2012-07-23 15:55:08 -07:00
Jeff McCune
fd2ce0d247 (Maint) Don't mock with mocha
Without this patch applied the stdlib module has load-order issues with mocha
and rspec-puppet.  The root cause has yet to be determined, but we've narrowed
it down to this description:

  "If any rspec-puppet example groups run before parser function example groups
   and the parser function example groups use mock() then you'll get this error:"

You can exercise this explicitly with:

    rspec -fd spec/unit/puppet/{provider,type,parser}

This will ensure rspec runs all of the provider and type spec tests, which are
rspec-puppet ones, before the parser function specs are run.  I should also
note we empted out the test in the file_line provider to be nothing except an
empty describe block and this was still sufficient to trigger the load order
error described here.

    Failures:

      1) function_get_module_path when locating a module should be able to find module paths from the modulepath setting
         Failure/Error: mod = mock("Puppet::Module")
         NoMethodError:
           undefined method `mock' for #<RSpec::Core::ExampleGroup::Nested_14::Nested_1:0x107b946c0>
         # ./spec/unit/puppet/parser/functions/get_module_path_spec.rb:21
         # ./spec/unit/puppet/parser/functions/get_module_path_spec.rb:29

      2) function_get_module_path when locating a module should be able to find module paths when the modulepath is a list
         Failure/Error: mod = mock("Puppet::Module")
         NoMethodError:
           undefined method `mock' for #<RSpec::Core::ExampleGroup::Nested_14::Nested_1:0x107b81ea8>
         # ./spec/unit/puppet/parser/functions/get_module_path_spec.rb:21
         # ./spec/unit/puppet/parser/functions/get_module_path_spec.rb:34

      3) function_get_module_path when locating a module should respect the environment
         Failure/Error: mod = mock("Puppet::Module")
         NoMethodError:
           undefined method `mock' for #<RSpec::Core::ExampleGroup::Nested_14::Nested_1:0x107b6e808>
         # ./spec/unit/puppet/parser/functions/get_module_path_spec.rb:21
         # ./spec/unit/puppet/parser/functions/get_module_path_spec.rb:40

    Finished in 1.53 seconds
    326 examples, 3 failures, 1 pending

Paired-with: Andrew Parker <andy@puppetlabs.com>
2012-07-23 15:47:51 -07:00
Jeff McCune
731c07e876 Merge pull request #80 from jeffmccune/fix/2.3.x/go_green
Fix up 2.3.x for new scope
2012-07-23 09:25:34 -07:00
Jeff McCune
c1297755d4 (Maint) Fix up the get_module_path parser function
This patch switches the spec tests for the get_module_path function to
use mock objects.  The underlying Puppet::Module.find method has
reasonable test coverage inside of Puppet core so we might as well break
the tight dependency while we're fixing up the specs to use the new
parser scope.

The behavior of the parser function itself should still have complete
coverage even though the tests have switched to mock the implementation
inside of Puppet.
2012-07-23 09:21:22 -07:00
Jeff McCune
98ff3abd09 (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope (2.3.x)
This patch is the same approach as the one that want into 2.2.x.  It
covers the functions in 2.3.x that do not exist in 2.2.x.

Without this patch all of the spec tests for parser functions in stdlib
would instantiate their own scope instances.  This is a problem because
the standard library is tightly coupled with the internal behavior of
Puppet.  Tight coupling like this creates failures when we change the
internal behavior of Puppet.  This is exactly what happened recently
when we changed the method signature for the initializer of
Puppet::Parser::Scope instances.

This patch fixes the problem by creating scope instances using the
puppet labs spec helper.  The specific method that provides scope
instances in Puppet-version-independent way is something like this:

    let(:scope) { PuppetlabsSpec::PuppetInternals.scope }

This patch simply implements this across the board.
2012-07-23 09:13:08 -07:00
Jeff McCune
f3caf5f493 Merge branch '2.2.x' into maint/2.3.x/merge_up_2.2.x
* 2.2.x:
  (Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}
  (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope
  (Maint) Fix interpreter lines
2012-07-23 09:00:11 -07:00
Jeff McCune
a1bab586ba Merge pull request #81 from jeffmccune/maint/2.2.x/rename_seams_to_internals
(Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}
2012-07-23 08:51:13 -07:00
Jeff McCune
99f084868b (Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}
The module PuppetlabsSpec::PuppetSeams has been renamed in the
puppetlabs_spec_helper gem to PuppetlabsSpec::PuppetInternals.

The method to obtain a scope object has also changed slightly.  Without
this patch the spec tests will fail because the stdlib module is not
aligned with the spec helper gem.  This patch fixes the problem by
matching up messages with their receivers in the spec helper library.

Paired-with: Andrew Parker <andy@puppetlabs.com>
2012-07-23 08:35:00 -07:00
Jeff McCune
6a63fdfa53 Merge branch 'fix/2.2.x/make_it_green' into 2.2.x
* fix/2.2.x/make_it_green:
  (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope
  (Maint) Fix interpreter lines
2012-07-19 16:36:26 -07:00
Jeff McCune
8a4e115ccb (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope
Without this patch all of the spec tests for parser functions in stdlib
would instantiate their own scope instances.  This is a problem because
the standard library is tightly coupled with the internal behavior of
Puppet.  Tight coupling like this creates failures when we change the
internal behavior of Puppet.  This is exactly what happened recently
when we changed the method signature for the initializer of
Puppet::Parser::Scope instances.

This patch fixes the problem by creating scope instances using the
puppet labs spec helper.  The specific method that provides scope
instances in Puppet-version-independent way is something like this:

 let(:scope) { PuppetlabsSpec::PuppetSeams.parser_scope }

This patch simply implements this across the board.
2012-07-19 16:24:57 -07:00
Jeff McCune
f604bae98c (Maint) Fix interpreter lines
This time around I actually know why I'm doing this thanks to the
reminder from Nick Lewis.

Ruby will replace itself in memory with the executable listed in the
interpreter line if the string "ruby" is not in there.

Since /usr/bin/env rspec doesn't contain the substring "ruby", you can't
actually run ruby -W1 or whatever on the file.

This patch fixes the problem by making sure "ruby" is present,
preventing ruby from replacing itself in memory.
2012-07-19 15:41:41 -07:00
Jeff McCune
c101da0b83 Merge pull request #77 from hkenney/ticket/2.4.x/2157_add_external_fact_compatibility
(#2157) Make facts_dot_d compatible with external facts
2012-07-12 18:07:50 -07:00
Jeff McCune
cc414a422d Merge branch 'hkenney-ticket/master/2157_remove_facts_dot_d'
* hkenney-ticket/master/2157_remove_facts_dot_d:
  (#2157) Update README about facts_dot_d
  (#2157) Remove facter_dot_d for compatibility with external facts
2012-07-12 18:03:59 -07:00
Jeff McCune
eb94e17635 (#2157) Update README about facts_dot_d 2012-07-12 17:51:55 -07:00
Hailee Kenney
5fb0ddcf78 (#2157) Make facts_dot_d compatible with external facts
Since facts_dot_d will eventually be removed and replaced by
external facts, warn users who are using a ttl on their external
facts that this feature will not be in Facter external facts.

Provide a link to a page explaining how to cache fact values
without the ttl functionality.
2012-07-10 15:24:33 -07:00
Hailee Kenney
f92574f79d (#2157) Remove facter_dot_d for compatibility with external facts
Since external facts does the same thing as facts_dot_d (except
allow ttl for external facts and allow some Windows executable
external facts), and external facts is the prefered solution,
remove facts_dot_d in the next major relase of stdlib.
2012-07-10 12:00:31 -07:00
Chris Price
29f8f89c19 Merge pull request #73 from branan/use_spechelper_gem
Update for new gem version of puppetlabs_spec_helper
2012-06-26 17:44:39 -07:00
Jeff McCune
e299ac6212 Merge pull request #75 from cprice-puppet/feature/master/regex-support-for-file-line
Add support for a 'match' parameter to file_line
2012-06-10 23:28:13 -07:00
Chris Price
9e0256aabf Add support for a 'match' parameter to file_line
This commit adds a new parameter called "match"
to the file_line resource type, and support for
this new parameter to the corresponding ruby
provider.

This parameter is optional; file_line should work
just as before if you do not specify this parameter...
so this change should be backwards-compatible.

If you do specify the parameter, it is treated
as a regular expression that should be used when
looking through the file for a line.  This allows
you to do things like find a line that begins with
a certain prefix (e.g., "foo=.*"), and *replace*
the existing line with the line you specify in your
"line" parameter.  Without this capability, if you
already had a line "foo=bar" in your file and your
"line" parameter was set to "foo=baz", you'd end up
with *both* lines in the final file.  In many cases
this is undesirable.
2012-06-07 09:09:14 -07:00
Branan Purvine-Riley
d9410f72e4 Require the new puppetlabs_spec_helper gem name 2012-05-31 09:10:27 -07:00
Branan Purvine-Riley
2247df4f6e Update for new gem version of puppetlabs_spec_helper
This updates the Rakefile and spec_helper to use the common versions
available in the puppetlabs_spec_helper rubygem branch. This mostly
just removes a bunch of duplicated code, but it also gives us more
flexibility in how the module is tested in the future.
2012-05-29 15:53:46 -07:00
Jeff McCune
cf7ac02860 Merge branch '2.3.x'
* 2.3.x:
  Update CHANGELOG, Modulefile for 2.3.3
2012-05-23 10:56:05 -07:00
Jeff McCune
730aee4ef9 Update CHANGELOG, Modulefile for 2.3.3 2012-05-23 10:52:41 -07:00
Jeff McCune
380f9b66fe Merge branch '2.3.x'
* 2.3.x:
  fix regression in #11017 properly
2012-05-23 10:47:16 -07:00
Jeff McCune
92e3e5c0ec Merge pull request #70 from duritong/2.3.x
fix regression in #11017 properly
2012-05-23 10:45:35 -07:00
Peter Meier
f0a62c7dba fix regression in #11017 properly
We need the defaultvalues for that.
2012-05-23 08:17:57 +02:00
Jeff McCune
8bada95b0d Merge branch '2.3.x'
* 2.3.x:
  Fix spec tests using the new spec_helper
2012-05-11 00:03:54 -07:00
Jeff McCune
b4343e67fd Merge branch '2.2.x' into 2.3.x
* 2.2.x:
  Fix spec tests using the new spec_helper
2012-05-11 00:03:31 -07:00
Jeff McCune
7d3433345e Fix spec tests using the new spec_helper
This patch back ports the file from the master branch.  The spec tests
fail without this patch applied.  This should make it easier to setup
Puppet settings using the puppet_spec_helper project.
2012-05-11 00:01:32 -07:00
Jeff McCune
e8e2a16ce5 Merge branch '2.3.x'
* 2.3.x:
  Update CHANGELOG for 2.3.2 release
  Make file_line default to ensure => present
  Memoize file_line spec instance variables
  Fix spec tests using the new spec_helper
2012-05-10 22:25:14 -07:00
Jeff McCune
beaa812e10 Update CHANGELOG for 2.3.2 release 2012-05-10 22:19:24 -07:00
Jeff McCune
fb43a6ff2f Merge branch 'fix/2.3.x/file_line_ensure' into 2.3.x
* fix/2.3.x/file_line_ensure:
  Make file_line default to ensure => present
  Memoize file_line spec instance variables
  Fix spec tests using the new spec_helper
2012-05-10 22:13:46 -07:00
Jeff McCune
1373e70639 Make file_line default to ensure => present
The examples in the file_line resource documentation state the following
resource should work:

    file_line { 'sudo_rule':
      path => '/etc/sudoers',
      line => '%sudo ALL=(ALL) ALL',
    }

Without this patch the example does not work because ensure is not set
to present.

This patch fixes the problem by setting the default value of ensure to
present.
2012-05-10 22:04:58 -07:00
Jeff McCune
20aacc5a29 Memoize file_line spec instance variables
This just changes the instance variables to a memoized let block and
gets ride of the before :each block.

The patch has no change in behavior.
2012-05-10 22:04:58 -07:00
Jeff McCune
1ebfa5daea Fix spec tests using the new spec_helper
This patch back ports the file from the master branch.  The spec tests
fail without this patch applied.  This should make it easier to setup
Puppet settings using the puppet_spec_helper project.
2012-05-10 22:04:58 -07:00
Jeff McCune
11156fd29a Merge branch '2.3.x'
* 2.3.x:
  Revert "Merge remote-tracking branch 'eshamow/tickets/bug/13595_restrict_initialize_everything_for_tests' into 2.2.x"
  (#13595) initialize_everything_for_tests couples modules Puppet ver
2012-04-13 09:57:26 -07:00
Jeff McCune
f84c02011f Merge branch '2.2.x' into 2.3.x
* 2.2.x:
  Revert "Merge remote-tracking branch 'eshamow/tickets/bug/13595_restrict_initialize_everything_for_tests' into 2.2.x"
  (#13595) initialize_everything_for_tests couples modules Puppet ver
2012-04-13 09:56:41 -07:00
Chris Price
83cdff9e05 Merge pull request #61 from cprice-puppet/ticket/master/13693-use-puppetlabs-spec-helper
(#13693) moving logic from local spec_helper to puppetlabs_spec_helper
2012-04-11 17:23:30 -07:00
Chris Price
85f96dfb24 (#13693) moving logic from local spec_helper to puppetlabs_spec_helper
This should simplify future compatibility between various versions
of stdlib and various versions of puppet core.
2012-04-11 10:13:24 -07:00
Jeff McCune
98aa06468a Revert "Merge remote-tracking branch 'eshamow/tickets/bug/13595_restrict_initialize_everything_for_tests' into 2.2.x"
This reverts commit 40da421c04, reversing
changes made to 69465b0f3e.
2012-04-04 08:56:35 -04:00
Jeff McCune
40da421c04 Merge remote-tracking branch 'eshamow/tickets/bug/13595_restrict_initialize_everything_for_tests' into 2.2.x
* eshamow/tickets/bug/13595_restrict_initialize_everything_for_tests:
  (#13595) initialize_everything_for_tests couples modules Puppet ver
2012-04-04 08:47:06 -04:00
Eric Shamow
3222f35de8 (#13595) initialize_everything_for_tests couples modules Puppet ver
Replace regex used in spec_helper.rb to disallow both Puppet 2.6 and any
2.7 prior to 13.
2012-04-03 23:26:36 -04:00
Jeff McCune
b9a33851d2 Merge branch '2.4.x'
* 2.4.x:
  (#13439) Fix MRI 1.9 issue with spec_helper
2012-03-29 23:21:09 -07:00