summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixing Indirector::Facts::Couch loadingLuke Kanies2011-04-092-66/+74
| | | | | | | | | | | It was previously failing to load at all if couch was missing, but now it only fails on initialization. This means that you can tell that the terminus is there when you're missing couch, but you just can't use it. Signed-off-by: Luke Kanies <luke@puppetlabs.com> Reviewed-by: Daniel Pittman <daniel@puppetlabs.com>
* Fixing dependency loading in Rails::FactNameLuke Kanies2011-04-091-0/+1
| | | | | Signed-off-by: Luke Kanies <luke@puppetlabs.com> Reviewed-by: Daniel Pittman <daniel@puppetlabs.com>
* Fixing 'puppet faces' applicationLuke Kanies2011-04-092-16/+15
| | | | | | | | | | | It only had one available method, and the errors incorrectly specified what it was. This just defaults to listing all the time, and I've updated the docs to be correct, too. Signed-off-by: Luke Kanies <luke@puppetlabs.com> Reviewed-by: Daniel Pittman <daniel@puppetlabs.com>
* Fixing the watchr scriptLuke Kanies2011-04-092-4/+2
| | | | | | | It had not been updated for quite a while. Signed-off-by: Luke Kanies <luke@puppetlabs.com> Reviewed-by: Daniel Pittman <daniel@puppetlabs.com>
* Fixing FaceCollection#facesLuke Kanies2011-04-091-3/+1
| | | | | | | | | | We were still looking for faces in version directories. No changes to testing because the current test is pending. Signed-off-by: Luke Kanies <luke@puppetlabs.com> Reviewed-by: Daniel Pittman <daniel@puppetlabs.com>
* Merge branch 'ticket/next/maint-fix_sqlite_test' into nextMatt Robinson2011-04-081-1/+5
|\ | | | | | | | | | | * ticket/next/maint-fix_sqlite_test: maint: Fix sporadic sqlite error maint: Fix sqlite3 require to really be optional
| * maint: Fix sporadic sqlite errorMatt Robinson2011-04-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord::StatementInvalid: SQLite3::IOException: disk I/O error This happened if you ran these tests in the following order since Rails wasn't disconnecting between tests. rspec spec/unit/indirector/facts/inventory_active_record_spec.rb spec/unit/indirector/node/active_record_spec.rb Paired-with: Nick Lewis <nick@puppetlabs.com>
| * maint: Fix sqlite3 require to really be optionalMatt Robinson2011-04-081-1/+4
|/ | | | | | | You need to specifically rescue LoadError if you want requires to be optional. Paired-with: Nick Lewis
* Merge branch 'maint/next/clean-up-spec_helper-require' into nextDaniel Pittman2011-04-08440-453/+442
|\
| * maint: just require 'spec_helper', thanks rspec2Daniel Pittman2011-04-08440-453/+442
|/ | | | | | | | | | | rspec2 automatically sets a bunch of load-path stuff we were by hand, so we can just stop. As a side-effect we can now avoid a whole pile of stupid things to try and include the spec_helper.rb file... ...and then we can stop protecting spec_helper from evaluating twice, since we now require it with a consistent name. Yay. Reviewed-By: Pieter van de Bruggen <pieter@puppetlabs.com>
* Merge branch 'maint/next/improve-test-suite-performance' into nextDaniel Pittman2011-04-084-109/+44
|\
| * maint: delete dead darwinport package providerDaniel Pittman2011-04-081-86/+0
| | | | | | | | | | | | | | | | The DarwinPorts package provider was actually entirely broken; we are not shipping or supporting it with the 2.7 release. Plans exist to introduce a newer, functional MacPorts provider, but this dead code can be removed early. Paired-With: Nigel Kersten <nigel@puppetlabs.com>
| * maint: don't take over signal handling in tests...Daniel Pittman2011-04-081-0/+7
| | | | | | | | | | | | | | | | | | We had a problem where we installed a signal handler during a :before block, which wasn't stubbed, so ended up leaving that in place forever. Which bites. We stub it out locally, which is ugly but functional. Paired-With: Matt Robinson <matt@puppetlabs.com>
| * maint: use FileUtil to remove files, not execDaniel Pittman2011-04-081-23/+33
| | | | | | | | | | | | | | | | | | We used to shell out to chmod and rm to clean up temporary files; this lead to the cleanup method here being one of the largest consumers of walltime. Replacing that with FileUtil calls is as, or more, secure, and performs sufficiently well that we can just delegate. Reviewed-By: Matt Robinson <matt@puppetlabs.com>
| * maint: disable garbage collector during individual test cases.Daniel Pittman2011-04-081-0/+4
|/ | | | | | | | | | | | This reduced overhead of garbage collection from 50 percent to 20 percent in my test runs, and reduced wall-time to match. This seems to be a reasonable win: we allow the GC to run on demand, but only outside the testing. Memory use went from ~ 300MB to ~550MB between runs, which suggests that we are generating a *lot* of garbage at times, but that we also benefit from cleaning it automatically on a regular basis. Reviewed-By: Matt Robinson <matt@puppetlabs.com>
* Merge branch 'ticket/next/maint-fix_tests_for_old_rubies' into nextMatt Robinson2011-04-082-5/+5
|\ | | | | | | | | | | * ticket/next/maint-fix_tests_for_old_rubies: maint: Ruby < 1.8.7 knows size but not count maint: Get tests passing on Ruby < 1.8.7
| * maint: Ruby < 1.8.7 knows size but not countMatt Robinson2011-04-081-4/+4
| | | | | | | | Reviewd-by: Nick Lewis
| * maint: Get tests passing on Ruby < 1.8.7Matt Robinson2011-04-081-1/+1
| | | | | | | | | | | | | | | | Fixing test errors: wrong argument type Symbol (expected Proc) undefined method `lines' for #<Array:0x1020823e0> Reviewed-by: Nick Lewis <nick@puppetlabs.com>
* | Merge branch 'ticket/next/7026' into nextNick Lewis2011-04-082-0/+25
|\ \ | |/ |/|
| * (#7026) Remove whits from reports when finalizingNick Lewis2011-04-082-0/+25
| | | | | | | | | | | | | | | | | | | | Resource statuses and metrics for Whits were being added to reports. Since they are transient internal data, they shouldn't be included in the report. This change adds a Puppet::Transaction::Report#prune_internal_data method, called by Puppet::Transaction::Report#finalize_report, providing a central place for this sort of pruning in the future. Paired-With: Max Martin
* | Merge branch 'ticket/next/maint-backport_array_combination' into nextMatt Robinson2011-04-082-0/+37
|\ \ | | | | | | | | | | | | * ticket/next/maint-backport_array_combination: maint: Add Array combinations method
| * | maint: Add Array combinations methodMatt Robinson2011-04-082-0/+37
|/ / | | | | | | | | | | | | | | | | | | | | | | Ruby < 1.8.7 doesn't have this method and we're using it in a test, so tests won't run on 1.8.6 until this is in place. It's probably a good thing to use much in implementation since it's written in pure Ruby when using < 1.8.7 and in C when in > 1.8.7, but then if you're using older Rubies you're probably not expecting much for performance anyway. Reviewed-by: Daniel Pittman <daniel@puppetlabs.com>
* | maint: mark tests pending for a discovered bug...Daniel Pittman2011-04-082-0/+4
| | | | | | | | | | | | | | Changes elsewhere in the tree break these two tests, but getting the merge in is worth marking them pending. :/ Paired-With: Nick Lewis <nick@puppetlabs.com>
* | Merge puppet-interfaces into puppet.Daniel Pittman2011-04-0774-0/+2853
|\ \ | | | | | | | | | | | | This joins the two repositories, including full history, into a single run, as well as landing the interfaces work on the next branch ready for release.
| * | maint: mocking 'require' causes random stack-overflow failures.Daniel Pittman2011-04-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that mocking require on objects can cause random "stack depth exceeded" failures, usually triggered by otherwise innocent changes to load order or the use of require in the rest of the code. Disable the currently failing test, which needs rewriting, and let it go for now. We need to systematically purge these problems once the build is stable. Paired-With: Dan Bode <dan@puppetlabs.com>
| * | (#6969) String failures differentiate between invalid string/versionDan Bode2011-04-071-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch does two things: 1. splits out the string lookup functionality from define into a seperate method [] 2. Tries to both load the specific version of a string as well as the current version so that specific error messages can be returned differentiating between an invalid version/string. Reviewed-By: Daniel Pittman <daniel@puppetlabs.com>
| * | (#6985) Allows indirectors to accept a hash as an argument.Dan Bode2011-04-072-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many indirectors need to take a hash as the last argument. This was not allowed b/c the last hash argument was assumed to be the options hash. I resolved this by assuming that the hash needed by an indirector would be the same as the options hash. Reviewed-By: Daniel Pittman <daniel@puppetlabs.com>
| * | (#7005) added require 'tmpdir' to spec helper.Dan Bode2011-04-071-0/+1
| | | | | | | | | | | | | | | | | | | | | Source files should resolve their own deps. This is required for the spec tests to run individually. Reviewed-By: Daniel Pittman <daniel@puppetlabs.com>
| * | Merge branch 'refactor/master/7012-rename-strings-to-interfaces-and-faces'Daniel Pittman2011-04-0779-634/+623
| |\ \
| | * | (#7012) Split plumbing into Puppet::InterfaceDaniel Pittman2011-04-0725-270/+259
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This splits out the plumbing into the Puppet::Interface namespace, and uses Puppet::Faces for all the public-facing code. The fault line is "what you care about if you are using or writing a face", which is public, against "what you care about to enable either of those two", which is the plumbing.
| | * | (#7012) Update references in code to use face(s)Daniel Pittman2011-04-0756-398/+398
| | | | | | | | | | | | | | | | | | | | The codebase is now using the new name, faces, uniformly to reference the objects contained. All tests pass.
| | * | (#7012) global rename of strings to faces.Daniel Pittman2011-04-0749-0/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | This just changes filenames and directories; files are exact copies rather than having additional modifications to make clearer each step of this process. This does leave a currently broken build. :/
| * | Merge branch 'bug/master/7006-missing-require'Daniel Pittman2011-04-071-0/+2
| |\ \
| | * | (#7006) Add a missing require to puppet/string/option.rbDaniel Pittman2011-04-071-0/+2
| |/ / | | | | | | | | | | | | | | | | | | This was causing failure in some cases, based on load order; we should always satisfy our external dependencies. Reviewed-By: Dan Bode <dan@puppetlabs.com>
| * | Merge branch ↵Daniel Pittman2011-04-067-25/+93
| |\ \ | | | | | | | | | | | | 'bug/master/6972-setting-CA-location-for-cert-string-no-longer-works'
| | * | (#6983) mark test pending until string is fixed...Daniel Pittman2011-04-062-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The certificate string is broken, and won't allow you to either search or save certificates. Given that, mark the test on it broken until that is completed. Reviewed-By: Dan Bode <dan@puppetlabs.com>
| | * | (#6972) Handle ca-location in the certificate string.Daniel Pittman2011-04-064-21/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ports the existing certificate location configuration to be a string option, and then uses that to change the configuration. This will leak state between calls, which is somewhat unavoidable, but should at least get the basic stuff right for the CLI. We eventually need the CA string to be supported by a stateless internal CA implementation that allows us to do the right thing overall. Reviewed-By: Dan Bode <dan@puppetlabs.com>
| | * | (#6972) Recognize puppet global options in pre-parse.Daniel Pittman2011-04-062-1/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This extends the CLI pre-parse phase to identify both string *and* global options out of the Puppet settings/defaults system. This makes the regular CLI support for setting Puppet configuration globals work as expected. This moves us along the line of supporting these options more fully. Reviewed-By: Dan Bode <dan@puppetlabs.com>
| | * | (#6972) Clean up OptParse name extraction a little.Daniel Pittman2011-04-061-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | During testing, an obvious cleanup showed up for the name extraction here, so we implement it. This extends the regexp to better extract the data we want rather than hacking it up post-match and having to do extra validation to make sure it actually worked. Reviewed-By: Dan Bode <dan@puppetlabs.com>
| * | Merge branch 'bug/master/6995-current-is-not-always-calculated-correctly'Daniel Pittman2011-04-064-78/+135
| |\ \
| | * | (#6995) Fix indexing of :current on string load.Daniel Pittman2011-04-063-52/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do this by implementing a standard mechanism for finding the current version out of the default file, and only supporting that one file. This implements our decision to lazy-evaluate the extra version support stuff as much as possible. Reviewed-By: Dan Bode <dan@puppetlabs.com>
| | * | maint: add `write_scratch_string` helper for testing...Daniel Pittman2011-04-061-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had a pattern where we wanted to routinely write scratch strings to disk, on the load path, so we could reference them later. This extracts that into a helper, and starts to use it in tests that should follow that pattern. Reviewed-By: Dan Bode <dan@puppetlabs.com>
| | * | maint: whitespace cleanup for spec_helper.Daniel Pittman2011-04-061-17/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We had some incorrect indentation in the file; we fix that up now before we make any substantive changes. Paired-With: Dan Bode <dan@puppetlabs.com>
| | * | (#6995) more robust testing of string loadingDaniel Pittman2011-04-061-15/+19
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were flushing loaded string versions in the test suite, but were not clearing out the $" array used to determine if we had previously loaded that file. This lead to situations where tests cross-polluted because require though the code was in memory, but the effects of loading that code had all been rolled back. Reviewed-By: Dan Bode <dan@puppetlabs.com>
| * | Merge branch 'tickets/master/6982'Pieter van de Bruggen2011-04-051-1/+3
| |\ \
| | * | (#6982) Patch the Certificate String against (#5528).Pieter van de Bruggen2011-04-051-1/+3
| |/ / | | | | | | | | | Reviewed-By: Matt Robinson
| * | Merge branch 'feature/master/6749-actions-need-to-support-options'Daniel Pittman2011-04-042-6/+14
| |\ \
| | * | (#6949) Fix passing positional arguments to actions.Daniel Pittman2011-04-042-6/+14
| |/ / | | | | | | | | | | | | | | | | | | | | | We had a logic failure that didn't pass positional arguments at all, but which our testing didn't verify. This entirely broke things. Now fixed, and a test added to ensure we don't bug out further... Reviewed-By: Pieter van de Bruggen <pieter@puppetlabs.com>
| * | Merge branch 'refactor/master/6964-when_invoked-rather-than-invoke-in-actions'Daniel Pittman2011-04-0416-56/+57
| |\ \
| | * | (#6964) use 'when_invoked' rather than 'invoke' for actions.Daniel Pittman2011-04-0416-56/+57
| |/ / | | | | | | | | | | | | | | | | | | In the DSL we want to use 'when_invoked do' because it reads much more naturally for users. Reviewed-By: Pieter van de Bruggen <pieter@puppetlabs.com>
generated by cgit (git 2.34.1) at 2024-11-14 03:27:11 +0000