From 6277f0a189e6e8e457dba9ee5bfe2e303746157b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 16 Mar 2015 14:52:50 +0100 Subject: Add debian-8-x86_64-vagrant --- spec/acceptance/nodesets/centos-7-x86_64-openstack.yml | 2 +- spec/acceptance/nodesets/debian-7-x86_64-openstack.yml | 2 +- spec/acceptance/nodesets/debian-8-x86_64-openstack.yml | 4 ++-- spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml | 10 ++++++++++ 4 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml (limited to 'spec') diff --git a/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml index 37dfc5f..2036c0b 100644 --- a/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml @@ -4,7 +4,7 @@ HOSTS: strict_variables: platform: el-7-x86_64 hypervisor : openstack - flavor: m1.small + flavor: m1.medium image: centos-7-x86_64-genericcloud-20140929_01 user: centos CONFIG: diff --git a/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml index e52336b..c44f917 100644 --- a/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml @@ -4,7 +4,7 @@ HOSTS: strict_variables: platform: debian-7-amd64 hypervisor : openstack - flavor: m1.small + flavor: m1.medium image: debian-7-amd64-20141121 user: debian CONFIG: diff --git a/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml index 194ca46..f7b2e50 100644 --- a/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml @@ -4,10 +4,10 @@ HOSTS: strict_variables: platform: debian-8-amd64 hypervisor : openstack - flavor: m1.small + flavor: m1.medium image: debian-8-amd64-20141121 user: debian CONFIG: type: foss - openstack_network: default log_level: debug + openstack_network: default diff --git a/spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml new file mode 100644 index 0000000..38c844b --- /dev/null +++ b/spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml @@ -0,0 +1,10 @@ +HOSTS: + debian-8-x64: + default_apply_opts: + strict_variables: + platform: debian-8-amd64 + hypervisor : vagrant + box : camptocamp/debian-8-amd64 +CONFIG: + type: foss + log_level: debug -- cgit v1.2.3 From f02d6faadd181493ccc9236f43296f2ba56ed592 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Tue, 17 Mar 2015 15:58:12 +0100 Subject: Encourage file() usage --- spec/defines/augeas_lens_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec') diff --git a/spec/defines/augeas_lens_spec.rb b/spec/defines/augeas_lens_spec.rb index 7feeefb..21dfd55 100644 --- a/spec/defines/augeas_lens_spec.rb +++ b/spec/defines/augeas_lens_spec.rb @@ -37,7 +37,7 @@ describe 'augeas::lens' do it 'should error' do expect { is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') - }.to raise_error(Puppet::Error, /Must pass lens_source/) + }.to raise_error(Puppet::Error, /You must set either \$lens_source or \$lens_content/) end end -- cgit v1.2.3 From f582c63c573287bcfc7d28b928897e530c321791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Tue, 31 Mar 2015 11:36:51 +0200 Subject: Update with msync --- spec/acceptance/nodesets/centos-6-x86_64-docker.yml | 12 ++++++++++++ spec/acceptance/nodesets/centos-6-x86_64-openstack.yml | 13 +++++++++++++ spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml | 10 ++++++++++ spec/acceptance/nodesets/centos-7-x86_64-openstack.yml | 4 ++-- spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml | 2 +- spec/acceptance/nodesets/debian-6-x86_64-openstack.yml | 13 +++++++++++++ spec/acceptance/nodesets/debian-7-x86_64-openstack.yml | 4 ++-- spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml | 2 +- spec/acceptance/nodesets/debian-8-x86_64-openstack.yml | 4 ++-- 9 files changed, 56 insertions(+), 8 deletions(-) create mode 100644 spec/acceptance/nodesets/centos-6-x86_64-docker.yml create mode 100644 spec/acceptance/nodesets/centos-6-x86_64-openstack.yml create mode 100644 spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml create mode 100644 spec/acceptance/nodesets/debian-6-x86_64-openstack.yml (limited to 'spec') diff --git a/spec/acceptance/nodesets/centos-6-x86_64-docker.yml b/spec/acceptance/nodesets/centos-6-x86_64-docker.yml new file mode 100644 index 0000000..b88cc95 --- /dev/null +++ b/spec/acceptance/nodesets/centos-6-x86_64-docker.yml @@ -0,0 +1,12 @@ +HOSTS: + centos-6-x64: + default_apply_opts: + strict_variables: + platform: el-6-x86_64 + hypervisor : docker + image: centos:6 + # This stops the image from being deleted on completion, speeding up the process. + docker_preserve_image: true +CONFIG: + type: foss + log_level: debug diff --git a/spec/acceptance/nodesets/centos-6-x86_64-openstack.yml b/spec/acceptance/nodesets/centos-6-x86_64-openstack.yml new file mode 100644 index 0000000..0291ce5 --- /dev/null +++ b/spec/acceptance/nodesets/centos-6-x86_64-openstack.yml @@ -0,0 +1,13 @@ +HOSTS: + centos-6-x64: + default_apply_opts: + strict_variables: + platform: el-6-x86_64 + hypervisor : openstack + flavor: m1.small + image: centos-6-latest + user: root +CONFIG: + type: foss + log_level: debug + openstack_network: default diff --git a/spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml b/spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml new file mode 100644 index 0000000..191329c --- /dev/null +++ b/spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml @@ -0,0 +1,10 @@ +HOSTS: + centos-6-x64: + default_apply_opts: + strict_variables: + platform: el-6-x86_64 + hypervisor : vagrant + box : camptocamp/centos-6-x86_64 +CONFIG: + type: foss + log_level: debug diff --git a/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml index 2036c0b..b0769b9 100644 --- a/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml @@ -4,8 +4,8 @@ HOSTS: strict_variables: platform: el-7-x86_64 hypervisor : openstack - flavor: m1.medium - image: centos-7-x86_64-genericcloud-20140929_01 + flavor: m1.small + image: centos-7-latest user: centos CONFIG: type: foss diff --git a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml index fe0f83b..6f02769 100644 --- a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml +++ b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml @@ -4,7 +4,7 @@ HOSTS: strict_variables: platform: el-7-x86_64 hypervisor : vagrant - box : puppetlabs/centos-7.0-64-nocm + box : camptocamp/centos-7-x86_64 CONFIG: type: foss log_level: debug diff --git a/spec/acceptance/nodesets/debian-6-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-6-x86_64-openstack.yml new file mode 100644 index 0000000..276356b --- /dev/null +++ b/spec/acceptance/nodesets/debian-6-x86_64-openstack.yml @@ -0,0 +1,13 @@ +HOSTS: + debian-6-x64: + default_apply_opts: + strict_variables: + platform: debian-6-amd64 + hypervisor : openstack + flavor: m1.small + image: debian-6-latest + user: debian +CONFIG: + type: foss + log_level: debug + openstack_network: default diff --git a/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml index c44f917..8c23792 100644 --- a/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml @@ -4,8 +4,8 @@ HOSTS: strict_variables: platform: debian-7-amd64 hypervisor : openstack - flavor: m1.medium - image: debian-7-amd64-20141121 + flavor: m1.small + image: debian-7-latest user: debian CONFIG: type: foss diff --git a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml index 86c2165..21aee50 100644 --- a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml +++ b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml @@ -4,7 +4,7 @@ HOSTS: strict_variables: platform: debian-7-amd64 hypervisor : vagrant - box : puppetlabs/debian-7.8-64-nocm + box : camptocamp/debian-7-amd64 CONFIG: type: foss log_level: debug diff --git a/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml index f7b2e50..94fe73a 100644 --- a/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml @@ -4,8 +4,8 @@ HOSTS: strict_variables: platform: debian-8-amd64 hypervisor : openstack - flavor: m1.medium - image: debian-8-amd64-20141121 + flavor: m1.small + image: debian-8-latest user: debian CONFIG: type: foss -- cgit v1.2.3 From 23426fe87b89c50e7531519f31cbeab1b463d2ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 8 Apr 2015 14:49:41 +0200 Subject: Add puppet-lint-fileserver-check to Gemfile --- spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml (limited to 'spec') diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml new file mode 100644 index 0000000..073562e --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml @@ -0,0 +1,13 @@ +HOSTS: + ubuntu-14.04-x64: + default_apply_opts: + strict_variables: + platform: ubuntu-14.04-amd64 + hypervisor : openstack + flavor: m1.small + image: ubuntu-1404-latest + user: ubuntu +CONFIG: + type: foss + log_level: debug + openstack_network: default -- cgit v1.2.3 From f4e49b2f36b26765db83105b801ca088a7f1d7d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Tue, 14 Apr 2015 11:24:39 +0200 Subject: Add puppet-lint-fileserver-check --- spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec') diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml index a3edb70..7188ccb 100644 --- a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml +++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml @@ -1,5 +1,5 @@ HOSTS: - ubuntu-14.04-x64: + ubuntu-1404-x64: default_apply_opts: strict_variables: platform: ubuntu-14.04-amd64 -- cgit v1.2.3 From 101f0ff0b6d4bc8f53b9582410b6a8130668f8f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 17 Apr 2015 10:19:56 +0200 Subject: Add nodeset for centos5 on docker --- spec/acceptance/nodesets/centos-5-x86_64-docker.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 spec/acceptance/nodesets/centos-5-x86_64-docker.yml (limited to 'spec') diff --git a/spec/acceptance/nodesets/centos-5-x86_64-docker.yml b/spec/acceptance/nodesets/centos-5-x86_64-docker.yml new file mode 100644 index 0000000..174460d --- /dev/null +++ b/spec/acceptance/nodesets/centos-5-x86_64-docker.yml @@ -0,0 +1,12 @@ +HOSTS: + centos-5-x64: + default_apply_opts: + strict_variables: + platform: el-5-x86_64 + hypervisor : docker + image: centos:5 + # This stops the image from being deleted on completion, speeding up the process. + docker_preserve_image: true +CONFIG: + type: foss + log_level: debug -- cgit v1.2.3 From 7725b10d1fd6bc33fbc0cfd2ab57096c1b6635fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Thu, 23 Apr 2015 09:04:29 +0200 Subject: Add Puppet 4 to travis matrix --- spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml | 12 ++++++++++++ spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml | 12 ++++++++++++ spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml | 12 ++++++++++++ spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml | 2 +- 4 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml create mode 100644 spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml create mode 100644 spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml (limited to 'spec') diff --git a/spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml new file mode 100644 index 0000000..523c7cf --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml @@ -0,0 +1,12 @@ +HOSTS: + ubuntu-1004-x64: + default_apply_opts: + strict_variables: + platform: ubuntu-10.04-amd64 + hypervisor : docker + image: ubuntu:10.04 + # This stops the image from being deleted on completion, speeding up the process. + docker_preserve_image: true +CONFIG: + type: foss + log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml new file mode 100644 index 0000000..890730a --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml @@ -0,0 +1,12 @@ +HOSTS: + ubuntu-1204-x64: + default_apply_opts: + strict_variables: + platform: ubuntu-12.04-amd64 + hypervisor : docker + image: ubuntu:12.04 + # This stops the image from being deleted on completion, speeding up the process. + docker_preserve_image: true +CONFIG: + type: foss + log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml new file mode 100644 index 0000000..744e027 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml @@ -0,0 +1,12 @@ +HOSTS: + ubuntu-1404-x64: + default_apply_opts: + strict_variables: + platform: ubuntu-14.04-amd64 + hypervisor : docker + image: ubuntu:14.04 + # This stops the image from being deleted on completion, speeding up the process. + docker_preserve_image: true +CONFIG: + type: foss + log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml index 073562e..1c163ba 100644 --- a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml @@ -1,5 +1,5 @@ HOSTS: - ubuntu-14.04-x64: + ubuntu-1404-x64: default_apply_opts: strict_variables: platform: ubuntu-14.04-amd64 -- cgit v1.2.3 From 5a9fc7722d7a4110f40ca5974474f00a08d3f9ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Mon, 27 Apr 2015 13:41:48 +0200 Subject: Add nodeset ubuntu-12.04-x86_64-openstack --- spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml (limited to 'spec') diff --git a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml new file mode 100644 index 0000000..07f8330 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml @@ -0,0 +1,13 @@ +HOSTS: + ubuntu-1204-x64: + default_apply_opts: + strict_variables: + platform: ubuntu-12.04-amd64 + hypervisor : openstack + flavor: m1.small + image: ubuntu-1204-latest + user: ubuntu +CONFIG: + type: foss + log_level: debug + openstack_network: default -- cgit v1.2.3 From 7f024bf3d479bef3549c5c0cf876a8440b6a65b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Mon, 25 May 2015 14:38:11 +0200 Subject: Add workaround for unit tests on Puppet 4 [skip ci] --- spec/spec_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec') diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 86cc740..c5b11ae 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -35,7 +35,7 @@ Puppet[:modulepath] = File.join(dir, 'fixtures', 'modules') # ticket https://tickets.puppetlabs.com/browse/MODULES-823 # ver = Gem::Version.new(Puppet.version.split('-').first) -if Gem::Requirement.new("~> 2.7.20") =~ ver || Gem::Requirement.new("~> 3.0.0") =~ ver || Gem::Requirement.new("~> 3.5") =~ ver +if Gem::Requirement.new("~> 2.7.20") =~ ver || Gem::Requirement.new("~> 3.0.0") =~ ver || Gem::Requirement.new("~> 3.5") =~ ver || Gem::Requirement.new("~> 4.0") puts "augeasproviders: setting Puppet[:libdir] to work around broken type autoloading" # libdir is only a single dir, so it can only workaround loading of one external module Puppet[:libdir] = "#{Puppet[:modulepath]}/augeasproviders_core/lib" -- cgit v1.2.3 From ee8aba40af3ebf7d94060823eec58a0e0463f293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20S=C3=A9hier?= Date: Tue, 26 May 2015 12:42:11 +0200 Subject: add utopic & vivid nodesets --- spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml | 12 ++++++++++++ spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml | 13 +++++++++++++ spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml | 12 ++++++++++++ spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml | 13 +++++++++++++ 4 files changed, 50 insertions(+) create mode 100644 spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml create mode 100644 spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml create mode 100644 spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml create mode 100644 spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml (limited to 'spec') diff --git a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml new file mode 100644 index 0000000..f7736b5 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml @@ -0,0 +1,12 @@ +HOSTS: + ubuntu-1410-x64: + default_apply_opts: + strict_variables: + platform: ubuntu-14.10-amd64 + hypervisor : docker + image: ubuntu:14.10 + # This stops the image from being deleted on completion, speeding up the process. + docker_preserve_image: true +CONFIG: + type: foss + log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml new file mode 100644 index 0000000..bbeded1 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml @@ -0,0 +1,13 @@ +HOSTS: + ubuntu-1410-x64: + default_apply_opts: + strict_variables: + platform: ubuntu-14.10-amd64 + hypervisor : openstack + flavor: m1.small + image: ubuntu-1410-latest + user: ubuntu +CONFIG: + type: foss + log_level: debug + openstack_network: default diff --git a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml new file mode 100644 index 0000000..7521738 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml @@ -0,0 +1,12 @@ +HOSTS: + ubuntu-1504-x64: + default_apply_opts: + strict_variables: + platform: ubuntu-15.04-amd64 + hypervisor : docker + image: ubuntu:15.04 + # This stops the image from being deleted on completion, speeding up the process. + docker_preserve_image: true +CONFIG: + type: foss + log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml new file mode 100644 index 0000000..d86c1e9 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml @@ -0,0 +1,13 @@ +HOSTS: + ubuntu-1504-x64: + default_apply_opts: + strict_variables: + platform: ubuntu-15.04-amd64 + hypervisor : openstack + flavor: m1.small + image: ubuntu-1504-latest + user: ubuntu +CONFIG: + type: foss + log_level: debug + openstack_network: default -- cgit v1.2.3 From 46ef1fc76e6609e9c78dfd2552bb3b9ea647ae66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Tue, 26 May 2015 16:27:14 +0200 Subject: Use random application order in nodeset --- spec/acceptance/nodesets/centos-5-x86_64-docker.yml | 1 + spec/acceptance/nodesets/centos-6-x86_64-docker.yml | 1 + spec/acceptance/nodesets/centos-6-x86_64-openstack.yml | 1 + spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml | 1 + spec/acceptance/nodesets/centos-7-x86_64-docker.yml | 1 + spec/acceptance/nodesets/centos-7-x86_64-openstack.yml | 1 + spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml | 1 + spec/acceptance/nodesets/debian-6-x86_64-docker.yml | 1 + spec/acceptance/nodesets/debian-6-x86_64-openstack.yml | 1 + spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml | 1 + spec/acceptance/nodesets/debian-7-x86_64-docker.yml | 1 + spec/acceptance/nodesets/debian-7-x86_64-openstack.yml | 1 + spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml | 1 + spec/acceptance/nodesets/debian-8-x86_64-docker.yml | 1 + spec/acceptance/nodesets/debian-8-x86_64-openstack.yml | 1 + spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml | 1 + spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml | 1 + spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml | 1 + spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml | 1 + spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml | 1 + spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml | 1 + spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml | 1 + spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml | 1 + spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml | 1 + spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml | 1 + spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml | 1 + 26 files changed, 26 insertions(+) (limited to 'spec') diff --git a/spec/acceptance/nodesets/centos-5-x86_64-docker.yml b/spec/acceptance/nodesets/centos-5-x86_64-docker.yml index 174460d..d9a52d8 100644 --- a/spec/acceptance/nodesets/centos-5-x86_64-docker.yml +++ b/spec/acceptance/nodesets/centos-5-x86_64-docker.yml @@ -1,6 +1,7 @@ HOSTS: centos-5-x64: default_apply_opts: + order: random strict_variables: platform: el-5-x86_64 hypervisor : docker diff --git a/spec/acceptance/nodesets/centos-6-x86_64-docker.yml b/spec/acceptance/nodesets/centos-6-x86_64-docker.yml index b88cc95..b7a4396 100644 --- a/spec/acceptance/nodesets/centos-6-x86_64-docker.yml +++ b/spec/acceptance/nodesets/centos-6-x86_64-docker.yml @@ -1,6 +1,7 @@ HOSTS: centos-6-x64: default_apply_opts: + order: random strict_variables: platform: el-6-x86_64 hypervisor : docker diff --git a/spec/acceptance/nodesets/centos-6-x86_64-openstack.yml b/spec/acceptance/nodesets/centos-6-x86_64-openstack.yml index 0291ce5..e325b9e 100644 --- a/spec/acceptance/nodesets/centos-6-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/centos-6-x86_64-openstack.yml @@ -1,6 +1,7 @@ HOSTS: centos-6-x64: default_apply_opts: + order: random strict_variables: platform: el-6-x86_64 hypervisor : openstack diff --git a/spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml b/spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml index 191329c..f06036e 100644 --- a/spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml +++ b/spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml @@ -1,6 +1,7 @@ HOSTS: centos-6-x64: default_apply_opts: + order: random strict_variables: platform: el-6-x86_64 hypervisor : vagrant diff --git a/spec/acceptance/nodesets/centos-7-x86_64-docker.yml b/spec/acceptance/nodesets/centos-7-x86_64-docker.yml index 599a681..d891edf 100644 --- a/spec/acceptance/nodesets/centos-7-x86_64-docker.yml +++ b/spec/acceptance/nodesets/centos-7-x86_64-docker.yml @@ -1,6 +1,7 @@ HOSTS: centos-7-x64: default_apply_opts: + order: random strict_variables: platform: el-7-x86_64 hypervisor : docker diff --git a/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml index b0769b9..9003c86 100644 --- a/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml @@ -1,6 +1,7 @@ HOSTS: centos-7-x64: default_apply_opts: + order: random strict_variables: platform: el-7-x86_64 hypervisor : openstack diff --git a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml index 6f02769..95402e5 100644 --- a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml +++ b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml @@ -1,6 +1,7 @@ HOSTS: centos-7-x64: default_apply_opts: + order: random strict_variables: platform: el-7-x86_64 hypervisor : vagrant diff --git a/spec/acceptance/nodesets/debian-6-x86_64-docker.yml b/spec/acceptance/nodesets/debian-6-x86_64-docker.yml index 0296d12..685e2b7 100644 --- a/spec/acceptance/nodesets/debian-6-x86_64-docker.yml +++ b/spec/acceptance/nodesets/debian-6-x86_64-docker.yml @@ -1,6 +1,7 @@ HOSTS: debian-6-x64: default_apply_opts: + order: random strict_variables: platform: debian-6-amd64 hypervisor : docker diff --git a/spec/acceptance/nodesets/debian-6-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-6-x86_64-openstack.yml index 276356b..c6c192f 100644 --- a/spec/acceptance/nodesets/debian-6-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/debian-6-x86_64-openstack.yml @@ -1,6 +1,7 @@ HOSTS: debian-6-x64: default_apply_opts: + order: random strict_variables: platform: debian-6-amd64 hypervisor : openstack diff --git a/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml index 23dae1b..03db0fa 100644 --- a/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml +++ b/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml @@ -1,6 +1,7 @@ HOSTS: debian-6-x64: default_apply_opts: + order: random strict_variables: platform: debian-6-amd64 hypervisor : vagrant diff --git a/spec/acceptance/nodesets/debian-7-x86_64-docker.yml b/spec/acceptance/nodesets/debian-7-x86_64-docker.yml index ef1c9b2..0be8845 100644 --- a/spec/acceptance/nodesets/debian-7-x86_64-docker.yml +++ b/spec/acceptance/nodesets/debian-7-x86_64-docker.yml @@ -1,6 +1,7 @@ HOSTS: debian-7-x64: default_apply_opts: + order: random strict_variables: platform: debian-7-amd64 hypervisor : docker diff --git a/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml index 8c23792..017b4c7 100644 --- a/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml @@ -1,6 +1,7 @@ HOSTS: debian-7-x64: default_apply_opts: + order: random strict_variables: platform: debian-7-amd64 hypervisor : openstack diff --git a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml index 21aee50..8ed1264 100644 --- a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml +++ b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml @@ -1,6 +1,7 @@ HOSTS: debian-7-x64: default_apply_opts: + order: random strict_variables: platform: debian-7-amd64 hypervisor : vagrant diff --git a/spec/acceptance/nodesets/debian-8-x86_64-docker.yml b/spec/acceptance/nodesets/debian-8-x86_64-docker.yml index 28c3e02..d3b89d9 100644 --- a/spec/acceptance/nodesets/debian-8-x86_64-docker.yml +++ b/spec/acceptance/nodesets/debian-8-x86_64-docker.yml @@ -1,6 +1,7 @@ HOSTS: debian-8-x64: default_apply_opts: + order: random strict_variables: platform: debian-8-amd64 hypervisor : docker diff --git a/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml index 94fe73a..003b6f4 100644 --- a/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml @@ -1,6 +1,7 @@ HOSTS: debian-8-x64: default_apply_opts: + order: random strict_variables: platform: debian-8-amd64 hypervisor : openstack diff --git a/spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml index 38c844b..5cc7f0c 100644 --- a/spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml +++ b/spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml @@ -1,6 +1,7 @@ HOSTS: debian-8-x64: default_apply_opts: + order: random strict_variables: platform: debian-8-amd64 hypervisor : vagrant diff --git a/spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml index 523c7cf..933dee6 100644 --- a/spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml +++ b/spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml @@ -1,6 +1,7 @@ HOSTS: ubuntu-1004-x64: default_apply_opts: + order: random strict_variables: platform: ubuntu-10.04-amd64 hypervisor : docker diff --git a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml index 890730a..92a7901 100644 --- a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml +++ b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml @@ -1,6 +1,7 @@ HOSTS: ubuntu-1204-x64: default_apply_opts: + order: random strict_variables: platform: ubuntu-12.04-amd64 hypervisor : docker diff --git a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml index 07f8330..f81b04b 100644 --- a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml @@ -1,6 +1,7 @@ HOSTS: ubuntu-1204-x64: default_apply_opts: + order: random strict_variables: platform: ubuntu-12.04-amd64 hypervisor : openstack diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml index 744e027..7716f94 100644 --- a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml +++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml @@ -1,6 +1,7 @@ HOSTS: ubuntu-1404-x64: default_apply_opts: + order: random strict_variables: platform: ubuntu-14.04-amd64 hypervisor : docker diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml index 1c163ba..2eeb912 100644 --- a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml @@ -1,6 +1,7 @@ HOSTS: ubuntu-1404-x64: default_apply_opts: + order: random strict_variables: platform: ubuntu-14.04-amd64 hypervisor : openstack diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml index 7188ccb..3b37695 100644 --- a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml +++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml @@ -1,6 +1,7 @@ HOSTS: ubuntu-1404-x64: default_apply_opts: + order: random strict_variables: platform: ubuntu-14.04-amd64 hypervisor : vagrant diff --git a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml index f7736b5..256b004 100644 --- a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml +++ b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml @@ -1,6 +1,7 @@ HOSTS: ubuntu-1410-x64: default_apply_opts: + order: random strict_variables: platform: ubuntu-14.10-amd64 hypervisor : docker diff --git a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml index bbeded1..58a2acd 100644 --- a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml @@ -1,6 +1,7 @@ HOSTS: ubuntu-1410-x64: default_apply_opts: + order: random strict_variables: platform: ubuntu-14.10-amd64 hypervisor : openstack diff --git a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml index 7521738..800da28 100644 --- a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml +++ b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml @@ -1,6 +1,7 @@ HOSTS: ubuntu-1504-x64: default_apply_opts: + order: random strict_variables: platform: ubuntu-15.04-amd64 hypervisor : docker diff --git a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml index d86c1e9..22ef76c 100644 --- a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml @@ -1,6 +1,7 @@ HOSTS: ubuntu-1504-x64: default_apply_opts: + order: random strict_variables: platform: ubuntu-15.04-amd64 hypervisor : openstack -- cgit v1.2.3 From 66fc39e05f085038ac91495f25969ff199ab16f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 26 Jun 2015 11:01:24 +0200 Subject: Fix strict_variables activation with rspec-puppet 2.2 --- spec/spec_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec') diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index c5b11ae..94d30d5 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -11,7 +11,7 @@ RSpec.configure do |c| @old_env = {} ENV.each_key {|k| @old_env[k] = ENV[k]} - Puppet.settings[:strict_variables]=true if Gem::Version.new(Puppet::PUPPETVERSION) >= Gem::Version.new('3.5') + c.strict_variables = Gem::Version.new(Puppet.version) >= Gem::Version.new('3.5') Puppet.features.stubs(:root?).returns(true) end -- cgit v1.2.3 From 723382db55e6e3aebf9abdee83573f92f35071f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 12 Aug 2015 15:03:17 +0200 Subject: Fix unit tests --- spec/classes/augeas_spec.rb | 138 +++++++++++++++++++++------------------ spec/defines/augeas_lens_spec.rb | 23 ++++--- 2 files changed, 84 insertions(+), 77 deletions(-) (limited to 'spec') diff --git a/spec/classes/augeas_spec.rb b/spec/classes/augeas_spec.rb index ab4241f..32a390d 100644 --- a/spec/classes/augeas_spec.rb +++ b/spec/classes/augeas_spec.rb @@ -5,69 +5,76 @@ describe 'augeas' do context 'when on an unsupported Operating System' do let (:facts) do { - :osfamily => 'MS-DOS', + :osfamily => 'MS-DOS', + :puppetversion => Puppet.version, } end it 'should fail' do - expect { is_expected.to contain_package('ruby-augeas') }.to raise_error(Puppet::Error, /Unsupported OS family/) + expect { is_expected.to compile }.to raise_error(/Unsupported OS family/) end end + lens_dir = Puppet.version < '4.0.0' ? '/usr/share/augeas/lenses' : '/opt/puppetlabs/puppet/share/augeas/lenses' + on_supported_os.each do |os, facts| context "on #{os}" do let(:facts) do - facts + facts.merge({ + :puppetversion => Puppet.version, + }) end context 'without params' do - case facts[:osfamily] - when 'Debian' - it { is_expected.to contain_package('libaugeas0').with( - :ensure => 'present' - ) } - it { is_expected.to contain_package('augeas-tools').with( - :ensure => 'present' - ) } - it { is_expected.to contain_package('augeas-lenses').with( - :ensure => 'present' - ) } - case facts[:lsbdistcodename] - when 'squeeze', 'lucid', 'precise' - it { is_expected.to contain_package('ruby-augeas').with( - :ensure => 'present', - :name => 'libaugeas-ruby1.8' + if Puppet.version < '4.0.0' + case facts[:osfamily] + when 'Debian' + it { is_expected.to contain_package('libaugeas0').with( + :ensure => 'present' + ) } + it { is_expected.to contain_package('augeas-tools').with( + :ensure => 'present' + ) } + it { is_expected.to contain_package('augeas-lenses').with( + :ensure => 'present' + ) } + case facts[:lsbdistcodename] + when 'squeeze', 'lucid', 'precise' + it { is_expected.to contain_package('ruby-augeas').with( + :ensure => 'present', + :name => 'libaugeas-ruby1.8' + ) } + else + it { is_expected.to contain_package('ruby-augeas').with( + :ensure => 'present', + :name => 'libaugeas-ruby1.9.1' + ) } + end + when 'RedHat' + it { is_expected.to contain_package('augeas').with( + :ensure => 'present' + ) } + it { is_expected.to contain_package('augeas-libs').with( + :ensure => 'present' ) } - else it { is_expected.to contain_package('ruby-augeas').with( :ensure => 'present', - :name => 'libaugeas-ruby1.9.1' + :name => 'ruby-augeas' ) } end - when 'RedHat' - it { is_expected.to contain_package('augeas').with( - :ensure => 'present' - ) } - it { is_expected.to contain_package('augeas-libs').with( - :ensure => 'present' - ) } - it { is_expected.to contain_package('ruby-augeas').with( - :ensure => 'present', - :name => 'ruby-augeas' - ) } end - it { is_expected.to contain_file('/usr/share/augeas/lenses').with( + it { is_expected.to contain_file(lens_dir).with( :ensure => 'directory', :purge => 'true', :force => 'true', :recurse => 'true', :recurselimit => 1 ) } - it { is_expected.to contain_file('/usr/share/augeas/lenses/dist').with( + it { is_expected.to contain_file("#{lens_dir}/dist").with( :ensure => 'directory', :purge => 'false' ) } - it { is_expected.to contain_file('/usr/share/augeas/lenses/tests').with( + it { is_expected.to contain_file("#{lens_dir}/tests").with( :ensure => 'directory', :purge => 'true', :force => 'true' @@ -82,42 +89,43 @@ describe 'augeas' do } end - case facts[:osfamily] - when 'Debian' - it { is_expected.to contain_package('libaugeas0').with( - :ensure => '1.2.3' - ) } - it { is_expected.to contain_package('augeas-tools').with( - :ensure => '1.2.3' - ) } - it { is_expected.to contain_package('augeas-lenses').with( - :ensure => '1.2.3' - ) } - case facts[:lsbdistcodename] - when 'squeeze', 'lucid', 'precise' - it { is_expected.to contain_package('ruby-augeas').with( - :ensure => '3.2.1', - :name => 'libaugeas-ruby1.8' + if Puppet.version < '4.0.0' + case facts[:osfamily] + when 'Debian' + it { is_expected.to contain_package('libaugeas0').with( + :ensure => '1.2.3' + ) } + it { is_expected.to contain_package('augeas-tools').with( + :ensure => '1.2.3' + ) } + it { is_expected.to contain_package('augeas-lenses').with( + :ensure => '1.2.3' + ) } + case facts[:lsbdistcodename] + when 'squeeze', 'lucid', 'precise' + it { is_expected.to contain_package('ruby-augeas').with( + :ensure => '3.2.1', + :name => 'libaugeas-ruby1.8' + ) } + else + it { is_expected.to contain_package('ruby-augeas').with( + :ensure => '3.2.1', + :name => 'libaugeas-ruby1.9.1' + ) } + end + when 'RedHat' + it { is_expected.to contain_package('augeas').with( + :ensure => '1.2.3' + ) } + it { is_expected.to contain_package('augeas-libs').with( + :ensure => '1.2.3' ) } - else it { is_expected.to contain_package('ruby-augeas').with( :ensure => '3.2.1', - :name => 'libaugeas-ruby1.9.1' + :name => 'ruby-augeas' ) } end - when 'RedHat' - it { is_expected.to contain_package('augeas').with( - :ensure => '1.2.3' - ) } - it { is_expected.to contain_package('augeas-libs').with( - :ensure => '1.2.3' - ) } - it { is_expected.to contain_package('ruby-augeas').with( - :ensure => '3.2.1', - :name => 'ruby-augeas' - ) } end - end context 'with a non standard lens_dir' do diff --git a/spec/defines/augeas_lens_spec.rb b/spec/defines/augeas_lens_spec.rb index 21dfd55..f4e5be7 100644 --- a/spec/defines/augeas_lens_spec.rb +++ b/spec/defines/augeas_lens_spec.rb @@ -11,12 +11,12 @@ describe 'augeas::lens' do end it 'should error' do - expect { - is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') - }.to raise_error(Puppet::Error, /You must declare the augeas class/) + expect { is_expected.to compile }.to raise_error(/You must declare the augeas class/) end end + lens_dir = Puppet.version < '4.0.0' ? '/usr/share/augeas/lenses' : '/opt/puppetlabs/puppet/share/augeas/lenses' + context 'when declaring augeas class first' do on_supported_os.each do |os, facts| @@ -24,6 +24,7 @@ describe 'augeas::lens' do let(:facts) do facts.merge({ :augeasversion => :undef, + :puppetversion => Puppet.version, }) end @@ -35,9 +36,7 @@ describe 'augeas::lens' do context 'when no lens_source is passed' do it 'should error' do - expect { - is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') - }.to raise_error(Puppet::Error, /You must set either \$lens_source or \$lens_content/) + expect { is_expected.to compile }.to raise_error(/You must set either \$lens_source or \$lens_content/) end end @@ -48,9 +47,9 @@ describe 'augeas::lens' do } end - it { is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') } + it { is_expected.to contain_file("#{lens_dir}/foo.aug") } it { is_expected.to contain_exec('Typecheck lens foo') } - it { is_expected.not_to contain_file('/usr/share/augeas/lenses/tests/test_foo.aug') } + it { is_expected.not_to contain_file("#{lens_dir}/tests/test_foo.aug") } it { is_expected.not_to contain_exec('Test lens foo') } end @@ -62,9 +61,9 @@ describe 'augeas::lens' do } end - it { is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') } + it { is_expected.to contain_file("#{lens_dir}/foo.aug") } + it { is_expected.to contain_file("#{lens_dir}/tests/test_foo.aug") } it { is_expected.to contain_exec('Typecheck lens foo') } - it { is_expected.to contain_file('/usr/share/augeas/lenses/tests/test_foo.aug') } it { is_expected.to contain_exec('Test lens foo') } end end @@ -81,7 +80,7 @@ describe 'augeas::lens' do "class { '::augeas': version => '1.0.0' }" end - it { is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') } + it { is_expected.to contain_file("#{lens_dir}/foo.aug") } it { is_expected.to contain_exec('Typecheck lens foo') } end @@ -99,7 +98,7 @@ describe 'augeas::lens' do it do pending "undefined method `negative_failure_message'" - is_expected.not_to contain_file('/usr/share/augeas/lenses/foo.aug') + is_expected.not_to contain_file("#{lens_dir}/foo.aug") end it do pending "undefined method `negative_failure_message'" -- cgit v1.2.3 From 7477ae8985d7615681443b4f3702014657981fab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 21 Aug 2015 07:49:28 +0200 Subject: Use docker for acceptance tests --- spec/acceptance/nodesets/centos-5-x86_64-docker.yml | 4 +++- spec/acceptance/nodesets/centos-6-x86_64-docker.yml | 4 +++- spec/acceptance/nodesets/centos-7-x86_64-docker.yml | 4 +++- spec/acceptance/nodesets/debian-6-x86_64-docker.yml | 4 +++- spec/acceptance/nodesets/debian-7-x86_64-docker.yml | 4 +++- spec/acceptance/nodesets/debian-8-x86_64-docker.yml | 4 +++- spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml | 4 +++- spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml | 4 +++- spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml | 4 +++- spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml | 4 +++- 10 files changed, 30 insertions(+), 10 deletions(-) (limited to 'spec') diff --git a/spec/acceptance/nodesets/centos-5-x86_64-docker.yml b/spec/acceptance/nodesets/centos-5-x86_64-docker.yml index d9a52d8..679afb0 100644 --- a/spec/acceptance/nodesets/centos-5-x86_64-docker.yml +++ b/spec/acceptance/nodesets/centos-5-x86_64-docker.yml @@ -6,8 +6,10 @@ HOSTS: platform: el-5-x86_64 hypervisor : docker image: centos:5 - # This stops the image from being deleted on completion, speeding up the process. docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'yum install -y crontabs tar wget' CONFIG: type: foss log_level: debug diff --git a/spec/acceptance/nodesets/centos-6-x86_64-docker.yml b/spec/acceptance/nodesets/centos-6-x86_64-docker.yml index b7a4396..9cab03d 100644 --- a/spec/acceptance/nodesets/centos-6-x86_64-docker.yml +++ b/spec/acceptance/nodesets/centos-6-x86_64-docker.yml @@ -6,8 +6,10 @@ HOSTS: platform: el-6-x86_64 hypervisor : docker image: centos:6 - # This stops the image from being deleted on completion, speeding up the process. docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'yum install -y crontabs tar wget' CONFIG: type: foss log_level: debug diff --git a/spec/acceptance/nodesets/centos-7-x86_64-docker.yml b/spec/acceptance/nodesets/centos-7-x86_64-docker.yml index d891edf..0bc9727 100644 --- a/spec/acceptance/nodesets/centos-7-x86_64-docker.yml +++ b/spec/acceptance/nodesets/centos-7-x86_64-docker.yml @@ -6,8 +6,10 @@ HOSTS: platform: el-7-x86_64 hypervisor : docker image: centos:7 - # This stops the image from being deleted on completion, speeding up the process. docker_preserve_image: true + docker_cmd: '["/usr/sbin/init"]' + docker_image_commands: + - 'yum install -y crontabs tar wget' CONFIG: type: foss log_level: debug diff --git a/spec/acceptance/nodesets/debian-6-x86_64-docker.yml b/spec/acceptance/nodesets/debian-6-x86_64-docker.yml index 685e2b7..359dae7 100644 --- a/spec/acceptance/nodesets/debian-6-x86_64-docker.yml +++ b/spec/acceptance/nodesets/debian-6-x86_64-docker.yml @@ -6,8 +6,10 @@ HOSTS: platform: debian-6-amd64 hypervisor : docker image: debian:6 - # This stops the image from being deleted on completion, speeding up the process. docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get install -y wget' CONFIG: type: foss log_level: debug diff --git a/spec/acceptance/nodesets/debian-7-x86_64-docker.yml b/spec/acceptance/nodesets/debian-7-x86_64-docker.yml index 0be8845..fc11f57 100644 --- a/spec/acceptance/nodesets/debian-7-x86_64-docker.yml +++ b/spec/acceptance/nodesets/debian-7-x86_64-docker.yml @@ -6,8 +6,10 @@ HOSTS: platform: debian-7-amd64 hypervisor : docker image: debian:7 - # This stops the image from being deleted on completion, speeding up the process. docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get install -y cron wget' CONFIG: type: foss log_level: debug diff --git a/spec/acceptance/nodesets/debian-8-x86_64-docker.yml b/spec/acceptance/nodesets/debian-8-x86_64-docker.yml index d3b89d9..86a55e1 100644 --- a/spec/acceptance/nodesets/debian-8-x86_64-docker.yml +++ b/spec/acceptance/nodesets/debian-8-x86_64-docker.yml @@ -6,8 +6,10 @@ HOSTS: platform: debian-8-amd64 hypervisor : docker image: debian:8 - # This stops the image from being deleted on completion, speeding up the process. docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get install -y cron wget' CONFIG: type: foss log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml index 92a7901..f0ec72b 100644 --- a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml +++ b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml @@ -6,8 +6,10 @@ HOSTS: platform: ubuntu-12.04-amd64 hypervisor : docker image: ubuntu:12.04 - # This stops the image from being deleted on completion, speeding up the process. docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get install -y wget' CONFIG: type: foss log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml index 7716f94..6fb9281 100644 --- a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml +++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml @@ -6,8 +6,10 @@ HOSTS: platform: ubuntu-14.04-amd64 hypervisor : docker image: ubuntu:14.04 - # This stops the image from being deleted on completion, speeding up the process. docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get install -y wget' CONFIG: type: foss log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml index 256b004..2be425c 100644 --- a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml +++ b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml @@ -6,8 +6,10 @@ HOSTS: platform: ubuntu-14.10-amd64 hypervisor : docker image: ubuntu:14.10 - # This stops the image from being deleted on completion, speeding up the process. docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get install -y wget' CONFIG: type: foss log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml index 800da28..caed722 100644 --- a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml +++ b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml @@ -6,8 +6,10 @@ HOSTS: platform: ubuntu-15.04-amd64 hypervisor : docker image: ubuntu:15.04 - # This stops the image from being deleted on completion, speeding up the process. docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get install -y wget' CONFIG: type: foss log_level: debug -- cgit v1.2.3 From 597a2fce2f85d4ea509cddf7d59858b13446e233 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Thu, 9 Jul 2015 16:27:05 -0500 Subject: Update lens location for Puppet Enterprise The lens location for Puppet Enterprise differs from the standard location for the opensource version. We can detect if we are running the enterprise version. This commit should resolve #52. --- spec/classes/augeas_spec.rb | 35 +++++++++++++++++++++++++++++++++++ spec/defines/augeas_lens_spec.rb | 1 + 2 files changed, 36 insertions(+) (limited to 'spec') diff --git a/spec/classes/augeas_spec.rb b/spec/classes/augeas_spec.rb index 32a390d..b7c8273 100644 --- a/spec/classes/augeas_spec.rb +++ b/spec/classes/augeas_spec.rb @@ -7,6 +7,7 @@ describe 'augeas' do { :osfamily => 'MS-DOS', :puppetversion => Puppet.version, + :is_pe => false, } end @@ -22,6 +23,7 @@ describe 'augeas' do let(:facts) do facts.merge({ :puppetversion => Puppet.version, + :is_pe => false, }) end @@ -152,6 +154,39 @@ describe 'augeas' do :force => 'true' ).without(:recurse) } end + + context 'with Puppet Enterprise' do + let (:facts) do + facts.merge({ + :puppetversion => Puppet.version, + :is_pe => true, + }) + end + + if Puppet::Util::Package.versioncmp(Puppet.version, '4.0.0') >= 0 + # the enterprise lens dir is the same in 4 + pe_lens_dir = lens_dir + else + pe_lens_dir = '/opt/puppet/share/augeas/lenses' + end + + it { is_expected.to contain_file(pe_lens_dir).with( + :ensure => 'directory', + :force => 'true', + :recurse => 'true', + :recurselimit => 1 + ) } + it { is_expected.to contain_file("#{pe_lens_dir}/dist").with( + :ensure => 'directory', + :purge => 'false' + ) } + it { is_expected.to contain_file("#{pe_lens_dir}/tests").with( + :ensure => 'directory', + :force => 'true', + :purge => 'true' + ).without(:recurse) } + end + end end end diff --git a/spec/defines/augeas_lens_spec.rb b/spec/defines/augeas_lens_spec.rb index f4e5be7..57747ca 100644 --- a/spec/defines/augeas_lens_spec.rb +++ b/spec/defines/augeas_lens_spec.rb @@ -25,6 +25,7 @@ describe 'augeas::lens' do facts.merge({ :augeasversion => :undef, :puppetversion => Puppet.version, + :is_pe => false, }) end -- cgit v1.2.3 From d918035d3abb026c334e090fb8ac29974e0f12d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 31 Aug 2015 16:19:02 +0200 Subject: is_pe is not defined in Puppet open-source --- spec/classes/augeas_spec.rb | 2 -- spec/defines/augeas_lens_spec.rb | 1 - 2 files changed, 3 deletions(-) (limited to 'spec') diff --git a/spec/classes/augeas_spec.rb b/spec/classes/augeas_spec.rb index b7c8273..56870e0 100644 --- a/spec/classes/augeas_spec.rb +++ b/spec/classes/augeas_spec.rb @@ -7,7 +7,6 @@ describe 'augeas' do { :osfamily => 'MS-DOS', :puppetversion => Puppet.version, - :is_pe => false, } end @@ -23,7 +22,6 @@ describe 'augeas' do let(:facts) do facts.merge({ :puppetversion => Puppet.version, - :is_pe => false, }) end diff --git a/spec/defines/augeas_lens_spec.rb b/spec/defines/augeas_lens_spec.rb index 57747ca..f4e5be7 100644 --- a/spec/defines/augeas_lens_spec.rb +++ b/spec/defines/augeas_lens_spec.rb @@ -25,7 +25,6 @@ describe 'augeas::lens' do facts.merge({ :augeasversion => :undef, :puppetversion => Puppet.version, - :is_pe => false, }) end -- cgit v1.2.3 From 787d6af6b9de026ca487c352faf1187a74c3da5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 9 Sep 2015 16:54:26 +0200 Subject: Fix unit tests when using rspec-puppet-facts > 1.1.0 --- spec/classes/augeas_spec.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'spec') diff --git a/spec/classes/augeas_spec.rb b/spec/classes/augeas_spec.rb index 56870e0..5194bf2 100644 --- a/spec/classes/augeas_spec.rb +++ b/spec/classes/augeas_spec.rb @@ -40,6 +40,11 @@ describe 'augeas' do ) } case facts[:lsbdistcodename] when 'squeeze', 'lucid', 'precise' + let(:facts) do + super().merge({ + :rubyversion => '1.8.7', + }) + end it { is_expected.to contain_package('ruby-augeas').with( :ensure => 'present', :name => 'libaugeas-ruby1.8' @@ -103,6 +108,11 @@ describe 'augeas' do ) } case facts[:lsbdistcodename] when 'squeeze', 'lucid', 'precise' + let(:facts) do + super().merge({ + :rubyversion => '1.8.7', + }) + end it { is_expected.to contain_package('ruby-augeas').with( :ensure => '3.2.1', :name => 'libaugeas-ruby1.8' -- cgit v1.2.3 From b7e05f3dee61d754ace620bb8a2fea508215a306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 9 Sep 2015 16:58:26 +0200 Subject: Fix unit tests when using rspec-puppet-facts > 1.1.0 --- spec/classes/augeas_spec.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'spec') diff --git a/spec/classes/augeas_spec.rb b/spec/classes/augeas_spec.rb index 5194bf2..e9fa5fc 100644 --- a/spec/classes/augeas_spec.rb +++ b/spec/classes/augeas_spec.rb @@ -50,6 +50,11 @@ describe 'augeas' do :name => 'libaugeas-ruby1.8' ) } else + let(:facts) do + super().merge({ + :rubyversion => '1.9.3', + }) + end it { is_expected.to contain_package('ruby-augeas').with( :ensure => 'present', :name => 'libaugeas-ruby1.9.1' @@ -118,6 +123,11 @@ describe 'augeas' do :name => 'libaugeas-ruby1.8' ) } else + let(:facts) do + super().merge({ + :rubyversion => '1.9.3', + }) + end it { is_expected.to contain_package('ruby-augeas').with( :ensure => '3.2.1', :name => 'libaugeas-ruby1.9.1' -- cgit v1.2.3 From f5048ab20c2679f379a0e6f356e304fd293efbed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 4 May 2016 09:46:25 +0200 Subject: Update with modulesync --- spec/acceptance/nodesets/centos-5.yml | 15 +++++++++++++++ spec/acceptance/nodesets/centos-6.yml | 16 ++++++++++++++++ spec/acceptance/nodesets/centos-7.yml | 15 +++++++++++++++ spec/acceptance/nodesets/debian-6.yml | 15 +++++++++++++++ spec/acceptance/nodesets/debian-7.yml | 15 +++++++++++++++ spec/acceptance/nodesets/debian-8.yml | 16 ++++++++++++++++ spec/acceptance/nodesets/ubuntu-12.04.yml | 16 ++++++++++++++++ spec/acceptance/nodesets/ubuntu-14.04.yml | 18 ++++++++++++++++++ spec/acceptance/nodesets/ubuntu-14.10.yml | 18 ++++++++++++++++++ spec/acceptance/nodesets/ubuntu-15.04.yml | 16 ++++++++++++++++ spec/acceptance/nodesets/ubuntu-15.10.yml | 16 ++++++++++++++++ spec/acceptance/nodesets/ubuntu-16.04.yml | 16 ++++++++++++++++ 12 files changed, 192 insertions(+) create mode 100644 spec/acceptance/nodesets/centos-5.yml create mode 100644 spec/acceptance/nodesets/centos-6.yml create mode 100644 spec/acceptance/nodesets/centos-7.yml create mode 100644 spec/acceptance/nodesets/debian-6.yml create mode 100644 spec/acceptance/nodesets/debian-7.yml create mode 100644 spec/acceptance/nodesets/debian-8.yml create mode 100644 spec/acceptance/nodesets/ubuntu-12.04.yml create mode 100644 spec/acceptance/nodesets/ubuntu-14.04.yml create mode 100644 spec/acceptance/nodesets/ubuntu-14.10.yml create mode 100644 spec/acceptance/nodesets/ubuntu-15.04.yml create mode 100644 spec/acceptance/nodesets/ubuntu-15.10.yml create mode 100644 spec/acceptance/nodesets/ubuntu-16.04.yml (limited to 'spec') diff --git a/spec/acceptance/nodesets/centos-5.yml b/spec/acceptance/nodesets/centos-5.yml new file mode 100644 index 0000000..b7ed0e5 --- /dev/null +++ b/spec/acceptance/nodesets/centos-5.yml @@ -0,0 +1,15 @@ +HOSTS: + centos-5-x64: + default_apply_opts: + order: random + strict_variables: + platform: el-5-x86_64 + hypervisor : docker + image: tianon/centos:5.10 + docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'yum install -y crontabs tar wget which' +CONFIG: + type: aio + log_level: debug diff --git a/spec/acceptance/nodesets/centos-6.yml b/spec/acceptance/nodesets/centos-6.yml new file mode 100644 index 0000000..c82c10d --- /dev/null +++ b/spec/acceptance/nodesets/centos-6.yml @@ -0,0 +1,16 @@ +HOSTS: + centos-6-x64: + default_apply_opts: + order: random + strict_variables: + platform: el-6-x86_64 + hypervisor : docker + image: centos:6 + docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'rm -rf /var/run/network/*' + - 'yum install -y crontabs tar wget' +CONFIG: + type: aio + log_level: debug diff --git a/spec/acceptance/nodesets/centos-7.yml b/spec/acceptance/nodesets/centos-7.yml new file mode 100644 index 0000000..bc57539 --- /dev/null +++ b/spec/acceptance/nodesets/centos-7.yml @@ -0,0 +1,15 @@ +HOSTS: + centos-7-x64: + default_apply_opts: + order: random + strict_variables: + platform: el-7-x86_64 + hypervisor : docker + image: centos:7 + docker_preserve_image: true + docker_cmd: '["/usr/sbin/init"]' + docker_image_commands: + - 'yum install -y crontabs tar wget' +CONFIG: + type: aio + log_level: debug diff --git a/spec/acceptance/nodesets/debian-6.yml b/spec/acceptance/nodesets/debian-6.yml new file mode 100644 index 0000000..d7b0275 --- /dev/null +++ b/spec/acceptance/nodesets/debian-6.yml @@ -0,0 +1,15 @@ +HOSTS: + debian-6-x64: + default_apply_opts: + order: random + strict_variables: + platform: debian-6-amd64 + hypervisor : docker + image: debian/eol:squeeze + docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get install -y cron locales-all net-tools wget' +CONFIG: + type: aio + log_level: debug diff --git a/spec/acceptance/nodesets/debian-7.yml b/spec/acceptance/nodesets/debian-7.yml new file mode 100644 index 0000000..9591ea7 --- /dev/null +++ b/spec/acceptance/nodesets/debian-7.yml @@ -0,0 +1,15 @@ +HOSTS: + debian-7-x64: + default_apply_opts: + order: random + strict_variables: + platform: debian-7-amd64 + hypervisor : docker + image: debian:7 + docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get install -y cron locales-all net-tools wget' +CONFIG: + type: aio + log_level: debug diff --git a/spec/acceptance/nodesets/debian-8.yml b/spec/acceptance/nodesets/debian-8.yml new file mode 100644 index 0000000..5fb24c6 --- /dev/null +++ b/spec/acceptance/nodesets/debian-8.yml @@ -0,0 +1,16 @@ +HOSTS: + debian-8-x64: + default_apply_opts: + order: random + strict_variables: + platform: debian-8-amd64 + hypervisor : docker + image: debian:8 + docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get install -y cron locales-all net-tools wget' + - 'rm -f /usr/sbin/policy-rc.d' +CONFIG: + type: aio + log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-12.04.yml b/spec/acceptance/nodesets/ubuntu-12.04.yml new file mode 100644 index 0000000..594e177 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-12.04.yml @@ -0,0 +1,16 @@ +HOSTS: + ubuntu-1204-x64: + default_apply_opts: + order: random + strict_variables: + platform: ubuntu-12.04-amd64 + hypervisor : docker + image: ubuntu:12.04 + docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get install -y net-tools wget' + - 'locale-gen en_US.UTF-8' +CONFIG: + type: aio + log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-14.04.yml b/spec/acceptance/nodesets/ubuntu-14.04.yml new file mode 100644 index 0000000..2b293c9 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-14.04.yml @@ -0,0 +1,18 @@ +HOSTS: + ubuntu-1404-x64: + default_apply_opts: + order: random + strict_variables: + platform: ubuntu-14.04-amd64 + hypervisor : docker + image: ubuntu:14.04 + docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'rm /usr/sbin/policy-rc.d' + - 'rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl' + - 'apt-get install -y net-tools wget' + - 'locale-gen en_US.UTF-8' +CONFIG: + type: aio + log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-14.10.yml b/spec/acceptance/nodesets/ubuntu-14.10.yml new file mode 100644 index 0000000..7ce09b2 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-14.10.yml @@ -0,0 +1,18 @@ +HOSTS: + ubuntu-1410-x64: + default_apply_opts: + order: random + strict_variables: + platform: ubuntu-14.10-amd64 + hypervisor : docker + image: ubuntu:14.10 + docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'rm /usr/sbin/policy-rc.d' + - 'rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl' + - 'apt-get install -y net-tools wget' + - 'locale-gen en_US.UTF-8' +CONFIG: + type: aio + log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-15.04.yml b/spec/acceptance/nodesets/ubuntu-15.04.yml new file mode 100644 index 0000000..329f331 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-15.04.yml @@ -0,0 +1,16 @@ +HOSTS: + ubuntu-1504-x64: + default_apply_opts: + order: random + strict_variables: + platform: ubuntu-15.04-amd64 + hypervisor : docker + image: ubuntu:15.04 + docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get install -y net-tools wget' + - 'locale-gen en_US.UTF-8' +CONFIG: + type: aio + log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-15.10.yml b/spec/acceptance/nodesets/ubuntu-15.10.yml new file mode 100644 index 0000000..487795a --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-15.10.yml @@ -0,0 +1,16 @@ +HOSTS: + ubuntu-1510-x64: + default_apply_opts: + order: random + strict_variables: + platform: ubuntu-15.10-amd64 + hypervisor : docker + image: ubuntu:15.10 + docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get install -y net-tools wget' + - 'locale-gen en_US.UTF-8' +CONFIG: + type: aio + log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-16.04.yml b/spec/acceptance/nodesets/ubuntu-16.04.yml new file mode 100644 index 0000000..6c32b96 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-16.04.yml @@ -0,0 +1,16 @@ +HOSTS: + ubuntu-1604-x64: + default_apply_opts: + order: random + strict_variables: + platform: ubuntu-16.04-amd64 + hypervisor : docker + image: ubuntu:16.04 + docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get install -y net-tools wget' + - 'locale-gen en_US.UTF-8' +CONFIG: + type: aio + log_level: debug -- cgit v1.2.3 From 01f344c621d682168b7d19096cf6d4217af50d8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 25 May 2016 09:00:52 +0200 Subject: Speed up acceptance tests on centos-5 --- spec/acceptance/nodesets/centos-5.yml | 1 + spec/acceptance/nodesets/centos-6.yml | 1 + 2 files changed, 2 insertions(+) (limited to 'spec') diff --git a/spec/acceptance/nodesets/centos-5.yml b/spec/acceptance/nodesets/centos-5.yml index b7ed0e5..a26f27f 100644 --- a/spec/acceptance/nodesets/centos-5.yml +++ b/spec/acceptance/nodesets/centos-5.yml @@ -10,6 +10,7 @@ HOSTS: docker_cmd: '["/sbin/init"]' docker_image_commands: - 'yum install -y crontabs tar wget which' + - 'sed -i -e "/mingetty/d" /etc/inittab' CONFIG: type: aio log_level: debug diff --git a/spec/acceptance/nodesets/centos-6.yml b/spec/acceptance/nodesets/centos-6.yml index c82c10d..71e23cd 100644 --- a/spec/acceptance/nodesets/centos-6.yml +++ b/spec/acceptance/nodesets/centos-6.yml @@ -11,6 +11,7 @@ HOSTS: docker_image_commands: - 'rm -rf /var/run/network/*' - 'yum install -y crontabs tar wget' + - 'rm /etc/init/tty.conf' CONFIG: type: aio log_level: debug -- cgit v1.2.3 From 06fe4f611a18886edea685c2ec1debc823966432 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 27 May 2016 09:05:55 +0200 Subject: r-p-f now sets puppetversion --- spec/classes/augeas_spec.rb | 10 +++------- spec/defines/augeas_lens_spec.rb | 1 - 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'spec') diff --git a/spec/classes/augeas_spec.rb b/spec/classes/augeas_spec.rb index e9fa5fc..16f76f4 100644 --- a/spec/classes/augeas_spec.rb +++ b/spec/classes/augeas_spec.rb @@ -5,8 +5,7 @@ describe 'augeas' do context 'when on an unsupported Operating System' do let (:facts) do { - :osfamily => 'MS-DOS', - :puppetversion => Puppet.version, + :osfamily => 'MS-DOS', } end @@ -20,9 +19,7 @@ describe 'augeas' do on_supported_os.each do |os, facts| context "on #{os}" do let(:facts) do - facts.merge({ - :puppetversion => Puppet.version, - }) + facts end context 'without params' do @@ -176,8 +173,7 @@ describe 'augeas' do context 'with Puppet Enterprise' do let (:facts) do facts.merge({ - :puppetversion => Puppet.version, - :is_pe => true, + :is_pe => true, }) end diff --git a/spec/defines/augeas_lens_spec.rb b/spec/defines/augeas_lens_spec.rb index f4e5be7..2132749 100644 --- a/spec/defines/augeas_lens_spec.rb +++ b/spec/defines/augeas_lens_spec.rb @@ -24,7 +24,6 @@ describe 'augeas::lens' do let(:facts) do facts.merge({ :augeasversion => :undef, - :puppetversion => Puppet.version, }) end -- cgit v1.2.3 From 9a88fbdf3e437bf5671bbc54ebf5031af24421c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 27 May 2016 09:06:22 +0200 Subject: r-p-f now sets rubyversion --- spec/classes/augeas_spec.rb | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'spec') diff --git a/spec/classes/augeas_spec.rb b/spec/classes/augeas_spec.rb index 16f76f4..5ee8df4 100644 --- a/spec/classes/augeas_spec.rb +++ b/spec/classes/augeas_spec.rb @@ -37,21 +37,11 @@ describe 'augeas' do ) } case facts[:lsbdistcodename] when 'squeeze', 'lucid', 'precise' - let(:facts) do - super().merge({ - :rubyversion => '1.8.7', - }) - end it { is_expected.to contain_package('ruby-augeas').with( :ensure => 'present', :name => 'libaugeas-ruby1.8' ) } else - let(:facts) do - super().merge({ - :rubyversion => '1.9.3', - }) - end it { is_expected.to contain_package('ruby-augeas').with( :ensure => 'present', :name => 'libaugeas-ruby1.9.1' @@ -110,21 +100,11 @@ describe 'augeas' do ) } case facts[:lsbdistcodename] when 'squeeze', 'lucid', 'precise' - let(:facts) do - super().merge({ - :rubyversion => '1.8.7', - }) - end it { is_expected.to contain_package('ruby-augeas').with( :ensure => '3.2.1', :name => 'libaugeas-ruby1.8' ) } else - let(:facts) do - super().merge({ - :rubyversion => '1.9.3', - }) - end it { is_expected.to contain_package('ruby-augeas').with( :ensure => '3.2.1', :name => 'libaugeas-ruby1.9.1' -- cgit v1.2.3 From 3d5498d0bd4f7d6c8f8df0bafb9b98cf3da07a68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 27 May 2016 09:07:17 +0200 Subject: Override augeasversion fact instead of passing version to init --- spec/defines/augeas_lens_spec.rb | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'spec') diff --git a/spec/defines/augeas_lens_spec.rb b/spec/defines/augeas_lens_spec.rb index 2132749..b74164b 100644 --- a/spec/defines/augeas_lens_spec.rb +++ b/spec/defines/augeas_lens_spec.rb @@ -19,20 +19,18 @@ describe 'augeas::lens' do context 'when declaring augeas class first' do + let(:pre_condition) do + "class { '::augeas': }" + end + on_supported_os.each do |os, facts| context "on #{os}" do let(:facts) do - facts.merge({ - :augeasversion => :undef, - }) + facts end context 'With standard augeas version' do - let(:pre_condition) do - "class { '::augeas': }" - end - context 'when no lens_source is passed' do it 'should error' do expect { is_expected.to compile }.to raise_error(/You must set either \$lens_source or \$lens_content/) @@ -75,8 +73,10 @@ describe 'augeas::lens' do } end - let(:pre_condition) do - "class { '::augeas': version => '1.0.0' }" + let(:facts) do + super().merge({ + :augeasversion => '1.0.0', + }) end it { is_expected.to contain_file("#{lens_dir}/foo.aug") } @@ -91,16 +91,16 @@ describe 'augeas::lens' do } end - let(:pre_condition) do - "class { '::augeas': version => '1.3.0' }" + let(:facts) do + super().merge({ + :augeasversion => '1.3.0', + }) end it do - pending "undefined method `negative_failure_message'" is_expected.not_to contain_file("#{lens_dir}/foo.aug") end it do - pending "undefined method `negative_failure_message'" is_expected.not_to contain_exec('Typecheck lens foo') end end -- cgit v1.2.3 From 205ada2c7379efd1bdfc4bd3a4d0b7bee11bcad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 27 May 2016 09:09:21 +0200 Subject: Revert "r-p-f now sets rubyversion" This reverts commit 9a88fbdf3e437bf5671bbc54ebf5031af24421c0. --- spec/classes/augeas_spec.rb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'spec') diff --git a/spec/classes/augeas_spec.rb b/spec/classes/augeas_spec.rb index 5ee8df4..16f76f4 100644 --- a/spec/classes/augeas_spec.rb +++ b/spec/classes/augeas_spec.rb @@ -37,11 +37,21 @@ describe 'augeas' do ) } case facts[:lsbdistcodename] when 'squeeze', 'lucid', 'precise' + let(:facts) do + super().merge({ + :rubyversion => '1.8.7', + }) + end it { is_expected.to contain_package('ruby-augeas').with( :ensure => 'present', :name => 'libaugeas-ruby1.8' ) } else + let(:facts) do + super().merge({ + :rubyversion => '1.9.3', + }) + end it { is_expected.to contain_package('ruby-augeas').with( :ensure => 'present', :name => 'libaugeas-ruby1.9.1' @@ -100,11 +110,21 @@ describe 'augeas' do ) } case facts[:lsbdistcodename] when 'squeeze', 'lucid', 'precise' + let(:facts) do + super().merge({ + :rubyversion => '1.8.7', + }) + end it { is_expected.to contain_package('ruby-augeas').with( :ensure => '3.2.1', :name => 'libaugeas-ruby1.8' ) } else + let(:facts) do + super().merge({ + :rubyversion => '1.9.3', + }) + end it { is_expected.to contain_package('ruby-augeas').with( :ensure => '3.2.1', :name => 'libaugeas-ruby1.9.1' -- cgit v1.2.3 From 108205b8915af54bcac8d6805c3d910759b2c063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 11 Jul 2016 15:01:53 +0200 Subject: Fix unit tests when augeas class is not included --- spec/defines/augeas_lens_spec.rb | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'spec') diff --git a/spec/defines/augeas_lens_spec.rb b/spec/defines/augeas_lens_spec.rb index b74164b..0fa1358 100644 --- a/spec/defines/augeas_lens_spec.rb +++ b/spec/defines/augeas_lens_spec.rb @@ -3,26 +3,9 @@ require 'spec_helper' describe 'augeas::lens' do let (:title) { 'foo' } - context 'when not declaring augeas class first' do - let (:params) do - { - :lens_source => '/tmp/foo.aug', - } - end - - it 'should error' do - expect { is_expected.to compile }.to raise_error(/You must declare the augeas class/) - end - end - lens_dir = Puppet.version < '4.0.0' ? '/usr/share/augeas/lenses' : '/opt/puppetlabs/puppet/share/augeas/lenses' context 'when declaring augeas class first' do - - let(:pre_condition) do - "class { '::augeas': }" - end - on_supported_os.each do |os, facts| context "on #{os}" do let(:facts) do -- cgit v1.2.3 From 66d4612f0cb0e861fe2064510cc8f73d7bcc2574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Thu, 5 Jan 2017 11:02:54 +0100 Subject: Modulesync: remove Puppet 3 tests --- spec/acceptance/nodesets/centos-7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec') diff --git a/spec/acceptance/nodesets/centos-7.yml b/spec/acceptance/nodesets/centos-7.yml index bc57539..a8fa468 100644 --- a/spec/acceptance/nodesets/centos-7.yml +++ b/spec/acceptance/nodesets/centos-7.yml @@ -9,7 +9,7 @@ HOSTS: docker_preserve_image: true docker_cmd: '["/usr/sbin/init"]' docker_image_commands: - - 'yum install -y crontabs tar wget' + - 'yum install -y crontabs tar wget iproute' CONFIG: type: aio log_level: debug -- cgit v1.2.3