Commit graph

80 commits

Author SHA1 Message Date
Morgan Haskel
64a19f4d48 Merge pull request #222 from cyberious/CopyModuleTo
Remove deprecated puppet_module_install in favor of copy_module_to
2014-09-11 11:33:13 -04:00
Morgan Haskel
f81ef495e3 Fixing up tests 2014-09-10 19:11:28 -04:00
Morgan Haskel
5f17a26256 Merge branch '1.0.x' into test_merge
Conflicts:
	CHANGELOG.md
	Gemfile
	Modulefile
	README.markdown
	Rakefile
	files/concatfragments.sh
	manifests/setup.pp
	metadata.json
	spec/acceptance/backup_spec.rb
	spec/acceptance/concat_spec.rb
	spec/acceptance/empty_spec.rb
	spec/acceptance/fragment_source_spec.rb
	spec/acceptance/newline_spec.rb
	spec/acceptance/nodesets/centos-64-x64.yml
	spec/acceptance/nodesets/default.yml
	spec/acceptance/nodesets/fedora-18-x64.yml
	spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
	spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
	spec/acceptance/order_spec.rb
	spec/acceptance/replace_spec.rb
	spec/acceptance/symbolic_name_spec.rb
	spec/acceptance/warn_spec.rb
	spec/spec_helper_acceptance.rb
2014-09-10 15:03:35 -04:00
Travis Fields
968dac5a31 Remove deprecated puppet_module_install in favor of copy_module_to 2014-09-10 10:07:24 -07:00
Morgan Haskel
a6590ba98d There are no UNSUPPORTED_PLATFORMS defined for 1.1 2014-09-10 12:26:28 -04:00
Morgan Haskel
98d70da9fd 'wheel' is the root group for osx.
Conflicts:
	spec/acceptance/concat_spec.rb
	spec/acceptance/fragment_source_spec.rb
2014-09-09 23:34:08 -04:00
Morgan Haskel
166189dc25 Missed two stderr checks 2014-09-08 16:03:22 -04:00
Morgan Haskel
0acefbb79d Stop checking for empty stderr 2014-09-08 15:01:30 -04:00
Morgan Haskel
e015a1fdf7 Lack of idempotency with ensure => 'absent'
Need to add an unless to the exec in the case we have `ensure =>
'absent'` for the concat, otherwise the exec (of true) runs every time.
2014-09-08 14:24:29 -04:00
Morgan Haskel
52a75bc10c Update spec_helper for consistency 2014-08-28 11:26:34 -04:00
Axel Bock
b4e1c0c387 fix: permitting $backup to be a boolean value 2014-08-18 09:09:20 +02:00
Neil Prockter
ca8e036bac ensure concat file fragments are always replaced 2014-08-02 00:18:16 +01:00
Geoff Williams
0ce713fd9c fix concat broken on windows due to case sensitive regexp -- made it case insensitive 2014-07-09 13:45:16 +10:00
Colleen Murphy
2b51a83b9b Sync files 2014-06-25 17:23:15 -07:00
Morgan Haskel
90f70e86a3 'wheel' is the root group for osx. 2014-06-11 17:25:08 -04:00
Ashley Penney
f66ca3c1b7 Remove all the eq() checks as this breaks in PE3.3. 2014-06-02 16:10:29 -04:00
Joshua Hoblitt
8dedb6bffb Validate the concat::fragment order parameter as string||integer
This is to work around a validation issue that arises under the 3.x future
parser, as proper numeric types have been introduced (ie, not all scalar values
are strings).  Users have come to expect to to be able to pass in unquoted
integer values to the order parameter which will fail to validate as a string
when the future parser is enabled.
2014-05-29 13:07:16 -07:00
Joshua Hoblitt
a4abf6f142 enable the ruby concat script on Solaris
Per discussion on #174, Solaris 10 does not support the find/xargs
switches that were introduced in that PR (but Solaris 11 does).

+ add a shebang to concatfragments.rb
+ fix linter warnings/errors
2014-05-29 12:52:38 -07:00
Morgan Haskel
6b9e8ddc37 Add nodeset for ubuntu trusty. 2014-05-14 16:14:53 -04:00
Morgan Haskel
33b90b4fbc Fixes to get tests running on trusty. 2014-05-14 16:10:03 -04:00
Ashley Penney
8a1965ade9 Improve this so it works on Ubuntu 14.04. 2014-05-02 19:50:51 +02:00
Ashley Penney
a2df44a967 Fix newlines.
Previously the newline handling modified the actual fragments, causing
multiple runs to always update the newlines.  Handle this appropriately.
2014-04-21 18:36:59 -04:00
Ashley Penney
b4ba7dde50 Add in missing files to work around Puppet bug. 2014-03-03 21:45:21 +00:00
Hunter Haugen
1577ec78e1 Add windows as unsupported 2014-02-28 08:39:09 -08:00
Hunter Haugen
495619794e Correct the incorrect quotes 2014-02-27 16:07:01 -08:00
Hunter Haugen
d887c3b5f5 Lets can't be used outside of a test context 2014-02-27 15:50:18 -08:00
Hunter Haugen
f0b6187f76 Use tmpdir instead of /tmp for windows compatability 2014-02-27 14:52:53 -08:00
Hunter Haugen
311adee522 It is actually all Solaris 2014-02-27 14:20:42 -08:00
Hunter Haugen
f37805060f Correct syntax 2014-02-27 13:18:29 -08:00
Hunter Haugen
1f61e9d122 Avoid multi-line greps on solaris 10 2014-02-27 13:01:13 -08:00
Hunter Haugen
8b852e2b89 Fix aix/windows ownership issues and vardir path 2014-02-26 15:09:16 -08:00
Lucien Weller
a2f625f385 Added double quotes to paths in concat command, so that it does not fail when path of target file contains some blanks. 2014-02-24 15:02:32 +01:00
Hunter Haugen
3d625c9c28 This test is implemented incorrectly, and is testing an unimplemented feature.
So commenting it out
2014-02-22 17:15:56 -08:00
Hunter Haugen
600ddf0e43 Disable test for unimplemented feature 2014-02-21 15:35:36 -08:00
Hunter Haugen
e0a7ca97f0 Fix test port from 596cec1 2014-02-20 16:59:08 -08:00
Alex Dreyer
62795f8126 Switch test to use a much higher gid/uid
(cherry picked from commit ccf5284b56)
2014-02-14 13:42:10 -08:00
Alex Dreyer
ccf5284b56 Switch test to use a much higher gid/uid 2014-02-14 12:54:48 -08:00
Hunter Haugen
35c0d2354f Don't remove /tmp/concat in after :each
If the spec files are run in a random order, removing /tmp/concat after
certain tests could cause the next tests to fail if they do not recreate
this directory.

(cherry picked from commit 1edafdcf42)
2014-02-14 11:18:34 -08:00
Hunter Haugen
1edafdcf42 Don't remove /tmp/concat in after :each
If the spec files are run in a random order, removing /tmp/concat after
certain tests could cause the next tests to fail if they do not recreate
this directory.
2014-02-14 11:15:53 -08:00
Ashley Penney
596cec14be Port over acceptance tests from master. 2014-02-12 17:47:43 -05:00
Ashley Penney
b07f338f29 Fix ensure => absent with path => set.
The current code doesn't correctly account for an absent with a
path set, incorrectly trying to remove $name instead.  Fixing this
raised the issue that fragments left with no ensure will fail when
absent is set as the fragdir is deleted.

As a workaround for this we check the `ensure` parameter from the
concat{} resource with getparam() and then pass that to the fragment
if no specific ensure was passed in.  This effectively ensures
fragments inherit their parents ensure status.
2014-01-21 16:28:42 -05:00
Hunter Haugen
20e8d6e4f6 Convert specs to beaker and increase coverage 2014-01-16 16:49:30 -08:00
Joshua Hoblitt
8a500af5ee revert concat $warn/$warn_message param split + add deprecation warnings
Partially reverting the $warn/$warn_message param split from eaf8407 as this
change was unnecessarily API breaking.  Instead, we are adding string/bool type
validating to the $warn parameter and deprecation warnings for the usage of
stringified boolean values (eg, 'true', 'on', etc.). In a future major release,
the logic can be simplified to treating all string values as a warning message.
2013-12-23 13:23:49 -08:00
Joshua Hoblitt
41d5d4ccd1 fix regression preventing usage of fragment ensure => /target syntax
Also fix a historical bug that prevents a fragment from being converted
from a symlink to using a source or content parameter.
2013-12-05 22:39:23 -07:00
Joshua Hoblitt
f1a57a6c7e add system tests for file fragments sourced from a single file
In addition to checking for fragment sourcing from a 'list' of files.
2013-12-05 10:12:29 -07:00
Joshua Hoblitt
ae1e74cf36 add system tests for replacing symlinks and directories 2013-11-18 14:58:46 -07:00
Joshua Hoblitt
4ee4be00ac minor system test cleanups 2013-11-13 20:28:27 -07:00
Joshua Hoblitt
c852dc22d7 clean up between system spec files 2013-11-13 17:56:47 -07:00
Tristan Smith
499f338ce5 put the shell() calls into before{} blocks so that they're executed meaningfully. Testing to make sure a file doesn't exist shouldn't be as much of a hack as that is. I'm obviously missing something in the framework, but this works. 2013-11-13 14:23:30 -08:00
Tristan Smith
6c687551d8 Initial pass at test to ensure fragments accept and properly handle the underlying file source attribute. 2013-11-13 11:31:56 -08:00