Merge pull request #14496 from bzwei/stdout_format

Accept a format parameter to get stdout
ManageIQ · Mar 27, 2017 · ddfc437 · ddfc437
2 parents e788b2b + 30af212
commit ddfc437
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -38,7 +38,7 @@ gem "activerecord-session_store",     "~>1.0.0"
 gem "acts_as_list",                   "~>0.7.2"
 gem "acts_as_tree",                   "~>2.1.0" # acts_as_tree needs to be required so that it loads before ancestry
 gem "ancestry",                       "~>2.2.1",       :require => false
-gem "ansible_tower_client",           "~>0.9.0",       :require => false
+gem "ansible_tower_client",           "~>0.10.0",      :require => false
 gem "aws-sdk",                        "~>2",           :require => false
 gem "bundler",                        ">=1.11.1",      :require => false
 gem "color",                          "~>1.8"

diff --git a/app/models/manageiq/providers/ansible_tower/shared/automation_manager/job.rb b/app/models/manageiq/providers/ansible_tower/shared/automation_manager/job.rb
@@ -134,9 +134,9 @@ def raw_status
     raise MiqException::MiqOrchestrationStatusError, err.to_s, err.backtrace
   end
 
-  def raw_stdout
+  def raw_stdout(format = 'txt')
     ext_management_system.with_provider_connection do |connection|
-      connection.api.jobs.find(ems_ref).stdout
+      connection.api.jobs.find(ems_ref).stdout(format)
     end
   rescue AnsibleTowerClient::ResourceNotFoundError
     msg = "AnsibleTower Job #{name} with id(#{id}) does not exist on #{ext_management_system.name}"

diff --git a/spec/support/ansible_shared/automation_manager/job.rb b/spec/support/ansible_shared/automation_manager/job.rb
@@ -29,7 +29,7 @@
       'cloud_credential_id'   => cloud_credential.manager_ref,
       'network_credential_id' => network_credential.manager_ref
     ).tap do |rjob|
-      allow(rjob).to receive(:stdout).and_return('job stdout')
+      allow(rjob).to receive(:stdout).with('html').and_return('<html><body>job stdout</body></html>')
       allow(rjob).to receive(:job_plays).and_return(the_raw_plays)
     end
   end
@@ -145,12 +145,12 @@
     end
 
     it 'gets the standard output of the job' do
-      expect(subject.raw_stdout).to eq('job stdout')
+      expect(subject.raw_stdout('html')).to eq('<html><body>job stdout</body></html>')
     end
 
     it 'catches errors from provider' do
       expect(connection.api.jobs).to receive(:find).and_raise("bad happened")
-      expect { subject.raw_stdout }.to raise_error(MiqException::MiqOrchestrationStatusError)
+      expect { subject.raw_stdout('html') }.to raise_error(MiqException::MiqOrchestrationStatusError)
     end
   end
 end