puppet 6.10.0-universal-darwin → 6.10.1-universal-darwin

data/spec/unit/type/service_spec.rb

@@ -93,6 +93,13 @@ describe test_title, "when validating attribute values" do
       expect(srv.should(:enable)).to eq(:manual)
     end
 
+    it "should support :delayed as a value on Windows" do
+      allow(Puppet::Util::Platform).to receive(:windows?).and_return(true)
+
+      srv = Puppet::Type.type(:service).new(:name => "yay", :enable => :delayed)
+      expect(srv.should(:enable)).to eq(:delayed)
+    end
+
     it "should not support :manual as a value when not on Windows" do
       allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
 
@@ -101,6 +108,15 @@ describe test_title, "when validating attribute values" do
         /Setting enable to manual is only supported on Microsoft Windows\./
       )
     end
+
+    it "should not support :delayed as a value when not on Windows" do
+      allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
+
+      expect { Puppet::Type.type(:service).new(:name => "yay", :enable => :delayed) }.to raise_error(
+        Puppet::Error,
+        /Setting enable to delayed is only supported on Microsoft Windows\./
+      )
+    end
   end
 
   describe "the timeout parameter" do

data/spec/unit/util/windows/service_spec.rb

@@ -41,6 +41,10 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
     expect(subject::QUERY_SERVICE_CONFIGW).to receive(:new).and_return(query_return)
   end
 
+  def expect_successful_config_query2_and_return(param, query_return)
+    expect(param).to receive(:new).and_return(query_return)
+  end
+
   let(:subject)      { Puppet::Util::Windows::Service }
   let(:pointer) { double() }
   let(:mock_service_name) { double() }
@@ -51,7 +55,9 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
   before do
     allow(subject).to receive(:QueryServiceStatusEx).and_return(1)
     allow(subject).to receive(:QueryServiceConfigW).and_return(1)
+    allow(subject).to receive(:QueryServiceConfig2W).and_return(1)
     allow(subject).to receive(:ChangeServiceConfigW).and_return(1)
+    allow(subject).to receive(:ChangeServiceConfig2W).and_return(1)
     allow(subject).to receive(:OpenSCManagerW).and_return(scm)
     allow(subject).to receive(:OpenServiceW).and_return(service)
     allow(subject).to receive(:CloseServiceHandle)
@@ -577,6 +583,9 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
         }.each do |start_type_name, start_type|
           it "queries the service and returns the service start type #{start_type_name}" do
             expect_successful_config_query_and_return({:dwStartType => start_type})
+            if start_type_name == :SERVICE_AUTO_START
+              expect_successful_config_query2_and_return(subject::SERVICE_DELAYED_AUTO_START_INFO, {:fDelayedAutostart => 0})
+            end
             expect(subject.service_start_type(mock_service_name)).to eq(start_type_name)
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 6.10.0
+  version: 6.10.1
 platform: universal-darwin
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2019-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -711,6 +711,7 @@ files:
 - lib/puppet/network/resolver.rb
 - lib/puppet/network/rest_controller.rb
 - lib/puppet/network/rights.rb
+- lib/puppet/network/uri.rb
 - lib/puppet/node.rb
 - lib/puppet/node/environment.rb
 - lib/puppet/node/facts.rb
@@ -1821,6 +1822,7 @@ files:
 - spec/integration/transaction_spec.rb
 - spec/integration/type/exec_spec.rb
 - spec/integration/type/file_spec.rb
+- spec/integration/type/notify_spec.rb
 - spec/integration/type/package_spec.rb
 - spec/integration/type/tidy_spec.rb
 - spec/integration/type_spec.rb
@@ -2181,6 +2183,7 @@ files:
 - spec/unit/network/http_spec.rb
 - spec/unit/network/resolver_spec.rb
 - spec/unit/network/rights_spec.rb
+- spec/unit/network/uri_spec.rb
 - spec/unit/node/environment_spec.rb
 - spec/unit/node/facts_spec.rb
 - spec/unit/node_spec.rb
@@ -3064,6 +3067,7 @@ test_files:
 - spec/integration/transaction_spec.rb
 - spec/integration/type/exec_spec.rb
 - spec/integration/type/file_spec.rb
+- spec/integration/type/notify_spec.rb
 - spec/integration/type/package_spec.rb
 - spec/integration/type/tidy_spec.rb
 - spec/integration/type_spec.rb
@@ -3424,6 +3428,7 @@ test_files:
 - spec/unit/network/http_spec.rb
 - spec/unit/network/resolver_spec.rb
 - spec/unit/network/rights_spec.rb
+- spec/unit/network/uri_spec.rb
 - spec/unit/node/environment_spec.rb
 - spec/unit/node/facts_spec.rb
 - spec/unit/node_spec.rb