X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Facceptance%2Finit_task_spec.rb;h=7a21a43854ee76012dbbc8ecea9e61ef657adbd9;hb=refs%2Fheads%2Frelease-prep;hp=a95ef5df128dd07b85133be363b74020e2b5a56e;hpb=d91bb710d6904008aa9cde435928e2ab690f83db;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/acceptance/init_task_spec.rb b/spec/acceptance/init_task_spec.rb
index a95ef5d..7a21a43 100644
--- a/spec/acceptance/init_task_spec.rb
+++ b/spec/acceptance/init_task_spec.rb
@@ -1,29 +1,34 @@
+# frozen_string_literal: true
+
 # run a test task
 require 'spec_helper_acceptance'
 
-describe 'apt tasks', if: pe_install? && puppet_version =~ %r{(5\.\d\.\d)} && fact_on(master, 'osfamily') == 'Debian' do
+describe 'apt tasks' do
   describe 'update' do
     it 'updates package lists' do
-      result = run_task(task_name: 'apt', params: 'action=update')
-      expect_multiple_regexes(result: result, regexes: [%r{Reading package lists}, %r{Job completed. 1/1 nodes succeeded}])
+      result = run_bolt_task('apt', 'action' => 'update')
+      expect(result.stdout).to contain(%r{Reading package lists})
     end
   end
+
   describe 'upgrade' do
     it 'upgrades packages' do
-      result = run_task(task_name: 'apt', params: 'action=upgrade')
-      expect_multiple_regexes(result: result, regexes: [%r{\d+ upgraded, \d+ newly installed, \d+ to remove and \d+ not upgraded}, %r{Job completed. 1/1 nodes succeeded}])
+      result = run_bolt_task('apt', 'action' => 'upgrade')
+      expect(result.stdout).to contain(%r{\d+ upgraded, \d+ newly installed, \d+ to remove and \d+ not upgraded})
     end
   end
+
   describe 'dist-upgrade' do
     it 'dist-upgrades packages' do
-      result = run_task(task_name: 'apt', params: 'action=dist-upgrade')
-      expect_multiple_regexes(result: result, regexes: [%r{\d+ upgraded, \d+ newly installed, \d+ to remove and \d+ not upgraded}, %r{Job completed. 1/1 nodes succeeded}])
+      result = run_bolt_task('apt', 'action' => 'dist-upgrade')
+      expect(result.stdout).to contain(%r{\d+ upgraded, \d+ newly installed, \d+ to remove and \d+ not upgraded})
     end
   end
+
   describe 'autoremove' do
     it 'autoremoves obsolete packages' do
-      result = run_task(task_name: 'apt', params: 'action=autoremove')
-      expect_multiple_regexes(result: result, regexes: [%r{\d+ upgraded, \d+ newly installed, \d+ to remove and \d+ not upgraded}, %r{Job completed. 1/1 nodes succeeded}])
+      result = run_bolt_task('apt', 'action' => 'autoremove')
+      expect(result.stdout).to contain(%r{\d+ upgraded, \d+ newly installed, \d+ to remove and \d+ not upgraded})
     end
   end
 end