summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | (#6270) Fix formatting in regsubst function's doc stringnfagerlund2011-02-091-14/+7
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed ULs being interpreted as code blocks * Changed an example for variety. * Turned set of paragraphs inside a LI into a nested list.
| | * | / / / / / (6130) Change header level on metaparameter referencenfagerlund2011-02-081-1/+1
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | Individual metaparameters under the main H2 on the page should be H3s, not H4s.
| | * | | | | | Updated CHANGELOG for 2.6.5rc2Jacob Helwig2011-02-081-0/+5
| | | | | | | |
| | * | | | | | Merge remote branch 'dan/ticket/2.6.4/5977' into 2.6.nextJesse Wolfe2011-02-082-2/+30
| | |\ \ \ \ \ \
| | | * | | | | | (5977) Puppet::Applications can be loaded from multiple paths.Dan Bode2011-01-142-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - previously, Puppet would search $LOAD_PATH and just load applications in the first $LOAD_PATH to have the directory puppet/application. Now multiple paths can contain applications.
| | * | | | | | | Merge branch 'ticket/2.6.next/6257' into 2.6.nextJesse Wolfe2011-02-081-3/+1
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | | * | | | | | (#6257) Speed up PUT and POST requests under rackJesse Wolfe2011-02-081-3/+1
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch significantly speeds up reading the body of HTTP requests from Rack. Reviewed-by: Markus Roberts <markus@puppetlabs.com>
| * | | | | | | Merge branch 'ticket/next/maint-fix_test_randomization_problem' into nextMatt Robinson2011-03-031-1/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/next/maint-fix_test_randomization_problem: maint: Fix a randomization test failure
| | * | | | | | | maint: Fix a randomization test failureMatt Robinson2011-03-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit for #2597 included a test that asserted the text resulting from detecting a cycle. However, the cycle detection could start randomly from any node, resulting in different text in the error. I'm not sure what the randomization key would be based on since the test failed consistently over dozens of runs for me, and didn't for Daniel. Paired-with: Daniel Pittman <daniel@puppetlabs.com>
| * | | | | | | | Merge branch 'refactor/next/6582-stop-using-'test-lib-'-for-'spec-'-tests' ↵Daniel Pittman2011-03-031-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | into next
| | * | | | | | | (#6582) Don't demand the checkout be named 'puppet'.Daniel Pittman2011-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As part of implementing the fixture support I hard-coded the assumption that the git checkout was a directory named 'puppet'; this broke on our CI server, and would break for anyone else who didn't follow that default. This commit eliminates that assumption and depends only on the appropriate part of the input filename. Reviewed-By: Paul Berry <paul@puppetlabs.com>
| * | | | | | | | Merge branch 'refactor/next/6582-stop-using-'test-lib-'-for-'spec-'-tests' ↵Daniel Pittman2011-03-0369-142/+902
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into next
| | * | | | | | | (#6582) stub puts to prevent screen output when testing help.Daniel Pittman2011-03-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only really want to verify that the code exits, but the current implementation emits text directly; this results in messing up the tests, which we can avoid with this tiny shim. Reviewed-By: Nick Lewis <nick@puppetlabs.com>
| | * | | | | | | (#6582) eliminate a backtrace from mismatched block arguments.Daniel Pittman2011-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was tightly coupled to the code implementation; it mostly still is, but now allows argument extension without needing to adjust the test which is only focused on the first argument anyhow. Reviewed-By: Nick Lewis <nick@puppetlabs.com>
| | * | | | | | | (#6582) unstub Puppet settings to improve indirector queue tests.Daniel Pittman2011-03-031-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code was stubbing Puppet settings, which is no longer required now we reset them between tests. Using the real thing reduces points that the rest of the code can break, too. As a side effect this caused Puppet[:trace] to be "true", which meant that we emitted a huge, nasty backtrace during the testing of a specific internal failure handling case. Reviewed-By: Nick Lewis <nick@puppetlabs.com>
| | * | | | | | | (#6582) Eliminate the last vestige of the unit tests from the specs.Daniel Pittman2011-03-031-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This eliminates a stub module in spec_helper, which was used for compatibility with code that didn't bother to require the right files out of the unit tests. It also removes test/lib from LOAD_PATH when running specs, since we don't run with that code, and now we detect that as a larger scale test failure. Reviewed-By: Nick Lewis <nick@puppetlabs.com>
| | * | | | | | | (#6582) eliminate fakeresource use in ssh_authorized_key spec.Daniel Pittman2011-03-032-27/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We replace it with an instance of the actual resource we are testing, which reduces the number of ways this code is tied to the specific implementation. Reviewed-By: Nick Lewis <nick@puppetlabs.com>
| | * | | | | | | (#6582) eliminate fakeparsefile helper method.Daniel Pittman2011-03-035-47/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a helper that implemented rspec style "shared behaviour" for Test::Unit; now that we have moved on we can use the upstream implementation instead. This eliminates a whole bit of code we have to maintain. Reviewed-By: Nick Lewis <nick@puppetlabs.com>
| | * | | | | | | (#6582) Eliminate the old fakedata helper method.Daniel Pittman2011-03-0360-32/+777
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is replaced with the new my_fixture{,s} methods; old fixture data is ported into the spec tests at the same time, but left where it was against unit tests that require it. Reviewed-By: Nick Lewis <nick@puppetlabs.com>
| | * | | | | | | (#6582) move more helper code into methods, out of RSpec#configureDaniel Pittman2011-03-032-20/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We move the tempfile cleanup support off into the module that uses it, which removes some of the dependency on magic globals from configure. It still exists, but is hidden in the same module that uses it, which helps. Reviewed-By: Nick Lewis <nick@puppetlabs.com>
| | * | | | | | | (#6582) add fixture helper methods to replace unit test code.Daniel Pittman2011-03-032-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We validate that fixtures exist, when requested, or that they match something when they use a glob. This catches internal errors where we don't match any fixtures with a glob; this can reveal problems that would otherwise avoid all assertions and result in internal failures. The code is hidden out in a module, included in the main RSpec namespace. This doesn't clean up the API any, but it isolates the code more effectively and keeps the configuration file cleaner. Reviewed-By: Nick Lewis <nick@puppetlabs.com>
| | * | | | | | | (#6582) order RSpec global :before and :after hooks naturally.Daniel Pittman2011-03-031-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifically, reverse the order of the two in spec_helper so that they make more sense; the inverted order was confusing. There are no functional changes, only code movement, in this patchset. Reviewed-By: Nick Lewis <nick@puppetlabs.com>
| | * | | | | | | (#6407) Fix spec test hang with Mocha >= 0.9.11 in zlib testingDaniel Pittman2011-03-032-2/+5
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had a combination of bad logic, and bad testing, and a nasty behaviour of Mocha <= 0.9.10 that would result in a false pass for one of our tests. This not only falsely passed, but hid an infinite loop retrying decompression on an invalid data stream; it could be triggered by anything that sent an HTTP request with an invalid compressed body, resulting in a livelock. Paired-with: Jesse Wolfe <jesse@puppetlabs.com> Signed-off-by: Daniel Pittman <daniel@puppetlabs.com>
| * | | | | | | (#6551) remove deprecated 'env' parameter to the 'exec' typeDaniel Pittman2011-03-032-52/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We deprecated this back in 0.24, so we can eliminate it in the next release. We ran through our deprecation period full of constant complaints to the users. Now we just fail.
| * | | | | | | Merge branch 'ticket/next/5496' into nextNick Lewis2011-03-012-5/+37
| |\ \ \ \ \ \ \
| | * | | | | | | (#5496) Added tests for the new zpool output formatDevon Peters2011-03-011-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Nick Lewis
| | * | | | | | | (#5496) zpool provider supports new 'zpool status' formatDevon Peters2011-03-011-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "Solaris 10 9/10 release (Update 9)" update changed the output from the "zpool status" command, which breaks the zpool provider. The format basically changed from "vdev" to "vdev-n" (ex: "mirror" to "mirror-0"), which the current provider doesn't recognize. This fix changes the way vdev's are checked by the zpool provider, to support either format. Reviewed-By: Nick Lewis
| * | | | | | | | Revert #5691 "Merge remote branch 'brice/feature/process-instrumentation' ↵Jesse Wolfe2011-03-017-384/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into next" This reverts commit 448a439f5abc3d51accececb678e9c5f547f7615, reversing changes made to 06939c51a3f675137b53fac8a521132a4c9cfcbe. As per discussion in http://projects.puppetlabs.com/issues/5691#note-5
| * | | | | | | | Merge remote branch 'brice/feature/process-instrumentation' into nextJesse Wolfe2011-02-257-10/+384
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Some high-level process name probesBrice Figureau2010-12-184-10/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Here is an attempt to cover with process name probes some of the longest parts of a puppet agent or master. Currently: * node compilation * individual resource evaluation * some configurer parts * individual network requests Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
| | * | | | | | | | Process name instrumentation infrastructureBrice Figureau2010-12-183-0/+348
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is special feature that changes the process name of the running puppet entity to display its current activity. It is disabled by default, and can be enabled by sending the QUIT signal to the process in question (or calling enable through the code). This system can work only if some "probes" are integrated in the core puppet codebase. Since tools to visualize process names have a large refresh time (ie more than 1s) it only makes sense to track long activities (like compilation, transaction or file serving). Those probes are the subject of a subsequent patch. This system tracks every thread activity and form a strings which will be used as the process name. Due to the way it is implemented it is possible that it doesn't work on all platforms (I tested successfully on osx and linux). On some systems the space available is dependent on the original size of the full command. That's why if this string is longer than a 50 characters, the string is scrolled (like stock market tickers). Note: This is not intended to be a generic instrumentation system. Also, being block based means that it can reduce performance if the instrumentation probes are used in tight inner loops. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
| * | | | | | | | | Merge branch 'ticket/next/1204' into nextnfagerlund2011-02-1735-1969/+2186
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | (#1204) Make rake gen_manpages fail explicitly if ronn isn't presentnfagerlund2011-02-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Entire series: paired-with: Daniel Pittman <daniel@puppetlabs.com> paired-with: Paul Berry <paul@puppetlabs.com>
| | * | | | | | | | | (#1204) Add manpages for modern apps and update puppet.conf manpagenfagerlund2011-02-1713-3/+889
| | | | | | | | | | |
| | * | | | | | | | | (#1204) Fix --param flag in puppet resource manpagenfagerlund2011-02-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ronn doesn't like <param> for some reason.
| | * | | | | | | | | (#1204) Make rake gen_manpages output puppet-{application} manpagesnfagerlund2011-02-171-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The manpage generator can now make manpages for the modern executable in addition to the legacy executables. The section for the legacy names should be deleted upon the release of 2.8.0.
| | * | | | | | | | | (#1204) Update all the manpagesnfagerlund2011-02-1711-1472/+732
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We got the rake task working! We're not done, but all the manpages look a lot better, so let's commit that.
| | * | | | | | | | | (#1204) Move man generation task from install.rb to a rake tasknfagerlund2011-02-172-53/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having this be commented-out code in the installer script doesn't really make sense for our workflow; we want to be able to regenerate these manpages at will and make sure they're always up-to-date. This will help us keep them in sync with the help text. This commit also changes the ronn invocation to specify a manual name and organization.
| | * | | | | | | | | (#1204) Edit content and formatting of puppet resource helpnfagerlund2011-02-171-45/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarified how to modify the system state with puppet resource, and reformatted the markdown for compatibility with ronn.
| | * | | | | | | | | (#1204) Edit content and formatting of puppet queue helpnfagerlund2011-02-171-17/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Puppet queue had inadequate help, so I added to it while reformatting for ronn.
| | * | | | | | | | | (#1204) Fix --compile and --apply optionsnfagerlund2011-02-172-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forward-porting a fix from 2.6.x to the new help text locations.
| | * | | | | | | | | (#1204) Reformat help text for puppet masternfagerlund2011-02-171-28/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Markdown changes for compatibility with ronn.
| | * | | | | | | | | (#1204) Reformat help text for puppet kick and inspectnfagerlund2011-02-172-51/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Markdown changes for compatibility with ronn.
| | * | | | | | | | | (#1204) Reformat help text for puppet filebucketnfagerlund2011-02-171-29/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Markdown changes for compatibility with ronn.
| | * | | | | | | | | (#1204) Fix garbled help for puppet filebucketnfagerlund2011-02-171-21/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The actual text was somewhat disarrayed. No ronn fixes in this patch.
| | * | | | | | | | | (#1204) Edit content of puppet describe helpnfagerlund2011-02-171-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's a simple tool, it doesn't need both synopsis and description. Especially when they're identical.
| | * | | | | | | | | (#1204) Reformat help text for puppet cert and describenfagerlund2011-02-172-73/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Markdown changes for compatibility with Ronn.
| | * | | | | | | | | (#1204) Edit content and formatting of puppet apply helpnfagerlund2011-02-171-33/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The puppet apply help was somewhat lacking, so I edited the content while making its formatting ronn-compatible.
| | * | | | | | | | | (#1204) Reformat help text for puppet doc and puppet agent.nfagerlund2011-02-172-149/+163
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Markdown changes for compatibility with Ronn, in the interest of better manpages.
| * | | | | | | | | Merge branch '2.6.x' into nextNick Lewis2011-02-033-1/+129
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/puppet/util/zaml.rb