[SCM] Puppet - System Automation branch, 0.25.x, updated. 0.25.1-97-g037b99a

0 views

Skip to first unread message

git version control

unread,

Dec 18, 2009, 5:08:11 PM12/18/09

to puppet...@googlegroups.com

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Puppet - System Automation".

The branch, 0.25.x has been updated
via 037b99a27dc8b2aeb44c5cdfb20bfef672294405 (commit)
via d11c7503cc816e98b5deb890b49a7e8c47173e1b (commit)
from 0dc2dbafe65b59bfbb3ab66e26f595260bdde356 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 037b99a27dc8b2aeb44c5cdfb20bfef672294405
Author: Jesse Wolfe <jes...@gmail.com>
Date: Fri Dec 18 12:36:42 2009 -0800

Fixing #2958 inconsistent errors in spec/integration/bin/puppetmasterd.rb

I was getting inconsistent errors in this file, and it's really two
separate issues but they're both trivial.

1) The spec launches ./sbin/puppetmasterd, which may have trouble
finding the puppet libraries. It could even load the system-installed
puppet rather than the files in the repository -- I think this effect is
why the tests were passing on Markus's machine, for example.

2) There's a race condition in this test, and puppetmasterd has gotten
slower to start up (perhaps due to the #2877 fix?)

Signed-off-by: Jesse Wolfe <jes...@gmail.com>

commit d11c7503cc816e98b5deb890b49a7e8c47173e1b
Author: Markus Roberts <Mar...@reality.com>
Date: Fri Dec 18 09:11:09 2009 -0800

Fix for #2951 (SELinux test errors on OS X)

This makes the SELinux library marginally more robust by dealing
consistently with a missing proc/mounts, and also resoves the test
failures in a way that allows meaningful test runs on non-SELinux
systems.

Signed-off-by: Markus Roberts <Mar...@reality.com>

-----------------------------------------------------------------------

Summary of changes:
lib/puppet/util/selinux.rb | 4 ++--
spec/integration/bin/puppetmasterd.rb | 5 +++--
spec/unit/util/selinux.rb | 21 +++++++++++++++++++--
3 files changed, 24 insertions(+), 6 deletions(-)