summaryrefslogtreecommitdiff
path: root/spec
AgeCommit message (Collapse)Author
2012-08-10Merge branch '2.4.x'Patrick Carlisle
* 2.4.x: (Maint) use PuppetlabsSpec::PuppetInternals.scope (master) Disable tests that fail on 2.6.x due to #15912
2012-08-10(Maint) use PuppetlabsSpec::PuppetInternals.scope (master)Jeff McCune
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-08-10Merge branch '2.3.x' into 2.4.xPatrick Carlisle
* 2.3.x: Disable tests that fail on 2.6.x due to #15912
2012-08-10Merge branch '2.2.x' into 2.3.xPatrick Carlisle
* 2.2.x: Disable tests that fail on 2.6.x due to #15912
2012-08-10Disable tests that fail on 2.6.x due to #15912Patrick Carlisle
In Puppet 2.6.x there is a bug where a function may be incorrectly detected as an rvalue when it is not, or not detected when it is. This means that in tests the correct syntax for calling a function will be rejected. This disables those tests on 2.6.x, as there is no straightforward way to write them to be compatible with both 2.6.x and newer versions of Puppet.
2012-08-09Merge branch '2.4.x'Patrick Carlisle
* 2.4.x: Make sure functions are loaded for each test Use rvalue functions correctly (#2157) Make facts_dot_d compatible with external facts Conflicts: lib/facter/facter_dot_d.rb
2012-08-09Merge branch '2.3.x' into 2.4.xPatrick Carlisle
* 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-09Make sure functions are loaded for each testPatrick Carlisle
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-09Merge branch '2.2.x' into 2.3.xPatrick Carlisle
* 2.2.x: Use rvalue functions correctly
2012-08-09Use rvalue functions correctlyPatrick Carlisle
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-07-23(Maint) use PuppetlabsSpec::PuppetInternals.scope (master)Jeff McCune
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-23Merge branch '2.3.x'Jeff McCune
* 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(Maint) Don't mock with mochaJeff McCune
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(Maint) Fix up the get_module_path parser functionJeff McCune
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(Maint) use PuppetlabsSpec::PuppetSeams.parser_scope (2.3.x)Jeff McCune
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-23Merge branch '2.2.x' into maint/2.3.x/merge_up_2.2.xJeff McCune
* 2.2.x: (Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals} (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope (Maint) Fix interpreter lines
2012-07-23(Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}Jeff McCune
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-19(Maint) use PuppetlabsSpec::PuppetSeams.parser_scopeJeff McCune
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(Maint) Fix interpreter linesJeff McCune
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-06-26Merge pull request #73 from branan/use_spechelper_gemChris Price
Update for new gem version of puppetlabs_spec_helper
2012-06-07Add support for a 'match' parameter to file_lineChris Price
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-05-31Require the new puppetlabs_spec_helper gem nameBranan Purvine-Riley
2012-05-29Update for new gem version of puppetlabs_spec_helperBranan Purvine-Riley
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-11Fix spec tests using the new spec_helperJeff McCune
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-10Merge branch '2.3.x'Jeff McCune
* 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-10Make file_line default to ensure => presentJeff McCune
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-10Memoize file_line spec instance variablesJeff McCune
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-10Fix spec tests using the new spec_helperJeff McCune
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-04-11(#13693) moving logic from local spec_helper to puppetlabs_spec_helperChris Price
This should simplify future compatibility between various versions of stdlib and various versions of puppet core.
2012-04-04Revert "Merge remote-tracking branch ↵Jeff McCune
'eshamow/tickets/bug/13595_restrict_initialize_everything_for_tests' into 2.2.x" This reverts commit 40da421c0480f940638d0db9aabf180500d6ae5c, reversing changes made to 69465b0f3e0c0c5284812bfa76ab8d3c254d10a9.
2012-04-03(#13595) initialize_everything_for_tests couples modules Puppet verEric Shamow
Replace regex used in spec_helper.rb to disallow both Puppet 2.6 and any 2.7 prior to 13.
2012-03-29Merge branch '2.3.x' into 2.4.xJeff McCune
* 2.3.x: (#13439) Fix MRI 1.9 issue with spec_helper
2012-03-29Merge branch '2.2.x' into 2.3.xJeff McCune
* 2.2.x: (#13439) Fix MRI 1.9 issue with spec_helper
2012-03-29(#13439) Fix MRI 1.9 issue with spec_helperJeff McCune
When using MRI 1.9.x the stdlib spec helper does not invoke because Puppet.settings.private_methods returns symbols instead of strings. This is a problem because we need to set default configuration settings like Puppet[:vardir] when using the compiler. This patch fixes the issue by simply checking the Puppet version. This seems a better choice than rescuing NoMethodError since the method might be renamed or removed in the future.
2012-03-29Merge branch '2.3.x' into 2.4.xJeff McCune
* 2.3.x: (#13439) Fix test failures with Puppet 2.6.x (#13439) refactor spec helper for compatibility with both puppet 2.7 and master
2012-03-29Merge branch '2.2.x' into 2.3.xJeff McCune
* 2.2.x: (#13439) Fix test failures with Puppet 2.6.x
2012-03-29(#13439) Fix test failures with Puppet 2.6.xJeff McCune
Without this patch the spec_helper sends a message named initialize_everything_for_tests to Puppet.settings. This is a problem because Puppet 2.6.x does not have this method, only Puppet 2.7.x and Puppet master have this method at this time and we're getting false positive test failures. This patch fixes the problem by looking before we leap. We test if the private method exists before calling it. This works with Ruby 1.8.5 and onwards and Puppet 2.6, 2.7 and master. This should fix all of the failures I've caused in Jenkins today.
2012-03-29Merge branch '2.2.x' into 2.3.xJeff McCune
* 2.2.x: (#13439) refactor spec helper for compatibility with both puppet 2.7 and master
2012-03-29(#13439) refactor spec helper for compatibility with both puppet 2.7 andcprice
master
2012-03-29Merge pull request #53 from traylenator/fqdn_rotateJeff McCune
(#13205) Rotate array/string randomley based on fqdn, fqdn_rotate()
2012-03-29Merge branch '2.2.x' into 2.3.xJeff McCune
* 2.2.x: (#13494) Specify the behavior of zero padded strings Update CHANGELOG, Modulefile for 2.1.3 Conflicts: CHANGELOG Modulefile
2012-03-29(#13494) Specify the behavior of zero padded stringsJeff McCune
Without this patch the specified behavior of strings that are numeric only and zero padded is unclear and untested in the spec tests. This is a problem because it's not clear that range('00', '10') will actually return [ "0", "1", ..., "10" ] instead of [ "00", "01", ..., "10" ] This patch addresses the issue by providing explicit test coverage. If the string conversion behavior of puppet changes, this test will begin to fail.
2012-03-18(#13205) Rotate array/string randomley based on fqdn, fqdn_rotate()Steve Traylen
2012-03-12(#12357) Fix broken compatibility with Puppet 2.6Jeff McCune
Without this patch, the previous change set to the validate_absolute_path() parser function contains Puppet 2.6 incompatible changes. stdlib 2.x is compatible with Puppet 2.6. These changes are a problem because we cannot introduce backwards incompatible changes in a minor release. This patch fixes the problem by back porting the implementation of the `Puppet::Util.absolute_path?` from 2.7.x to the function block itself. The function block tests to see if `Puppet::Util.absolute_path?` will respond and if not, falls back to the inline back ported implementation. The spec tests have been updated to simulate the behavior of Puppet 2.6 even when running with Puppet 2.7.
2012-03-07(#12357) Add ability to display an error message from validate_reJeff McCune
I've seen a number of times the following error displayed to the end user: validate_re(): "" does not match "^true$|^false$" at /p/t/f.pp:40 This is an absolutely horrific error message. I'm to blame for it. Users stumble over this quite often and they shouldn't have to go read the code to sort out what's happening. This patch makes an effort to fix the problem by adding a third, optional, argument to validate_re(). This third argument will be the message thrown back in the exception which will be displayed to the end user. This sets the stage for nicer error messages coming from modules we write. This patch is backwards compatible but is a new feature.
2012-03-07(#12357) Add validate_absolute_path() functionJeff McCune
This patch adds a new function to validate if a string is an absolute filesystem path or not. The intent of this is to make this functionality generic and reusable. Josh left a comment in another pull request I had: If node_installdir or $node_vardir is not defined, then we should raise an error, otherwise we may create a scheduled task to an untrusted directory. One solution to this comment is to validate the Puppet variable is an absolute path. Examples of this function look like: function_validate_absolute_path Using Puppet::Parser::Scope.new Garbage inputs validate_absolute_path(nil) should fail validate_absolute_path([nil]) should fail validate_absolute_path({"foo"=>"bar"}) should fail validate_absolute_path({}) should fail validate_absolute_path("") should fail relative paths validate_absolute_path("relative1") should fail validate_absolute_path(".") should fail validate_absolute_path("..") should fail validate_absolute_path("./foo") should fail validate_absolute_path("../foo") should fail validate_absolute_path("etc/puppetlabs/puppet") should fail validate_absolute_path("opt/puppet/bin") should fail absolute paths validate_absolute_path("C:/") should not fail validate_absolute_path("C:\\") should not fail validate_absolute_path("C:\\WINDOWS\\System32") should not fail validate_absolute_path("C:/windows/system32") should not fail validate_absolute_path("X:/foo/bar") should not fail validate_absolute_path("X:\\foo\\bar") should not fail validate_absolute_path("/var/tmp") should not fail validate_absolute_path("/var/lib/puppet") should not fail validate_absolute_path("/var/opt/../lib/puppet") should not fail validate_absolute_path("C:\\Program Files (x86)\\Puppet Labs\\Puppet Enterprise") should not fail validate_absolute_path("C:/Program Files (x86)/Puppet Labs/Puppet Enterprise") should not fail Finished in 0.05637 seconds 23 examples, 0 failures
2012-03-07(maint) Stop printing the directory of spec_helperJeff McCune
Without this patch every rspec run prints out the directory of the spec_helper script. I think this was just a debugging line or whatever that accidentally got added.
2012-03-06Merge pull request #44 from ↵Josh Cooper
jeffmccune/ticket/2.3.x/12357_add_puppet_settings_facts (#12357) Make facter_dot_d look in Puppet[:confdir]/facts.d
2012-03-05(#12357) Add puppet_vardir custom factJeff McCune
Without this patch the PE modules don't have a way to identify a filesystem path where it's OK to place variable data related to managing the target node. This is a problem when a module like pe_compliance needs to write a wrapper script to the node's filesystem. This patch addresses the problem by exposing the node's Puppet[:vardir] setting as a Facter fact. This fact value will be set to `nil` if Puppet is not loaded into memory. If Puppet is loaded, e.g. using `facter --puppet` or using `puppet agent` or `puppet apply` then the fact will automatically set the value to Puppet[:vardir] The value of this setting is subject to Puppet's run_mode. This patch implements a new utility method in the standard library module named `Facter::Util::PuppetSettings.with_puppet`. The method accepts a block and will only invoke the block if the Puppet library is loaded into the Ruby process. If Puppet is not loaded, the method always returns nil. This makes it easy to define Facter facts that only give values if Puppet is loaded in memory.
2012-03-05(#12357) Fix root_home fact on WindowsJeff McCune
Without this patch the root_home fact fails on windows. This patch fixes the problem by only calling methods on the object returned by the `getent passwd root` command if the object evaluates to true. Because there is no root account on Windows the code block simply returns `nil` which makes the Facter fact undefined on Windows platforms. The root cause of the failure is that we always expected the command to succeed and return something useful, and it may not on all supported platforms.