(FM-7602) Update acceptance tests

puppetlabs · Mar 13, 2019 · daba8c5 · daba8c5
1 parent b08a380
commit daba8c5
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 14 deletions.
diff --git a/lib/puppet/util/task_helper.rb b/lib/puppet/util/task_helper.rb
@@ -5,6 +5,7 @@
 class Puppet::Util::TaskHelper
   def initialize(transport_name)
     @transport_name = transport_name
+    @transport = {}
 
     return unless params.key? '_installdir'
     add_plugin_paths(params['_installdir'])
@@ -13,7 +14,7 @@ def initialize(transport_name)
   def transport
     require 'puppet/resource_api/transport'
 
-    Puppet::ResourceApi::Transport.connect(@transport_name, credentials)
+    @transport[@transport_name] ||= Puppet::ResourceApi::Transport.connect(@transport_name, credentials)
   end
 
   def params

diff --git a/spec/acceptance/basic_spec.rb b/spec/acceptance/basic_spec.rb
@@ -25,7 +25,6 @@
     context 'when it gets the current running config' do
       it 'will get the current running config and store to file' do
         params = {
-          'credentials_file' => "file://#{Dir.getwd}/spec/fixtures/acceptance-credentials.conf",
           'config_file' => 'spec/fixtures/config-acceptance.xml',
         }
 
@@ -68,7 +67,6 @@
             context 'when it gets the current running config' do
               it 'will get the current running config and store to file' do
                 params = {
-                  'credentials_file' => "file://#{Dir.getwd}/spec/fixtures/acceptance-credentials.conf",
                   'config_file' => 'spec/fixtures/config-reset.xml',
                 }
 

diff --git a/spec/acceptance/tasks/config_spec.rb b/spec/acceptance/tasks/config_spec.rb
@@ -4,7 +4,11 @@
 describe 'Config task' do
   before(:each) do
     params = {
-      'credentials_file' => "file://#{Dir.getwd}/spec/fixtures/acceptance-credentials.conf",
+      '_target' => {
+        'host' => RSpec.configuration.host,
+        'user' => RSpec.configuration.user,
+        'password' => RSpec.configuration.password,
+      },
       'config_file' => config,
       'apply' => apply,
     }
@@ -21,7 +25,11 @@
 
   after(:all) do
     params = {
-      'credentials_file' => "file://#{Dir.getwd}/spec/fixtures/acceptance-credentials.conf",
+      '_target' => {
+        'host' => RSpec.configuration.host,
+        'user' => RSpec.configuration.user,
+        'password' => RSpec.configuration.password,
+      },
       'config_file' => 'spec/fixtures/config-reset.xml',
       'apply' => true,
     }
@@ -35,8 +43,8 @@
     let(:apply) { false }
 
     it 'will upload the configuration file but not load it' do
-      expect(stdout_str).not_to match %r{Loading Config}
-      expect(stdout_str).to match %r{Importing configuration}
+      expect(stdout_str).to match %r{\{\}}
+      expect(stdout_str).not_to match %r{_error}
       puts stdout_str if debug_output?
       expect(status.exitstatus).to eq 0
     end
@@ -46,8 +54,8 @@
     let(:apply) { true }
 
     it 'will upload the configuration file and load it' do
-      expect(stdout_str).to match %r{Loading Config}
-      expect(stdout_str).to match %r{Importing configuration}
+      expect(stdout_str).to match %r{\{\}}
+      expect(stdout_str).not_to match %r{_error}
       puts stdout_str if debug_output?
       expect(status.exitstatus).to eq 0
     end
@@ -74,8 +82,8 @@
     let(:apply) { true }
 
     it 'will upload the configuration file and load it' do
-      expect(stdout_str).to match %r{Loading Config}
-      expect(stdout_str).to match %r{Importing configuration}
+      expect(stdout_str).to match %r{\{\}}
+      expect(stdout_str).not_to match %r{_error}
       puts stdout_str if debug_output?
       expect(status.exitstatus).to eq 0
     end

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -45,11 +45,15 @@ def debug_output?
 
     puts "Detected #{@platform} config for #{@hostname}"
 
+    c.add_setting :host, :default => @hostname
+    c.add_setting :user, :default => (ENV['PANOS_TEST_USER'] || 'admin')
+    c.add_setting :password, :default => (ENV['PANOS_TEST_PASSWORD'] || 'admin')
+
     File.open('spec/fixtures/acceptance-credentials.conf', 'w') do |file|
       file.puts <<CREDENTIALS
-address: #{@hostname}
-username: #{ENV['PANOS_TEST_USER'] || 'admin'}
-password: #{ENV['PANOS_TEST_PASSWORD'] || 'admin'}
+host: #{RSpec.configuration.host}
+user: #{RSpec.configuration.user}
+password: #{RSpec.configuration.password}
 CREDENTIALS
     end