summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | | | * | (#5710) Removed unnecessary calls to insync?Paul Berry2011-01-072-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the resource harness, we were calling insync? on all properties of a resource, even if those properties weren't being managed. This was unsafe. Changed to only call insync? on properties that are mentioned in the manifest. In addition, we discovered that the resource harness's computation of desired_values was incorrect, and was consulting the current system state rather than the desired state. Since this hash was (erroneously) only being consulted to see if it included :ensure, this didn't cause any obvious bugs. However it is now fixed. Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
| | | | | | | * | Prep for fixing #5710: Refactor stub provider in resource harness specPaul Berry2011-01-071-33/+36
| | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the stub provider to its own method so that it can be re-used in additional spec tests. Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
| | | | | | * | Merge branch 'maint/2.6.next/test_partial_resource_failure' into 2.6.nextPaul Berry2011-01-071-0/+58
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint/2.6.next/test_partial_resource_failure: Maint: test partial resource failure
| | | | | | | * | Maint: test partial resource failurePaul Berry2011-01-071-0/+58
| | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a resource harness test to verify that the correct events are generated if there is a failure while synchronizing a resource. Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
| | | | | | * | Merge branch 'ticket/2.6.next/5799' into 2.6.nextNick Lewis2011-01-072-19/+32
| | | | | | |\ \ | | | | | | |/ / | | | | | |/| |
| | | | | * | | (#5799) Simplify report dir creationNick Lewis2011-01-062-19/+32
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This report processor was unnecessarily using Puppet to create a single directory. This was causing complex failures in any spec dealing with reports. Paired-With: Paul Berry
| | | | | * | Merge branch 'maint/2.6.next/remove_rspec_options_from_rakefile' into 2.6.nextMatt Robinson2011-01-062-1/+3
| | | | | |\ \ | | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | * maint/2.6.next/remove_rspec_options_from_rakefile: maint: Add vim swap files to .gitignore maint: Remove rspec options from the Rakefile
| | | | * | | maint: Add vim swap files to .gitignoreMatt Robinson2011-01-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Paired-with: Jesse Wolfe
| | | | * | | maint: Remove rspec options from the RakefileMatt Robinson2011-01-062-1/+2
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having the Rakefile set RSpec options made it so that the .rspec (spec.opts in RSpec < 2) file for personal RSpec preferences was ignored. It also caused the ci_reporter RSpec options to be ignored which meant that Hudson couldn't get consumable output from our spec runs. It's also about time Puppet had a project level .gitignore file so that if people want personal rspec preferences (color or a different print format for example) in a .rspec file, those changes don't actually get checked in. Paired-with: Jesse Wolfe
| | | | * | Merge branch 'maint/2.6.next/inspect_audited_should_be_true' into 2.6.nextMatt Robinson2011-01-062-1/+27
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint/2.6.next/inspect_audited_should_be_true: maint: Inspect reports should have audited = true on events
| | | | | * | maint: Inspect reports should have audited = true on eventsMatt Robinson2011-01-062-1/+27
| | | | |/ / | | | |/| | | | | | | | | | | | | | Paired-with: Jesse Wolfe
| | | | * | Merge branch 'maint/2.6.next/add_skipped_to_resource_status' into 2.6.nextPaul Berry2011-01-061-1/+2
| | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * maint/2.6.next/add_skipped_to_resource_status: Maint: Added "skipped" to the YAML output for Puppet::Resource::Status
| | | | * | Maint: Added "skipped" to the YAML output for Puppet::Resource::StatusPaul Berry2011-01-061-1/+2
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | In 2.6.4 and earlier, "skipped" appeared only when true. A recent change accidentally caused it to never appear. This change makes it always appear.
| | | * | Merge branch 'maint/2.6.next/5771-spec-fixes' into 2.6.nextNick Lewis2011-01-054-96/+6
| | | |\ \
| | | | * | (#5771): Fix spec failures associated with rspec upgradeNick Lewis2011-01-054-96/+6
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to changes in the spec_helper, some of the specs that use puppettest were failing when run individually. In the future, it would be nice to remove puppettest from the specs entirely, as it's old, crufty, and only used for a couple of things. Paired-With: Matt Robinson
| | | * | Merge branch 'ticket/2.6.next/upgrade_rspec' into 2.6.nextNick Lewis2011-01-0450-228/+83
| | | |\ \
| | | | * | (#5771) Upgrade rspec to version 2Matt Robinson2011-01-0450-228/+83
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The biggest change is that we no longer need to monkey patch rspec to get confine behavior. Describe blocks can now be conditional like confine used to be. "describe" blocks with "shared => true" are now "shared_examples_for". Paired-With: Nick Lewis
| | | * | Merge branch 'maint/2.6.next/remove_stray_p' into 2.6.nextJesse Wolfe2011-01-031-1/+1
| | | |\ \
| | | | * | maint: remove stray debug statement.Jesse Wolfe2011-01-031-1/+1
| | | |/ / | | | | | | | | | | | | | | | I accidentally committed a debug statement. Now I am removing it.
| | | * | Merge branch 'maint/2.6.next/speed_up_slow_inspects' into 2.6.nextJesse Wolfe2011-01-035-0/+20
| | | |\ \
| | | | * | maint: Prune #inspect methods on various objectsJesse Wolfe2011-01-035-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby's default #inspect method can lead to printing factorial-order output for large graphs of objects. Since we have large graphs of objects, this is not optimal. This patch replaces a few well-connected objects' #inspect methods with methods that produce reduced output, and are thus much faster. Paired-With: Nick Lewis <nick@puppetlabs.com>
| | | * | | Merge branch 'ticket/2.6.next/5758' into 2.6.nextPaul Berry2011-01-033-13/+64
| | | |\ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/5758: (#5758) Verify that report events are correctly created Prep work for #5758: set audited=true on all audit events Prep work for #5758: clean up initializer for Puppet::Transaction::Event
| | | | * | (#5758) Verify that report events are correctly createdPaul Berry2011-01-031-6/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added code to resource_harness_spec to test all the attributes of report events, not just the log messages. Paired-with: Matt Robinson <matt@puppetlabs.com>
| | | | * | Prep work for #5758: set audited=true on all audit eventsPaul Berry2011-01-031-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, events would only have audited=true if auditing was enabled AND there had been a change in an audited parameter. Paired-with: Matt Robinson <matt@puppetlabs.com>
| | | | * | Prep work for #5758: clean up initializer for Puppet::Transaction::EventPaul Berry2011-01-031-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Puppet::Transaction::Event#initialize() contained unnecessary code that allowed the properties of an event to be passed in as separate arguments. This was never used. Paired-with: Matt Robinson <matt@puppetlabs.com>
| | | * | | Merge branch 'ticket/2.6.next/5698' into 2.6.nextJesse Wolfe2011-01-033-4/+31
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Fix #5698 puppet inspect shouldn't report of attributes of deleted filesJesse Wolfe2011-01-033-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a resource is absent, then reporting that its properties are all ":absent" is not particularly correct. This patch makes the `inspect` application's reports behave more like `apply` reports, and skip properties other than :ensure for absent resources. Reviewed-By: Nick Lewis <nick@puppetlabs.com>
| | | * | | Merge branch 'ticket/2.6.next/5715' into 2.6.nextPaul Berry2010-12-3023-159/+230
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/5715: (#5715) Added attributes resource_type and title to Puppet::Resource::Status. (#5715) Removed attribute source_description from the YAML representation of Puppet::Resource::Status. (#5715) Removed unnecessary attributes from YAML of Puppet::Transaction::Event. (#5715) Make certain report attributes always present. (#5715) Changed the type of metric names to always be strings. (#5715) Add status attribute to reports. (#5715) Made the report "calculate" methods strictly functional. (#5715) Made the changes/total and events/total metrics always present (#5715) Refactor in preparation for adding a status attribute to reports. (#5715) Added total time to inspect reports and made inspect metrics more consistent. (#5715) Removed Puppet::Transaction::Report#external_times from YAML output. (#5715) Added total time metric to apply reports. (#5715) Removed redundant attribute Transaction::Event#version (#5715) Removed redundant attribute Resource::Status#version (#5715) Removed Puppet::Util::Log#version. (#5715) Removed the unused attribute Puppet::Transaction::Event#node (#5715) Removed Resource::Status#skipped_reason. It was never used. (#5715) Prep work: Fixed add_statuses in report_spec.
| | | | * | | (#5715) Added attributes resource_type and title to Puppet::Resource::Status.Paul Berry2010-12-302-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These new attributes save report processors from having to parse the "resource" attribute.
| | | | * | | (#5715) Removed attribute source_description from the YAML representation ofPaul Berry2010-12-302-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Puppet::Resource::Status. This attribute is only used for properly generating log messages and was never intended to appear in reports.
| | | | * | | (#5715) Removed unnecessary attributes from YAML of Puppet::Transaction::Event.Paul Berry2010-12-302-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The removed attributes are file, line, resource, tags, source_description, and default_log_level. These attributes were all redundant with those in Puppet::Resource::Status.
| | | | * | | (#5715) Make certain report attributes always present.Nick Lewis2010-12-305-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The attributes Puppet::Resource::Status#changed, Puppet::Resource::Status#out_of_sync, and Puppet::Transaction::Event#audited used to only appear in reports when their state was true. Now they appear always.
| | | | * | | (#5715) Changed the type of metric names to always be strings.Paul Berry2010-12-305-44/+41
| | | | | | |
| | | | * | | (#5715) Add status attribute to reports.Paul Berry2010-12-302-6/+34
| | | | | | |
| | | | * | | (#5715) Made the report "calculate" methods strictly functional.Paul Berry2010-12-301-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These methods previously stored the metrics as a side effect; now they simply compute the metrics and return them.
| | | | * | | (#5715) Made the changes/total and events/total metrics always presentPaul Berry2010-12-302-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously these metrics were omitted when their values were zero.
| | | | * | | (#5715) Refactor in preparation for adding a status attribute to reports.Paul Berry2010-12-307-60/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed Puppet::Transaction::Report#calculate_metrics to finalize_report, in preparation for adding more functionality to this method. Removed Puppet::Transaction#send_report and Puppet::Transaction#generate_report. The former was never used, and the latter was unnecessary.
| | | | * | | (#5715) Added total time to inspect reports and made inspect metrics more ↵Paul Berry2010-12-301-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | consistent. Inspect reports now contain all the metrics that apply reports do, and use the same code path for creating them.
| | | | * | | (#5715) Removed Puppet::Transaction::Report#external_times from YAML output.Paul Berry2010-12-302-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This attribute was never intended to be serialized to YAML; it exists merely as temporary storage for metrics that have not yet been placed in the report's metrics attribute.
| | | | * | | (#5715) Added total time metric to apply reports.Paul Berry2010-12-302-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a feature that was present in 0.25.x and was inadvertently dropped from 2.6.x.
| | | | * | | (#5715) Removed redundant attribute Transaction::Event#versionPaul Berry2010-12-304-4/+4
| | | | | | |
| | | | * | | (#5715) Removed redundant attribute Resource::Status#versionPaul Berry2010-12-302-4/+4
| | | | | | |
| | | | * | | (#5715) Removed Puppet::Util::Log#version.Paul Berry2010-12-309-23/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This attribute was only relevant in reports, and in reports it was redundant with Puppet::Transaction::Report#configuration_version and Puppet::Transaction::Report#puppet_version.
| | | | * | | (#5715) Removed the unused attribute Puppet::Transaction::Event#nodePaul Berry2010-12-302-2/+2
| | | | | | |
| | | | * | | (#5715) Removed Resource::Status#skipped_reason. It was never used.Paul Berry2010-12-302-2/+2
| | | | | | |
| | | | * | | (#5715) Prep work: Fixed add_statuses in report_spec.Paul Berry2010-12-301-1/+1
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Report_spec contained a helper method called add_statuses which claimed to add a status object n times. It actually always added it 3 times, and fortunately callers always specified n=3. Changed this to be more sane.
| | | * | | Merge branch 'ticket/2.6.next/5723' into 2.6.nextNick Lewis2010-12-291-3/+3
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | (#5723) Fix failing type/package specsNick Lewis2010-12-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests were failing because they were overly constraining what the code could do. Because of a bug in Mocha 0.9.8, these failures weren't caught when the code causing them was first made. These failures were introduced in 7fff7808e25491a5ea1e207b8de3ade0c4f95f4f. Paired-With: Paul Berry
| | | * | | Merge branch 'ticket/2.6.next/5169' into 2.6.nextJesse Wolfe2010-12-207-12/+132
| | | |\ \ \
| | | | * | | Implement #5168 and #5169 ctime and mtime are propertiesJesse Wolfe2010-12-207-12/+132
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | File ctime and mtime are now implemented as read-only properties, so they can be examined with audit.