From a89b7a532b2e701e6e481590f7cc81cc675b3dd2 Mon Sep 17 00:00:00 2001 From: Lennart Betz Date: Fri, 18 Jun 2021 18:07:11 +0200 Subject: [PATCH] Update AUTHORS --- AUTHORS | 4 ++++ TESTING.md | 3 +-- spec/classes/director_servicespec.rb | 31 ---------------------------- spec/classes/director_spec.rb | 2 -- spec/classes/vspheredb_spec.rb | 3 ++- 5 files changed, 7 insertions(+), 36 deletions(-) delete mode 100644 spec/classes/director_servicespec.rb diff --git a/AUTHORS b/AUTHORS index 21a77c0e..b6b1b179 100644 --- a/AUTHORS +++ b/AUTHORS @@ -15,6 +15,7 @@ Florian Baumann James Weakly Jan Collijs Johan Fleury +Jonas Verhofsté Josh Beard Joshua Hoblitt Khanh Ngo @@ -22,16 +23,19 @@ Lennart Betz Leo Antunes Lorenz Bischof Markus Frosch +Martin Jansen Matthias Baur Michael Friedrich Nicolas Dandrimont Ott, Jörn WI (Fa. Goetzfried) Paolo Schiro +Pavel Pulec Peter Souter Robert Waffen Rudy Gevaert Sebastian Brückner Stefan Kleindl +Steffen Zieger Steven Bambling Tim Bishop Timo Goebel diff --git a/TESTING.md b/TESTING.md index 2e6a08e6..0c06c016 100644 --- a/TESTING.md +++ b/TESTING.md @@ -41,12 +41,11 @@ Run unit tests: ``` cd puppet-icinga2 pdk test unit -pdk test unit --tests=repos ``` Or dedicated tests: ``` -pdk test unit --tests=spec/classes/repos_spec.rb,spec/classes/redis_spec.rb +pdk test unit --tests=spec/classes/vspheredb_spec.rb,spec/classes/vspeheredb_service_spec.rb ``` ## Acceptance tests diff --git a/spec/classes/director_servicespec.rb b/spec/classes/director_servicespec.rb deleted file mode 100644 index c7198fae..00000000 --- a/spec/classes/director_servicespec.rb +++ /dev/null @@ -1,31 +0,0 @@ -require 'spec_helper' - -describe('icingaweb2::module::director::service', type: :class) do - let(:pre_condition) do - [ - "class { 'icingaweb2': }", - "class { 'icingaweb2::module::director': }", - ] - end - - on_supported_os.each do |os, facts| - context "on #{os}" do - let :facts do - facts - end - - context "#{os} with defaults" do - it { - is_expected.to contain_user('icingadirector') - .with('ensure' => 'present', 'gid' => 'icingaweb2', 'shell' => '/bin/false').that_comes_before('Systemd::Unit_file[icinga-director.service]') - } - it { is_expected.to contain_systemd__unit_file('icinga-director.service').that_notifies('Service[icinga-director]') } - it { - is_expected.to contain_service('icinga-director') - .with('ensure' => 'running', - 'enable' => true) - } - end - end - end -end diff --git a/spec/classes/director_spec.rb b/spec/classes/director_spec.rb index 34909c83..8241fc31 100644 --- a/spec/classes/director_spec.rb +++ b/spec/classes/director_spec.rb @@ -32,7 +32,6 @@ .with_type('db') .with_db_type('mysql') .with_host('localhost') - .with_port('3306') .with_db_name('director') .with_db_username('director') .with_db_password('director') @@ -83,7 +82,6 @@ .with_type('db') .with_db_type('mysql') .with_host('localhost') - .with_port('3306') .with_db_name('director') .with_db_username('director') .with_db_password('director') diff --git a/spec/classes/vspheredb_spec.rb b/spec/classes/vspheredb_spec.rb index 9d8badf5..314a89bf 100644 --- a/spec/classes/vspheredb_spec.rb +++ b/spec/classes/vspheredb_spec.rb @@ -38,9 +38,10 @@ is_expected.to contain_icingaweb2__module('vspheredb') .with_install_method('git') .with_git_revision('v1.1.0') + .with_package_name('icingaweb2-module-vspheredb') .with_settings('icingaweb2-module-vspheredb' => { 'section_name' => 'db', - 'target' => '/etc/icingaweb2/modules/vspheredb', + 'target' => '/etc/icingaweb2/modules/vspheredb/config.ini', 'settings' => { 'resource' => 'icingaweb2-module-vspheredb', },