Permalink
Commits on Dec 16, 2010
  1. Merge branch 'next'

    Matt Robinson
    Matt Robinson committed Dec 16, 2010
    * next:
      maint: Fix ActiveRecord confine issue
      maint: Fix a test that was missing a require
      maint: Fix tests that don't run on their own
  2. Merge branch '2.6.x' into next

    Matt Robinson
    Matt Robinson committed Dec 16, 2010
    * 2.6.x:
      maint: Fix ActiveRecord confine issue
      maint: Fix a test that was missing a require
      maint: Fix tests that don't run on their own
    
    Manually Resolved Conflicts:
    	spec/unit/network/http/rack/xmlrpc_spec.rb
    	spec/unit/network/http/rack_spec.rb
    	spec/unit/network/http/webrick_spec.rb
    	spec/unit/parser/templatewrapper_spec.rb
    	spec/unit/rails/param_value_spec.rb
    	spec/unit/rails/resource_spec.rb
  3. Merge branch '2.6.next' into 2.6.x

    Matt Robinson
    Matt Robinson committed Dec 16, 2010
    * 2.6.next:
      maint: Fix ActiveRecord confine issue
      maint: Fix a test that was missing a require
      maint: Fix tests that don't run on their own
  4. Merge branch 'ticket/2.6.next/maint-fix_active_record_confine' into 2…

    Matt Robinson
    Matt Robinson committed Dec 16, 2010
    ….6.next
    
    * ticket/2.6.next/maint-fix_active_record_confine:
      maint: Fix ActiveRecord confine issue
  5. maint: Fix ActiveRecord confine issue

    Matt Robinson
    Matt Robinson committed Dec 16, 2010
    We made a class that inherited from ActiveRecord, but did so outside a
    block so the confine wasn't skipping it when ActiveRecord wasn't
    installed.  Moving that class inside a before block caused the confine
    to work properly.
    
    Paired-with: Nick Lewis
  6. maint: Fix a test that was missing a require

    Matt Robinson authored and nicklewis committed Nov 22, 2010
    Paired-with: Nick Lewis
  7. maint: Fix tests that don't run on their own

    Matt Robinson authored and nicklewis committed Nov 22, 2010
    From the spec directory I found all the specs that fail when run on their own.
    
    for TEST in `find . -name "*.rb" -type f`; do
      spec $TEST > /dev/null 2>&1
      if [[ $? != 0 ]]; then
        echo $TEST
      fi
    done
    
    All of them were cases of missing requires.
    
    Paired-with: Nick Lewis <nick@puppetlabs.com>
  8. Merge branch 'next'

    nicklewis committed Dec 16, 2010
  9. Merge branch '2.6.x' into next

    nicklewis committed Dec 16, 2010
    Manually Resolved Conflicts:
    	lib/puppet/resource/type_collection.rb
    	spec/unit/configurer_spec.rb
    	spec/unit/indirector/catalog/active_record_spec.rb
    	spec/unit/resource/type_collection_spec.rb
    	spec/unit/transaction/resource_harness_spec.rb
Commits on Dec 14, 2010
  1. Merge branch 'ticket/next/5427' into next

    Matt Robinson
    Matt Robinson committed Dec 14, 2010
    * ticket/next/5427:
      (#5427) Using Propery::OrderedList for host_alias
      (#5427) Remove redundant testunit tests
  2. (#5427) Using Propery::OrderedList for host_alias

    stschulte authored and Matt Robinson committed Nov 18, 2010
    This uses the propertyclass Puppet::Property::OrderedList to represent
    the list of host_aliases. This lets us remove the in_sync, should_to_s
    etc overrides.
    
    In the provider class the list is represented by a string (=no array)
    so there were a few changes necessary as well.
    
    Because Puppet::Property::List uses the specified delimiter when
    converting should values to strings, I changed the delimiter to a simple
    space instead a tab. This keeps messages produced by puppet in a nice
    format.
    
    The tests had to be changed to work with the new behaviour of
    host_aliases. There are a few additional tests as well.
  3. (#5427) Remove redundant testunit tests

    Matt Robinson
    Matt Robinson committed Dec 14, 2010
    These tests are now better tested in the specs.
    
    Paired-with: Nick Lewis
  4. (#4487) Fix environment column in hosts table

    nicklewis committed Dec 14, 2010
    An entire environment object was being stored in a string field,
    causing the ZAML form of the environment to be stored. This was
    over-ridden to return just the ZAML serialized version of the name.
    Since the hosts model didn't know how to interpret a serialized
    value, it just returned the ZAML string as the environment. This
    patch stringifies the environment before putting it in the hosts
    table, which stores it properly.
    
    This patch also introduces a new method of testing using Tableless
    ActiveRecord models, which emulate their database schema. This
    helps to eliminate some stubbing, but it is still impossible to
    fully and accurately test all ActiveRecord interactions without a
    real database.
    
    Paired-With: Matt Robinson
Commits on Dec 13, 2010
  1. maint: restore plugin handler safety

    jes5199 committed Dec 13, 2010
    The previous maintenance patch for this file didn't provide as strong of
    a guarantee of loading plugins as the code it replaced.
    This patch restores the extremely broad exception catching, but prevents
    mocha exceptions from being silently ignored.
Commits on Dec 10, 2010
  1. (#5408) Attributes can be both audited and managed

    jes5199 committed Dec 10, 2010
    This patch makes it possible to both audit and manage an attribute.
    It introduces a new field on Event objects "historical_value", which is
    the value from state.yaml. The value from the RAL is written to
    state.yaml, and then the RAL is updated with the desired value.
    
    Paired-With: Nick Lewis <nick@puppetlabs.com>
    Paired-With: Matt Robinson <matt@puppetlabs.com>
  2. maint: missing stub

    jes5199 committed Dec 10, 2010
    This missing stub was raising an exception that, in versions of Mocha
    less than 0.9.10, was coincidentally causing the method under test to
    behave as expected.
    
    Paired-With: Nick Lewis <nick@puppetlabs.com>
  3. maint: missing stub

    jes5199 committed Dec 10, 2010
    This missing stub was raising an exception that, in versions of Mocha
    less than 0.9.10, was mistaken for the exception that was being tested
    for.
    
    Paired-With: Nick Lewis <nick@puppetlabs.com>
  4. maint: missing line and filename stubs

    jes5199 committed Dec 10, 2010
    Another missing stub exposed by Mocha 0.9.10
  5. maint: Fully stub partially stubbed test.

    jes5199 committed Dec 10, 2010
    This test was succeeding in versions of Mocha before 0.9.10, because the
    Mocha expectation exceptions were being incorrectly interpreted as if
    they were File Not Found exceptions.
  6. maint: remove Puppet.settings stubs

    jes5199 committed Dec 10, 2010
    This test was stubbing Puppet.settings, instead of setting the values
    directly. Exceptions thrown by trying to read other settings were
    getting swallowed when running a version of Mocha older than 0.9.10.
    
    Paired-With: Nick Lewis <nick@puppetlabs.com>
  7. maint: test was expecting Catalog.find too few times

    jes5199 committed Dec 10, 2010
    Our code calls Catalog.find multiple times, but this stub did not allow
    that. The resulting error was silently ignored on versions of Mocha
    before 0.9.10
    
    Paired-With: Nick Lewis <nick@puppetlabs.com>
  8. maint: broken test not failing due to over-eager exception catching

    jes5199 committed Dec 10, 2010
    A test was not testing what it claimed, but the failure exception was
    getting swallowed by an unnecessarily broad rescue match.
    
    Paired-With: Nick Lewis <nick@puppetlabs.com>
Commits on Dec 8, 2010
  1. Fix #1757 Change file mode representation to octal

    jes5199 committed Oct 18, 2010
    This patch changes the internal representation of a file's mode to a
    string instead of an integer. This simplifies the problem of displaying
    the value consistently throughout all of puppet.
Commits on Dec 7, 2010
  1. (#5393) Add "dataset" parameter to the zone provider

    Derek Olsen authored and jes5199 committed Nov 26, 2010
    This patch extends the zone provider to support the inclusion of one or more datasets in a solaris zone.  A dataset is an zfs filesystem that has been delegated from the global zone to the non global zone.
  2. Merge branch 'ticket/next/5423' into 2.6.next

    Paul Berry
    Paul Berry committed Dec 7, 2010
    * ticket/next/5423:
      Bug #5423: This moves the home directory property before the uid property, thus minimizing room for damage when usermod is in use.
  3. Bug #5423: This moves the home directory property before the uid prop…

    saysjonathan authored and Paul Berry committed Nov 30, 2010
    …erty, thus minimizing room for damage when usermod is in use.
Commits on Dec 6, 2010
  1. Merge remote branch 'someword/feature/master/5391' into next

    Paul Berry
    Paul Berry committed Dec 6, 2010
    * someword/feature/master/5391:
      (#5391) Include additional zfs properties