diff options
author | Claire McQuin <claire@getchef.com> | 2014-10-30 10:56:04 -0700 |
---|---|---|
committer | Claire McQuin <claire@getchef.com> | 2014-10-30 10:56:04 -0700 |
commit | 26c396f59a0716aa0528ea9731815796ac1856c6 (patch) | |
tree | 929ab99c7edb0b5ef3e408b3de0d6507d63fa764 /spec/functional/event_loggers | |
parent | bae70819afec848f45f3468b1d938d1f3e11dda6 (diff) | |
parent | d3a2281b77bea82d90e58d8143ce6db068181a09 (diff) | |
download | chef-26c396f59a0716aa0528ea9731815796ac1856c6.tar.gz |
Merge branch 'master' into mcquin/rspec-3
Conflicts:
spec/functional/dsl/reboot_pending_spec.rb
spec/functional/event_loggers/windows_eventlog_spec.rb
Diffstat (limited to 'spec/functional/event_loggers')
-rw-r--r-- | spec/functional/event_loggers/windows_eventlog_spec.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/functional/event_loggers/windows_eventlog_spec.rb b/spec/functional/event_loggers/windows_eventlog_spec.rb index 2a87262fe1..4e383dd429 100644 --- a/spec/functional/event_loggers/windows_eventlog_spec.rb +++ b/spec/functional/event_loggers/windows_eventlog_spec.rb @@ -19,12 +19,12 @@ require 'spec_helper' require 'securerandom' require 'chef/event_loggers/windows_eventlog' -if Chef::Platform.windows? +if Chef::Platform.windows? and not Chef::Platform::windows_server_2003? require 'win32/eventlog' include Win32 end -describe Chef::EventLoggers::WindowsEventLogger, :windows_only do +describe Chef::EventLoggers::WindowsEventLogger, :windows_only, :not_supported_on_win2k3 do let(:run_id) { SecureRandom.uuid } let(:version) { SecureRandom.uuid } let(:elapsed_time) { SecureRandom.random_number(100) } @@ -43,14 +43,14 @@ describe Chef::EventLoggers::WindowsEventLogger, :windows_only do it 'writes run_start event with event_id 10000 and contains version' do logger.run_start(version) - expect(event_log.read(flags, offset).any? { |e| e.source == 'Chef' && e.event_id == 10000 && + expect(event_log.read(flags, offset).any? { |e| e.source == 'Chef' && e.event_id == 10000 && e.string_inserts[0].include?(version)}).to be_truthy end it 'writes run_started event with event_id 10001 and contains the run_id' do logger.run_started(run_status) - expect(event_log.read(flags, offset).any? { |e| e.source == 'Chef' && e.event_id == 10001 && + expect(event_log.read(flags, offset).any? { |e| e.source == 'Chef' && e.event_id == 10001 && e.string_inserts[0].include?(run_id)}).to be_truthy end @@ -58,7 +58,7 @@ describe Chef::EventLoggers::WindowsEventLogger, :windows_only do logger.run_started(run_status) logger.run_completed(node) - expect(event_log.read(flags, offset).any? { |e| e.source == 'Chef' && e.event_id == 10002 && + expect(event_log.read(flags, offset).any? { |e| e.source == 'Chef' && e.event_id == 10002 && e.string_inserts[0].include?(run_id) && e.string_inserts[1].include?(elapsed_time.to_s) }).to be_truthy |