From e3607ebf2b5c8c03775924b8bc8c7565ffc7d54b Mon Sep 17 00:00:00 2001 From: Alex Ruiz Estradera Date: Mon, 14 Nov 2016 17:28:29 +0100 Subject: [PATCH] Fix Tests Change-Id: I94dc389a2880e3d7b87c78929d76234cddbbe0ef --- Gemfile | 4 ++++ spec/classes/midonet_agent_install_spec.rb | 1 + spec/classes/midonet_agent_run_spec.rb | 2 ++ spec/classes/midonet_agent_spec.rb | 1 + spec/classes/midonet_cli_spec.rb | 7 +++++-- spec/classes/midonet_cluster_install_spec.rb | 1 + spec/classes/midonet_cluster_run_spec.rb | 1 + spec/classes/midonet_gateway_static_spec.rb | 1 + spec/classes/midonet_mem_manager_spec.rb | 3 ++- spec/classes/midonet_repository_centos_spec.rb | 6 ++++-- spec/classes/midonet_repository_spec.rb | 6 +++++- spec/classes/midonet_repository_ubuntu_spec.rb | 3 +++ 12 files changed, 30 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index e9332a9..c132a7e 100644 --- a/Gemfile +++ b/Gemfile @@ -18,6 +18,10 @@ group :development, :unit_tests do gem 'puppet-lint', '>= 0.3.2', :require => false gem 'metadata-json-lint', :require => false gem 'faraday', :require => false + # addressable 2.5.0 pulls in public_suffix >= 2.0 requires ruby >= 2.0 + gem 'addressable', ['< 2.5.0'] + # json_pure 2.0.2 requires ruby >= 2.0 and we don't have it on Ubuntu Trusty + gem 'json_pure', ['2.0.1'] end group :system_tests do diff --git a/spec/classes/midonet_agent_install_spec.rb b/spec/classes/midonet_agent_install_spec.rb index 8b336b4..612b8c4 100644 --- a/spec/classes/midonet_agent_install_spec.rb +++ b/spec/classes/midonet_agent_install_spec.rb @@ -7,6 +7,7 @@ describe 'midonet::agent::install' do :osfamily => 'Debian', :lsbdistid => 'Ubuntu', :lsbdistrelease => '16.04', + :puppetversion => Puppet.version } end it { is_expected.to contain_package('midolman').with( diff --git a/spec/classes/midonet_agent_run_spec.rb b/spec/classes/midonet_agent_run_spec.rb index 8b16070..c7ef111 100644 --- a/spec/classes/midonet_agent_run_spec.rb +++ b/spec/classes/midonet_agent_run_spec.rb @@ -7,6 +7,8 @@ describe 'midonet::agent::run' do :osfamily => 'Debian', :lsbdistid => 'Ubuntu', :lsbdistrelease => '16.04', + :puppetversion => Puppet.version + } end let :params do diff --git a/spec/classes/midonet_agent_spec.rb b/spec/classes/midonet_agent_spec.rb index c82f285..c6a5bdf 100644 --- a/spec/classes/midonet_agent_spec.rb +++ b/spec/classes/midonet_agent_spec.rb @@ -7,6 +7,7 @@ describe 'midonet::agent' do :osfamily => 'Debian', :lsbdistid => 'Ubuntu', :lsbdistrelease => '16.04', + :puppetversion => Puppet.version } end let :params do diff --git a/spec/classes/midonet_cli_spec.rb b/spec/classes/midonet_cli_spec.rb index b569fcf..7d5d121 100644 --- a/spec/classes/midonet_cli_spec.rb +++ b/spec/classes/midonet_cli_spec.rb @@ -54,7 +54,8 @@ describe 'midonet::cli' do :operatingsystemmajrelease => '14', :puppetversion => '3.8.7', :lsbdistid => 'Ubuntu', - :lsbdistcodename => 'Trusty' + :lsbdistcodename => 'Trusty', + :puppetversion => Puppet.version }) end @@ -82,7 +83,8 @@ describe 'midonet::cli' do :operatingsystemmajrelease => '16', :puppetversion => '3.8.7', :lsbdistid => 'Ubuntu', - :lsbdistcodename => 'Xenial' + :lsbdistcodename => 'Xenial', + :puppetversion => Puppet.version }) end @@ -108,6 +110,7 @@ describe 'midonet::cli' do :ipaddress_eth0 => '172.17.0.3', :operatingsystemmajrelease => '7', :puppetversion => '3.8.7', + :puppetversion => Puppet.version }) end diff --git a/spec/classes/midonet_cluster_install_spec.rb b/spec/classes/midonet_cluster_install_spec.rb index 113ed1e..f09b78c 100644 --- a/spec/classes/midonet_cluster_install_spec.rb +++ b/spec/classes/midonet_cluster_install_spec.rb @@ -7,6 +7,7 @@ describe 'midonet::cluster::install' do :osfamily => 'Debian', :lsbdistid => 'Ubuntu', :lsbdistrelease => '16.04', + :puppetversion => Puppet.version } end it { is_expected.to contain_package('midonet-cluster').with( diff --git a/spec/classes/midonet_cluster_run_spec.rb b/spec/classes/midonet_cluster_run_spec.rb index b8dcc3b..e11d08f 100644 --- a/spec/classes/midonet_cluster_run_spec.rb +++ b/spec/classes/midonet_cluster_run_spec.rb @@ -7,6 +7,7 @@ describe 'midonet::cluster::run' do :osfamily => 'Debian', :lsbdistid => 'Ubuntu', :lsbdistrelease => '16.04', + :puppetversion => Puppet.version } end let :params do diff --git a/spec/classes/midonet_gateway_static_spec.rb b/spec/classes/midonet_gateway_static_spec.rb index 9f901b6..a70521b 100644 --- a/spec/classes/midonet_gateway_static_spec.rb +++ b/spec/classes/midonet_gateway_static_spec.rb @@ -7,6 +7,7 @@ describe 'midonet::gateway::static' do :osfamily => 'Debian', :lsbdistid => 'Ubuntu', :lsbdistrelease => '16.04', + :puppetversion => Puppet.version } end let :params do diff --git a/spec/classes/midonet_mem_manager_spec.rb b/spec/classes/midonet_mem_manager_spec.rb index d3e2419..27eee23 100644 --- a/spec/classes/midonet_mem_manager_spec.rb +++ b/spec/classes/midonet_mem_manager_spec.rb @@ -13,7 +13,8 @@ describe 'midonet::mem' do :fqdn => 'gateway', :memorysize => '2048', :lsbdistid => 'trusty', - :lsbdistrelease => '14.04' + :lsbdistrelease => '14.04', + :puppetversion => Puppet.version } end it { is_expected.to contain_package('midonet-manager').with( diff --git a/spec/classes/midonet_repository_centos_spec.rb b/spec/classes/midonet_repository_centos_spec.rb index dcbc6a8..1189103 100644 --- a/spec/classes/midonet_repository_centos_spec.rb +++ b/spec/classes/midonet_repository_centos_spec.rb @@ -5,7 +5,8 @@ describe 'midonet::repository::centos' do let :facts do { :osfamily => 'RedHat', - :operatingsystemmajrelease => '7' + :operatingsystemmajrelease => '7', + :puppetversion => Puppet.version } end let :params do @@ -55,7 +56,8 @@ describe 'midonet::repository::centos' do let :facts do { :osfamily => 'RedHat', - :operatingsystemmajrelease => '7' + :operatingsystemmajrelease => '7', + :puppetversion => Puppet.version } end let :params do diff --git a/spec/classes/midonet_repository_spec.rb b/spec/classes/midonet_repository_spec.rb index d4efc9d..fc0f10f 100644 --- a/spec/classes/midonet_repository_spec.rb +++ b/spec/classes/midonet_repository_spec.rb @@ -7,6 +7,7 @@ describe 'midonet::repository' do :osfamily => 'Debian', :lsbdistid => 'Ubuntu', :lsbdistrelease => '16.04', + :puppetversion => Puppet.version } end it { is_expected.to contain_class('midonet::repository::ubuntu').with( @@ -44,6 +45,7 @@ describe 'midonet::repository' do :osfamily => 'Debian', :lsbdistid => 'Ubuntu', :lsbdistrelease => '16.04', + :puppetversion => Puppet.version } end let :params do @@ -69,7 +71,9 @@ describe 'midonet::repository' do let :facts do { :osfamily => 'RedHat', - :operatingsystemmajrelease => '7' + :operatingsystemmajrelease => '7', + :puppetversion => Puppet.version + } end let :params do diff --git a/spec/classes/midonet_repository_ubuntu_spec.rb b/spec/classes/midonet_repository_ubuntu_spec.rb index 60fe492..d9c0245 100644 --- a/spec/classes/midonet_repository_ubuntu_spec.rb +++ b/spec/classes/midonet_repository_ubuntu_spec.rb @@ -7,6 +7,7 @@ describe 'midonet::repository::ubuntu' do :osfamily => 'Debian', :lsbdistid => 'Ubuntu', :lsbdistrelease => '16.04', + :puppetversion => Puppet.version } end let :params do @@ -58,6 +59,8 @@ describe 'midonet::repository::ubuntu' do :osfamily => 'Debian', :lsbdistid => 'Ubuntu', :lsbdistrelease => '16.04', + :puppetversion => Puppet.version + } end let :params do