From 7943b25ec1abcb1c0e86cd42cdfd3b2d3d511ee8 Mon Sep 17 00:00:00 2001 From: Bryan Jen Date: Wed, 16 Mar 2016 13:57:36 -0700 Subject: (maint) Fixes fqdn_rand_string tests Puppet 4.4.0 and later has changed fqdn_rand to use a higher ceiling (PUP-5646), the tests for fqdn_rand_string needed to be updated to reflect the new expected output. --- spec/acceptance/fqdn_rand_string_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/acceptance/fqdn_rand_string_spec.rb b/spec/acceptance/fqdn_rand_string_spec.rb index 9c6d701..065a517 100644 --- a/spec/acceptance/fqdn_rand_string_spec.rb +++ b/spec/acceptance/fqdn_rand_string_spec.rb @@ -17,7 +17,7 @@ describe 'fqdn_rand_string function', :unless => UNSUPPORTED_PLATFORMS.include?( eos apply_manifest(pp, :catch_failures => true) do |r| - expect(r.stdout).to match(/fqdn_rand_string is "7oDp0KOr1b"/) + expect(r.stdout).to match(/fqdn_rand_string is "(7oDp0KOr1b|9Acvnhkt4J)"/) end end it 'generates random alphanumeric strings with custom charsets' do @@ -29,7 +29,7 @@ describe 'fqdn_rand_string function', :unless => UNSUPPORTED_PLATFORMS.include?( eos apply_manifest(pp, :catch_failures => true) do |r| - expect(r.stdout).to match(/fqdn_rand_string is "7203048515"/) + expect(r.stdout).to match(/fqdn_rand_string is "(7203048515|2383756694)"/) end end it 'generates random alphanumeric strings with custom seeds' do @@ -41,7 +41,7 @@ describe 'fqdn_rand_string function', :unless => UNSUPPORTED_PLATFORMS.include?( eos apply_manifest(pp, :catch_failures => true) do |r| - expect(r.stdout).to match(/fqdn_rand_string is "3HS4mbuI3E"/) + expect(r.stdout).to match(/fqdn_rand_string is "(3HS4mbuI3E|1jJtAMs94d)"/) end end it 'generates random alphanumeric strings with custom charsets and seeds' do @@ -54,7 +54,7 @@ describe 'fqdn_rand_string function', :unless => UNSUPPORTED_PLATFORMS.include?( eos apply_manifest(pp, :catch_failures => true) do |r| - expect(r.stdout).to match(/fqdn_rand_string is "3104058232"/) + expect(r.stdout).to match(/fqdn_rand_string is "(3104058232|7100592312)"/) end end end -- cgit v1.2.3