[puppetlabs/puppet] 4041cf: (PUP-3277) Remove classifier_utils from no_enc tes...

[GitHub]

Branch: refs/heads/master
Home: https://github.com/puppetlabs/puppet
Commit: 4041cf47b78657f23829bc8566cfe34a9c007562
https://github.com/puppetlabs/puppet/commit/4041cf47b78657f23829bc8566cfe34a9c007562
Author: Josh Partlow <joshua....@puppetlabs.com>
Date: 2014-10-07 (Tue, 07 Oct 2014)

Changed paths:
M acceptance/tests/environment/use_agent_environment_when_no_enc.rb

Log Message:
-----------
(PUP-3277) Remove classifier_utils from no_enc test

This test setsthe node_terminus to plain and does not interact with the
classifier. Consequently we don't need to adjust any of the groups for
this test.


Commit: fe2827b23d027f19bc63efeeca29c667467db304
https://github.com/puppetlabs/puppet/commit/fe2827b23d027f19bc63efeeca29c667467db304
Author: Josh Partlow <joshua....@puppetlabs.com>
Date: 2014-10-07 (Tue, 07 Oct 2014)

Changed paths:
M acceptance/bin/ci-rerun-pe-puppet.sh
M acceptance/lib/puppet/acceptance/classifier_utils.rb

Log Message:
-----------
(PUP-3277) Filter group properties before PUT

Originally the helper would roundtrip the MCollective group retrieved
via GET, merely updating the 'rule' property. We had a failure where the
MCollective group came back with a 'deleted' object in its properties,
which is not a property you can PUT to a group. I've changed the helper
to select a set of allowed properties that we can PUT back to the
original group.


Commit: de24d437aafe9808e3ce26c0d6ad22bd4a917970
https://github.com/puppetlabs/puppet/commit/de24d437aafe9808e3ce26c0d6ad22bd4a917970
Author: Josh Partlow <joshua....@puppetlabs.com>
Date: 2014-10-07 (Tue, 07 Oct 2014)

Changed paths:
M acceptance/bin/ci-rerun-pe-puppet.sh
M acceptance/tests/environment/use_enc_environment.rb
M acceptance/tests/store_configs/enc_provides_node_when_storeconfigs_enabled.rb

Log Message:
-----------
(PUP-3277) Use classifier enc for some enc tests on pe

The store_configs/enc_provides_node_when_storeconfigs_enabled.rb test
checks that storeconfigs does not prevent an enc from working. Since
FOSS runs default to no enc or storeconfigs, the test would setup both;
but when running in PE, both are already available and the test needed
to be updated to accomodate that.

In addition changes were made to use the production directory
environment. The tests/environment/use_enc_environment.rb test was also
updated to make use of the classifier when testing against PE.


Commit: 08a379266c8f2deb584c974233f13861369f7f81
https://github.com/puppetlabs/puppet/commit/08a379266c8f2deb584c974233f13861369f7f81
Author: Josh Partlow <joshua....@puppetlabs.com>
Date: 2014-10-07 (Tue, 07 Oct 2014)

Changed paths:
M acceptance/Rakefile

Log Message:
-----------
(maint) Release hosts that are listed with domain

Prior to this would only match entries in the log file that looked like:

rndmhost (nodename) 01:02:03

Now matching as well:

rndmhost.somewhere.net (nodename) 01:02:03


Commit: e2032d151a5def70145c3fe82dc9cfcf5909c91d
https://github.com/puppetlabs/puppet/commit/e2032d151a5def70145c3fe82dc9cfcf5909c91d
Author: Josh Partlow <joshua....@puppetlabs.com>
Date: 2014-10-07 (Tue, 07 Oct 2014)

Changed paths:
M acceptance/bin/ci-rerun-pe-puppet.sh
M acceptance/tests/security/cve-2013-4761_injection_of_class_names_loading_code.rb

Log Message:
-----------
(PUP-3277) Use single quotes for cve injection test file content

Made a mistake adjusting cve-2013-4761_injection_of_class_names_loading_code
by double quoting the site.pp content in the manifest; on some (all?) platforms
the variable was interpolated by the shell and vanished. Changing to
single quotes allows the test to run properly. Change to he ci-rerun-pe
helper script is just to more closely match pe acceptance three node layout.


Commit: 2ee0ba5ce0ff4bcddce0c58c080e14d0e256dacf
https://github.com/puppetlabs/puppet/commit/2ee0ba5ce0ff4bcddce0c58c080e14d0e256dacf
Author: Josh Partlow <joshua....@puppetlabs.com>
Date: 2014-10-07 (Tue, 07 Oct 2014)

Changed paths:
M acceptance/Rakefile
M acceptance/bin/ci-rerun-pe-puppet.sh
M acceptance/lib/puppet/acceptance/classifier_utils.rb
M acceptance/tests/environment/use_agent_environment_when_no_enc.rb
M acceptance/tests/environment/use_enc_environment.rb
M acceptance/tests/security/cve-2013-4761_injection_of_class_names_loading_code.rb
M acceptance/tests/store_configs/enc_provides_node_when_storeconfigs_enabled.rb

Log Message:
-----------
Merge branch 'issues/master/pup-3277-more-acceptance-fixes'

* issues/master/pup-3277-more-acceptance-fixes:
(PUP-3277) Use single quotes for cve injection test file content
(maint) Release hosts that are listed with domain
(PUP-3277) Use classifier enc for some enc tests on pe
(PUP-3277) Filter group properties before PUT
(PUP-3277) Remove classifier_utils from no_enc test


Compare: https://github.com/puppetlabs/puppet/compare/7ce59ba3543f...2ee0ba5ce0ff