joshcooper

irb(main):009:0* s = "foo, bar\n baz"
=> "foo, bar\n baz"
irb(main):010:0> s.gsub!("\n", ' ')
=> "foo, bar  baz"
irb(main):011:0> s.gsub!(',', ' ')
=> "foo  bar  baz"
irb(main):012:0> s.split
=> ["foo", "bar", "baz"]

joshcooper

irb(main):001:0> require 'puppet'
=> true
...
irb(main):004:0> class Foo
irb(main):005:1> include Puppet::Util::Tagging
irb(main):006:1> end
=> Foo
irb(main):007:0> f = Foo.new
=> #<Foo:0x007f9eb4086998>
...

joshcooper

Errored Tests Cases:
  Test Case tests/resource/service/puppet_mcollective_service_management.rb reported: #<Beaker::Host::CommandFailure: Host 'm0mukl19y7lzoly.delivery.puppetlabs.net' exited with 4 running:
 puppet apply --detailed-exitcodes --verbose
Last 10 lines of output were:
	Notice: Compiled catalog for m0mukl19y7lzoly.delivery.puppetlabs.net in environment production in 0.21 seconds
	Info: Applying configuration version '1450134381'
	Error: Could not find init script for 'puppet'
	Error: /Stage[main]/Main/Service[puppet]/ensure: change from stopped to running failed: Could not find init script for 'puppet'
	Notice: Applied catalog in 0.09 seconds>
  Test Case tests/resource/service/ticket_5024_systemd_enabling_masked_service.rb reported: #<Beaker::Host::CommandFailure: Host 'm0mukl19y7lzoly.delivery.puppetlabs.net' exited with 4 running:

joshcooper

Puppet

COMMIT TOKENS NOT FOUND IN JIRA (OR NOT WITH FIX VERSION OF PUP 4.3.0)
PUP-4050 # fixed in 4.2.3, a follow up commit was made to master for 4.3.0
PUP-4386 # merged to stable 4.2.0, backported for 3.8.5
PUP-4621 # commit reference dup ticket of PUP-1388
PUP-4749 # backported to 4.2.0
PUP-4824 # backported to 4.2.2
PUP-4936 # backported to 4.2.2
PUP-5001 # backported to 4.2.3

joshcooper

[ 58%] Building CXX object lib/CMakeFiles/libpxp-agent.dir/src/module.cc.o
cd /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.n4YlzeLW/pxp-agent/lib && /Library/Developer/CommandLineTools/usr/bin/c++   -DBOOST_LOG_WITHOUT_WCHAR_T -DLEATHERMAN_LOGGING_LINE_NUMBERS -DUSE_cpp_pcp_client -std=c++11 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-tautological-constant-out-of-range-compare -Wno-deprecated-register  -O3 -DNDEBUG -I/var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.n4YlzeLW/pxp-agent/generated -I/var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.n4YlzeLW/pxp-agent/lib/inc -I/var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.n4YlzeLW/pxp-agent/vendor/leatherman/vendor/boost-nowide -I/var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.n4YlzeLW/pxp-agent/vendor/leatherman/locale/inc -I/usr/local/include -I/var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.n4YlzeLW/pxp-agent/vendor/leatherman/logging/inc -I/var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.n4YlzeLW/pxp-agent/vendor/leath

joshcooper

diff --git a/acceptance/tests/facts/macosx.rb b/acceptance/tests/facts/macosx.rb
index 599a2c1..71a0ed7 100644
--- a/acceptance/tests/facts/macosx.rb
+++ b/acceptance/tests/facts/macosx.rb
@@ -1,21 +1,28 @@
-test_name "Facts should resolve as expected in Mac OS X 10.9 and 10.10"
+test_name "Facts should resolve as expected in Mac OS X"
 
 #
 # This test is intended to ensure that facts specific to an OS configuration

joshcooper

#!/usr/bin/env ruby

STABLE_URL="https://jenkins.puppetlabs.com/view/All%20in%20One%20Agent/view/Stable/view/Puppet%20Agent%20Daily/job/platform_aio-suite_stage-intn_stable/api/json"
MASTER_URL="https://jenkins.puppetlabs.com/view/All%20in%20One%20Agent/view/Master/view/Puppet%20Agent%20Daily/job/platform_aio-suite_stage-intn_master/api/json"
AARDWOLF_URL="https://jenkins.puppetlabs.com/view/All%20in%20One%20Agent/view/Aardwolf/job/platform_aio-suite_stage-intn_aardwolf/api/json"

def get_targets(url, param)
  command = "curl -s #{url} |  jq '.actions[2].parameterDefinitions[] | select(.name == \"#{param}_TARGETS\").defaultParameterValue.value'"
  targets = %x{ #{command} }.chomp
  targets.gsub!(/\A"|"\Z/, '') # strip leading & trailing quote

joshcooper

diff --git a/lib/puppet/indirector/request.rb b/lib/puppet/indirector/request.rb
index e051c32..52940ce 100644
--- a/lib/puppet/indirector/request.rb
+++ b/lib/puppet/indirector/request.rb
@@ -190,7 +190,7 @@ class Puppet::Indirector::Request
           self.server = srv_server
           self.port   = srv_port
           return yield(self)
-        rescue SystemCallError => e
+        rescue SystemCallError, SocketError => e

joshcooper

msxa26p7awoab3j.delivery.puppetlabs.net (win-2012r2-rubyx86) 13:18:58$ ruby --version
ruby 2.1.7p400 (2015-08-18 revision 51632) [i386-mingw32]

msxa26p7awoab3j.delivery.puppetlabs.net (win-2012r2-rubyx86) executed in 0.77 seconds

msxa26p7awoab3j.delivery.puppetlabs.net (win-2012r2-rubyx86) 13:18:58$ cmd /c gem list
bigdecimal (1.2.4)
deep_merge (1.0.1)
ffi (1.9.6 x86-mingw32)
io-console (0.4.3, 0.4.2)

joshcooper

$verifyCallback = {
    param(
        $sender, $certificate, $chain, $policyErrors
    )

    $verified = $true

    switch($policyErrors) {
        None { 
            Write-Host "Verified Cert:" $certificate.SubjectName.Name