summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-23Merge pull request #81 from jeffmccune/maint/2.2.x/rename_seams_to_internalsJeff McCune
(Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}
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-19Merge branch 'fix/2.2.x/make_it_green' into 2.2.xJeff McCune
* fix/2.2.x/make_it_green: (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope (Maint) Fix interpreter lines
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-07-12Merge pull request #77 from ↵Jeff McCune
hkenney/ticket/2.4.x/2157_add_external_fact_compatibility (#2157) Make facts_dot_d compatible with external facts
2012-07-10(#2157) Make facts_dot_d compatible with external factsHailee Kenney
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-05-23Update CHANGELOG, Modulefile for 2.3.3Jeff McCune
2012-05-23Merge pull request #70 from duritong/2.3.xJeff McCune
fix regression in #11017 properly
2012-05-23fix regression in #11017 properlyPeter Meier
We need the defaultvalues for that.
2012-05-11Merge branch '2.2.x' into 2.3.xJeff McCune
* 2.2.x: Fix spec tests using the new spec_helper
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-10Update CHANGELOG for 2.3.2 releaseJeff McCune
2012-05-10Merge branch 'fix/2.3.x/file_line_ensure' into 2.3.xJeff McCune
* 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-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-13Merge branch '2.2.x' into 2.3.xJeff McCune
* 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-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-04Merge remote-tracking branch ↵Jeff McCune
'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-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-29Merge branch 'ticket/2.2.x/13439_fix_spec_helper_try3' into 2.2.xJeff McCune
* ticket/2.2.x/13439_fix_spec_helper_try3: (#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-29Merge branch 'ticket/2.2.x/13439_fix_spec_helper_try2' into 2.2.xJeff McCune
* ticket/2.2.x/13439_fix_spec_helper_try2: (#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-29Merge branch 'ticket/2.2.x/13439_fix_spec_helper' into 2.2.xJeff McCune
* ticket/2.2.x/13439_fix_spec_helper: (#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.3.x'Jeff McCune
* 2.3.x: (#13494) Specify the behavior of zero padded strings Update CHANGELOG, Modulefile for 2.1.3
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-29Merge branch '2.1.x' into 2.2.xJeff McCune
* 2.1.x: Update CHANGELOG, Modulefile for 2.1.3 Conflicts: CHANGELOG Modulefile
2012-03-29Merge branch 'maint/2.2.x/range_spec_tests' into 2.2.xJeff McCune
* maint/2.2.x/range_spec_tests: (#13494) Specify the behavior of zero padded strings
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-29Update CHANGELOG, Modulefile for 2.1.3Jeff McCune
2012-03-18(#13205) Rotate array/string randomley based on fqdn, fqdn_rotate()Steve Traylen
2012-03-13Merge branch '2.3.x'Jeff McCune
* 2.3.x: Update CHANGELOG and Modulefile for 2.3.1 (#13091) Fix LoadError exception with puppet apply
2012-03-13Update CHANGELOG and Modulefile for 2.3.1Jeff McCune
2012-03-13Merge pull request #50 from ↵Ken Barber
jeffmccune/ticket/2.3.x/13091_stdlib_throws_a_loaderror_when_running_with_puppet_apply (#13091) Fix LoadError exception with puppet apply
2012-03-13(#13091) Fix LoadError exception with puppet applyJeff McCune
Puppet apply does not add the stdlib lib directory to the $LOAD_PATH. This is a problem because the puppet_vardir fact requires the puppet_settings library to be available for the `with_puppet` utility method. Without this patch, puppet apply will result in the following error: $ puppet apply --modulepath=/vagrant/modules -e 'notice $puppet_vardir' warning: Could not load fact file stdlib/lib/facter/puppet_vardir.rb: no such file to load -- facter/util/puppet_settings notice: Scope(Class[main]): notice: Finished catalog run in 0.01 seconds With this patch applied, puppet apply works as expected: $ puppet apply --modulepath=/vagrant/modules.pe -e 'notice $puppet_vardir' notice: Scope(Class[main]): /Users/jeff/.puppet/var notice: Finished catalog run in 0.01 seconds This patch defensively tries to load facter/util/puppet_settings. If it cannot load it, it falls back to trying to explicitly locate and load the library. Once puppet is fixed such that a modules lib directory is truly in the $LOAD_PATH, the fall back implementation will no longer be exercised since the LoadError should not be raised.
2012-03-12Merge branch '2.3.x'Jeff McCune
* 2.3.x: Update CHANGELOG, Modulefile for 2.3.0 release
2012-03-12Update CHANGELOG, Modulefile for 2.3.0 releaseJeff McCune
2012-03-12Merge branch '2.3.x'Jeff McCune
* 2.3.x: (#12357) Fix broken compatibility with Puppet 2.6 (maint) Comment Ken's fix to String#any? (#13018) Fix missing method any? message for ruby 1.9.x (#12357) Add ability to display an error message from validate_re (#12357) Add validate_absolute_path() function (maint) Stop printing the directory of spec_helper (#12357) Make facter_dot_d look in Puppet[:confdir]/facts.d (#12357) Add puppet_vardir custom fact (#12357) Fix root_home fact on Windows
2012-03-12Merge pull request #49 from ↵Ken Barber
jeffmccune/bug/2.3.x/fix_absolute_path_error_with_puppet26 (#12357) Fix broken compatibility with Puppet 2.6
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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-07 07:34:33 +0000