puppet 5.5.8-x64-mingw32 → 5.5.10-x64-mingw32

data/spec/unit/provider/package/puppet_gem_spec.rb

@@ -1,9 +1,6 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
-provider_class = Puppet::Type.type(:package).provider(:puppet_gem)
-
-describe provider_class do
+describe Puppet::Type.type(:package).provider(:puppet_gem) do
   let(:resource) do
     Puppet::Type.type(:package).new(
       :name     => 'myresource',
@@ -12,7 +9,7 @@ describe provider_class do
   end
 
   let(:provider) do
-    provider = provider_class.new
+    provider = described_class.new
     provider.resource = resource
     provider
   end
@@ -27,9 +24,9 @@ describe provider_class do
     resource.provider = provider
   end
 
-  describe "when installing" do
+  context "when installing" do
     it "should use the path to the gem" do
-      provider_class.expects(:which).with(puppet_gem).returns(puppet_gem)
+      described_class.expects(:which).with(puppet_gem).returns(puppet_gem)
       provider.expects(:execute).with { |args| args[0] == puppet_gem }.returns ''
       provider.install
     end
@@ -46,9 +43,9 @@ describe provider_class do
     end
   end
 
-  describe "when uninstalling" do
+  context "when uninstalling" do
     it "should use the path to the gem" do
-      provider_class.expects(:which).with(puppet_gem).returns(puppet_gem)
+      described_class.expects(:which).with(puppet_gem).returns(puppet_gem)
       provider.expects(:execute).with { |args| args[0] == puppet_gem }.returns ''
       provider.install
     end

data/spec/unit/provider/package/tdnf_spec.rb

@@ -2,17 +2,14 @@ require 'spec_helper'
 
 # Note that much of the functionality of the tdnf provider is already tested with yum provider tests,
 # as yum is the parent provider, via dnf
-
-provider_class = Puppet::Type.type(:package).provider(:tdnf)
-
-context 'default' do
-  it 'should be the default provider on PhotonOS' do
-    Facter.stubs(:value).with(:osfamily).returns(:redhat)
-    Facter.stubs(:value).with(:operatingsystem).returns("PhotonOS")
-    expect(provider_class).to be_default
+describe Puppet::Type.type(:package).provider(:tdnf) do
+  it_behaves_like 'RHEL package provider', described_class, 'tdnf'
+
+  context 'default' do
+    it 'should be the default provider on PhotonOS' do
+      Facter.stubs(:value).with(:osfamily).returns(:redhat)
+      Facter.stubs(:value).with(:operatingsystem).returns("PhotonOS")
+      expect(described_class).to be_default
+    end
   end
 end
-
-describe provider_class do
-  it_behaves_like 'RHEL package provider', provider_class, 'tdnf'
-end

data/spec/unit/provider/package/yum_spec.rb

@@ -1,11 +1,9 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
-provider_class = Puppet::Type.type(:package).provider(:yum)
-
-describe provider_class do
+describe Puppet::Type.type(:package).provider(:yum) do
   include PuppetSpec::Fixtures
-  it_behaves_like 'RHEL package provider', provider_class, 'yum'
+
+  it_behaves_like 'RHEL package provider', described_class, 'yum'
 
   describe "when supplied the source param" do
     let(:name) { 'baz' }
@@ -18,12 +16,12 @@ describe provider_class do
     end
 
     let(:provider) do
-      provider = provider_class.new
+      provider = described_class.new
       provider.resource = resource
       provider
     end
 
-    before { provider_class.stubs(:command).with(:cmd).returns("/usr/bin/yum") }
+    before { described_class.stubs(:command).with(:cmd).returns("/usr/bin/yum") }
 
     context "when installing" do
       it "should use the supplied source as the explicit path to a package to install" do
@@ -51,16 +49,18 @@ describe provider_class do
     end
   end
 
-  describe "parsing the output of check-update" do
-    describe "with no multiline entries" do
+  context "parsing the output of check-update" do
+    context "with no multiline entries" do
       let(:check_update) { File.read(my_fixture("yum-check-update-simple.txt")) }
       let(:output) { described_class.parse_updates(check_update) }
+
       it 'creates an entry for each package keyed on the package name' do
         expect(output['curl']).to eq([{:name => 'curl', :epoch => '0', :version => '7.32.0', :release => '10.fc20', :arch => 'i686'}, {:name => 'curl', :epoch => '0', :version => '7.32.0', :release => '10.fc20', :arch => 'x86_64'}])
         expect(output['gawk']).to eq([{:name => 'gawk', :epoch => '0', :version => '4.1.0', :release => '3.fc20', :arch => 'i686'}])
         expect(output['dhclient']).to eq([{:name => 'dhclient', :epoch => '12', :version => '4.1.1', :release => '38.P1.fc20', :arch => 'i686'}])
         expect(output['selinux-policy']).to eq([{:name => 'selinux-policy', :epoch => '0', :version => '3.12.1', :release => '163.fc20', :arch => 'noarch'}])
       end
+
       it 'creates an entry for each package keyed on the package name and package architecture' do
         expect(output['curl.i686']).to eq([{:name => 'curl', :epoch => '0', :version => '7.32.0', :release => '10.fc20', :arch => 'i686'}])
         expect(output['curl.x86_64']).to eq([{:name => 'curl', :epoch => '0', :version => '7.32.0', :release => '10.fc20', :arch => 'x86_64'}])
@@ -70,55 +70,69 @@ describe provider_class do
         expect(output['java-1.8.0-openjdk.x86_64']).to eq([{:name => 'java-1.8.0-openjdk', :epoch => '1', :version => '1.8.0.131', :release => '2.b11.el7_3', :arch => 'x86_64'}])
       end
     end
-    describe "with multiline entries" do
+
+    context "with multiline entries" do
       let(:check_update) { File.read(my_fixture("yum-check-update-multiline.txt")) }
       let(:output) { described_class.parse_updates(check_update) }
+
       it "parses multi-line values as a single package tuple" do
         expect(output['libpcap']).to eq([{:name => 'libpcap', :epoch => '14', :version => '1.4.0', :release => '1.20130826git2dbcaa1.el6', :arch => 'x86_64'}])
       end
     end
-    describe "with obsoleted packages" do
+
+    context "with obsoleted packages" do
       let(:check_update) { File.read(my_fixture("yum-check-update-obsoletes.txt")) }
       let(:output) { described_class.parse_updates(check_update) }
+
       it "ignores all entries including and after 'Obsoleting Packages'" do
         expect(output).not_to include("Obsoleting")
         expect(output).not_to include("NetworkManager-bluetooth.x86_64")
         expect(output).not_to include("1:1.0.0-14.git20150121.b4ea599c.el7")
       end
     end
-    describe "with security notifications" do
+
+    context "with security notifications" do
       let(:check_update) { File.read(my_fixture("yum-check-update-security.txt")) }
       let(:output) { described_class.parse_updates(check_update) }
+
       it "ignores all entries including and after 'Security'" do
         expect(output).not_to include("Security")
       end
+
       it "includes updates before 'Security'" do
         expect(output).to include("yum-plugin-fastestmirror.noarch")
       end
     end
-    describe "with broken update notices" do
+
+    context "with broken update notices" do
       let(:check_update) { File.read(my_fixture("yum-check-update-broken-notices.txt")) }
       let(:output) { described_class.parse_updates(check_update) }
+
       it "ignores all entries including and after 'Update'" do
         expect(output).not_to include("Update")
       end
+
       it "includes updates before 'Update'" do
         expect(output).to include("yum-plugin-fastestmirror.noarch")
       end
     end
-    describe "with improper package names in output" do
+
+    context "with improper package names in output" do
       it "raises an exception parsing package name" do
         expect {
           described_class.update_to_hash('badpackagename', '1')
         }.to raise_exception(Exception, /Failed to parse/)
       end
     end
-    describe "with trailing plugin output" do
+
+    context "with trailing plugin output" do
       let(:check_update) { File.read(my_fixture("yum-check-update-plugin-output.txt")) }
       let(:output) { described_class.parse_updates(check_update) }
+
       it "parses correctly formatted entries" do
         expect(output['bash']).to eq([{:name => 'bash', :epoch => '0', :version => '4.2.46', :release => '12.el7', :arch => 'x86_64'}])
       end
+
       it "ignores all mentions of plugin output" do
         expect(output).not_to include("Random plugin")
       end

data/spec/unit/provider/package/zypper_spec.rb

@@ -1,9 +1,6 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
-provider_class = Puppet::Type.type(:package).provider(:zypper)
-
-describe provider_class do
+describe Puppet::Type.type(:package).provider(:zypper) do
   before(:each) do
     # Create a mock resource
     @resource = stub 'resource'
@@ -16,35 +13,35 @@ describe provider_class do
     @resource.stubs(:[]).with(:ensure).returns :installed
     @resource.stubs(:command).with(:zypper).returns "/usr/bin/zypper"
 
-    @provider = provider_class.new(@resource)
+    @provider = described_class.new(@resource)
   end
 
   it "should have an install method" do
-    @provider = provider_class.new
+    @provider = described_class.new
     expect(@provider).to respond_to(:install)
   end
 
   it "should have an uninstall method" do
-    @provider = provider_class.new
+    @provider = described_class.new
     expect(@provider).to respond_to(:uninstall)
   end
 
   it "should have an update method" do
-    @provider = provider_class.new
+    @provider = described_class.new
     expect(@provider).to respond_to(:update)
   end
 
   it "should have a latest method" do
-    @provider = provider_class.new
+    @provider = described_class.new
     expect(@provider).to respond_to(:latest)
   end
 
   it "should have a install_options method" do
-    @provider = provider_class.new
+    @provider = described_class.new
     expect(@provider).to respond_to(:install_options)
   end
 
-  describe "when installing with zypper version >= 1.0" do
+  context "when installing with zypper version >= 1.0" do
     it "should use a command-line with versioned package'" do
       @resource.stubs(:should).with(:ensure).returns "1.2.3-4.5.6"
       @resource.stubs(:allow_virtual?).returns false
@@ -65,7 +62,7 @@ describe provider_class do
     end
   end
 
-  describe "when installing with zypper version = 0.6.104" do
+  context "when installing with zypper version = 0.6.104" do
     it "should use a command-line with versioned package'" do
       @resource.stubs(:should).with(:ensure).returns "1.2.3-4.5.6"
       @resource.stubs(:allow_virtual?).returns false
@@ -86,7 +83,7 @@ describe provider_class do
     end
   end
 
-  describe "when installing with zypper version = 0.6.13" do
+  context "when installing with zypper version = 0.6.13" do
     it "should use a command-line with versioned package'" do
       @resource.stubs(:should).with(:ensure).returns "1.2.3-4.5.6"
       @resource.stubs(:allow_virtual?).returns false
@@ -107,15 +104,16 @@ describe provider_class do
     end
   end
 
-  describe "when updating" do
+  context "when updating" do
     it "should call install method of instance" do
       @provider.expects(:install)
       @provider.update
     end
   end
 
-  describe "when getting latest version" do
-    after do described_class.reset! end
+  context "when getting latest version" do
+    after { described_class.reset! }
+
     context "when the package has available update" do
       it "should return a version string with valid list-updates data from SLES11sp1" do
         fake_data = File.read(my_fixture('zypper-list-updates-SLES11sp1.out'))
@@ -144,7 +142,7 @@ describe provider_class do
     end
   end
 
-  describe "should install a virtual package" do
+  context "should install a virtual package" do
     it "when zypper version = 0.6.13" do
       @resource.stubs(:should).with(:ensure).returns :installed
       @resource.stubs(:allow_virtual?).returns true
@@ -164,7 +162,7 @@ describe provider_class do
     end
   end
 
-  describe "when installing with zypper install options" do
+  context "when installing with zypper install options" do
     it "should install the package without checking keys" do
       @resource.stubs(:[]).with(:name).returns "php5"
       @resource.stubs(:[]).with(:install_options).returns ['--no-gpg-check', {'-p' => '/vagrant/files/localrepo/'}]
@@ -215,7 +213,7 @@ describe provider_class do
     end
   end
 
-  describe 'when uninstalling' do
+  context 'when uninstalling' do
     it 'should use remove to uninstall on zypper version 1.6 and above' do
       @provider.stubs(:zypper_version).returns '1.6.308'
       @provider.expects(:zypper).with(:remove, '--no-confirm', 'mypackage')

data/spec/unit/provider/service/bsd_spec.rb

@@ -1,20 +1,16 @@
-#!/usr/bin/env ruby
-
 require 'spec_helper'
 
-provider_class = Puppet::Type.type(:service).provider(:bsd)
-
-describe provider_class, :unless => Puppet.features.microsoft_windows? do
+describe Puppet::Type.type(:service).provider(:bsd), :unless => Puppet.features.microsoft_windows? do
   before :each do
     Puppet::Type.type(:service).stubs(:defaultprovider).returns described_class
     Facter.stubs(:value).with(:operatingsystem).returns :netbsd
     Facter.stubs(:value).with(:osfamily).returns 'NetBSD'
     described_class.stubs(:defpath).returns('/etc/rc.conf.d')
-    @provider = provider_class.new
+    @provider = subject()
     @provider.stubs(:initscript)
   end
 
-  describe "#instances" do
+  context "#instances" do
     it "should have an instances method" do
       expect(described_class).to respond_to :instances
     end
@@ -24,7 +20,7 @@ describe provider_class, :unless => Puppet.features.microsoft_windows? do
     end
   end
 
-  describe "#disable" do
+  context "#disable" do
     it "should have a disable method" do
       expect(@provider).to respond_to(:disable)
     end
@@ -45,7 +41,7 @@ describe provider_class, :unless => Puppet.features.microsoft_windows? do
     end
   end
 
-  describe "#enable" do
+  context "#enable" do
     it "should have an enable method" do
       expect(@provider).to respond_to(:enable)
     end
@@ -70,7 +66,7 @@ describe provider_class, :unless => Puppet.features.microsoft_windows? do
     end
   end
 
-  describe "#enabled?" do
+  context "#enabled?" do
     it "should have an enabled? method" do
       expect(@provider).to respond_to(:enabled?)
     end
@@ -90,7 +86,7 @@ describe provider_class, :unless => Puppet.features.microsoft_windows? do
     end
   end
 
-  describe "#startcmd" do
+  context "#startcmd" do
     it "should have a startcmd method" do
       expect(@provider).to respond_to(:startcmd)
     end
@@ -109,7 +105,7 @@ describe provider_class, :unless => Puppet.features.microsoft_windows? do
     end
   end
 
-  describe "#stopcmd" do
+  context "#stopcmd" do
     it "should have a stopcmd method" do
       expect(@provider).to respond_to(:stopcmd)
     end

data/spec/unit/provider/service/daemontools_spec.rb

@@ -1,20 +1,11 @@
-#! /usr/bin/env ruby
-#
-# Unit testing for the Daemontools service Provider
-#
-# author Brice Figureau
-#
 require 'spec_helper'
 
-provider_class = Puppet::Type.type(:service).provider(:daemontools)
-
-describe provider_class do
-
+describe Puppet::Type.type(:service).provider(:daemontools) do
   before(:each) do
     # Create a mock resource
     @resource = stub 'resource'
 
-    @provider = provider_class.new
+    @provider = subject()
     @servicedir = "/etc/service"
     @provider.servicedir=@servicedir
     @daemondir = "/var/lib/service"
@@ -63,7 +54,7 @@ describe provider_class do
     expect(@provider).to respond_to(:disable)
   end
 
-  describe "when starting" do
+  context "when starting" do
     it "should use 'svc' to start the service" do
       @provider.stubs(:enabled?).returns :true
       @provider.expects(:svc).with("-u", "/etc/service/myservice")
@@ -81,7 +72,7 @@ describe provider_class do
     end
   end
 
-  describe "when stopping" do
+  context "when stopping" do
     it "should use 'svc' to stop the service" do
       @provider.stubs(:disable)
       @provider.expects(:svc).with("-d", "/etc/service/myservice")
@@ -90,7 +81,7 @@ describe provider_class do
     end
   end
 
-  describe "when restarting" do
+  context "when restarting" do
     it "should use 'svc' to restart the service" do
       @provider.expects(:svc).with("-t", "/etc/service/myservice")
 
@@ -98,7 +89,7 @@ describe provider_class do
     end
   end
 
-  describe "when enabling" do
+  context "when enabling" do
     it "should create a symlink between daemon dir and service dir", :if => Puppet.features.manages_symlinks?  do
       daemon_path = File.join(@daemondir, "myservice")
       service_path = File.join(@servicedir, "myservice")
@@ -109,7 +100,7 @@ describe provider_class do
     end
   end
 
-  describe "when disabling" do
+  context "when disabling" do
     it "should remove the symlink between daemon dir and service dir" do
       FileTest.stubs(:directory?).returns(false)
       path = File.join(@servicedir,"myservice")
@@ -128,7 +119,7 @@ describe provider_class do
     end
   end
 
-  describe "when checking if the service is enabled?" do
+  context "when checking if the service is enabled?" do
     it "should return true if it is running" do
       @provider.stubs(:status).returns(:running)
 
@@ -146,26 +137,27 @@ describe provider_class do
     end
   end
 
-  describe "when checking status" do
+  context "when checking status" do
     it "should call the external command 'svstat /etc/service/myservice'" do
       @provider.expects(:svstat).with(File.join(@servicedir,"myservice"))
       @provider.status
     end
   end
 
-  describe "when checking status" do
+  context "when checking status" do
     it "and svstat fails, properly raise a Puppet::Error" do
       @provider.expects(:svstat).with(File.join(@servicedir,"myservice")).raises(Puppet::ExecutionFailure, "failure")
       expect { @provider.status }.to raise_error(Puppet::Error, 'Could not get status for service Service[myservice]: failure')
     end
+
     it "and svstat returns up, then return :running" do
       @provider.expects(:svstat).with(File.join(@servicedir,"myservice")).returns("/etc/service/myservice: up (pid 454) 954326 seconds")
       expect(@provider.status).to eq(:running)
     end
+
     it "and svstat returns not running, then return :stopped" do
       @provider.expects(:svstat).with(File.join(@servicedir,"myservice")).returns("/etc/service/myservice: supervise not running")
       expect(@provider.status).to  eq(:stopped)
     end
   end
-
 end