Add beaker tests and update gems

Carlos Sanchez · Carlos Sanchez · commit 5c13e614c6a6 · 2014-11-03T13:29:29.000+01:00
diff --git a/Gemfile b/Gemfile
@@ -1,11 +1,14 @@
 source 'https://rubygems.org'
 
 group :rake do
-  gem 'puppet',       '>=2.7.17'
-  gem 'rspec-puppet', '>=1.0.0'
-  gem 'rake',         '>=0.9.2.2'
-  gem 'puppet-lint'
-  gem 'puppetlabs_spec_helper'
-  gem 'puppet-blacksmith', '>=1.0.5'
-  gem 'librarian-puppet', '>=0.9.13'
+  gem 'puppet',       '>=2.7.17', :require => false
+  gem 'rspec-puppet', '>=1.0.0', :require => false
+  gem 'rake',         '>=0.9.2.2', :require => false
+  gem 'puppet-lint', :require => false
+  gem 'puppetlabs_spec_helper', :require => false
+  gem 'puppet-blacksmith', '>=1.0.5', :require => false
+  gem 'librarian-puppet', '>=2.0.0', :require => false
+  gem 'beaker', '>=1.17.0', :require => false
+  gem 'beaker-rspec', '>=2.1.0', :require => false
+  gem 'minitest', '<5.0.0', :require => false # avoid conflict with Beaker
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,61 +1,204 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    CFPropertyList (2.2.8)
+    activemodel (4.0.11)
+      activesupport (= 4.0.11)
+      builder (~> 3.1.0)
+    activesupport (4.0.11)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    addressable (2.3.6)
+    archive-tar-minitar (0.5.2)
+    autoparse (0.3.3)
+      addressable (>= 2.3.1)
+      extlib (>= 0.9.15)
+      multi_json (>= 1.0.0)
+    aws-sdk (1.42.0)
+      json (~> 1.4)
+      nokogiri (>= 1.4.4)
+    beaker (1.20.1)
+      aws-sdk (= 1.42.0)
+      blimpy (~> 0.6)
+      docker-api
+      fission (~> 0.4)
+      fog (~> 1.22.1)
+      google-api-client (~> 0.7.1)
+      hocon (~> 0.0.4)
+      inifile (~> 2.0)
+      json (~> 1.8)
+      mime-types (~> 1.25)
+      net-scp (~> 1.1)
+      net-ssh (~> 2.6)
+      nokogiri (~> 1.5.10)
+      rbvmomi (= 1.8.1)
+      unf (~> 0.1)
+    beaker-rspec (3.0.0)
+      beaker (~> 1.10)
+      rspec
+      serverspec (~> 1.0)
+      specinfra (~> 1.0)
+    blimpy (0.6.7)
+      fog
+      minitar
+      thor
+    builder (3.1.4)
     diff-lcs (1.2.5)
-    facter (1.7.5)
-    hiera (1.3.2)
+    docker-api (1.13.6)
+      archive-tar-minitar
+      excon (>= 0.38.0)
+      json
+    excon (0.40.0)
+    extlib (0.9.16)
+    facter (2.3.0)
+      CFPropertyList (~> 2.2.6)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    fission (0.5.0)
+      CFPropertyList (~> 2.2)
+    fog (1.22.1)
+      fog-brightbox
+      fog-core (~> 1.22)
+      fog-json
+      ipaddress (~> 0.5)
+      nokogiri (~> 1.5, >= 1.5.11)
+    fog-brightbox (0.6.1)
+      fog-core (~> 1.22)
+      fog-json
+      inflecto
+    fog-core (1.24.0)
+      builder
+      excon (~> 0.38)
+      formatador (~> 0.2)
+      mime-types
+      net-scp (~> 1.1)
+      net-ssh (>= 2.1.3)
+    fog-json (1.0.0)
+      multi_json (~> 1.0)
+    formatador (0.2.5)
+    google-api-client (0.7.1)
+      addressable (>= 2.3.2)
+      autoparse (>= 0.3.3)
+      extlib (>= 0.9.15)
+      faraday (>= 0.9.0)
+      jwt (>= 0.1.5)
+      launchy (>= 2.1.1)
+      multi_json (>= 1.0.0)
+      retriable (>= 1.4)
+      signet (>= 0.5.0)
+      uuidtools (>= 2.1.0)
+    her (0.7.2)
+      activemodel (>= 3.0.0, < 4.2)
+      activesupport (>= 3.0.0, < 4.2)
+      faraday (>= 0.8, < 1.0)
+      multi_json (~> 1.7)
+    hiera (1.3.4)
       json_pure
     highline (1.6.21)
+    hocon (0.0.6)
+    i18n (0.6.11)
+    inflecto (0.0.2)
+    inifile (2.0.2)
+    ipaddress (0.8.0)
     json (1.8.1)
     json_pure (1.8.1)
+    jwt (1.0.0)
+    launchy (2.4.3)
+      addressable (~> 2.3)
     librarian (0.1.2)
       highline
       thor (~> 0.15)
-    librarian-puppet (1.0.1)
-      json
+    librarian-puppet (2.0.0)
       librarian (>= 0.1.2)
+      puppet_forge
+      rsync
     metaclass (0.0.4)
-    mime-types (2.2)
-    mini_portile (0.5.3)
-    mocha (1.0.0)
+    mime-types (1.25.1)
+    minitar (0.5.4)
+    minitest (4.7.5)
+    mocha (1.1.0)
       metaclass (~> 0.0.1)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    puppet (3.4.3)
-      facter (~> 1.6)
+    multi_json (1.10.1)
+    multipart-post (2.0.0)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.1)
+    netrc (0.8.0)
+    nokogiri (1.5.11)
+    puppet (3.7.2)
+      facter (> 1.6, < 3)
       hiera (~> 1.0)
-      rgen (~> 0.6.5)
-    puppet-blacksmith (2.0.2)
-      nokogiri
+      json_pure
+    puppet-blacksmith (3.0.3)
       puppet (>= 2.7.16)
       rest-client
-    puppet-lint (0.3.2)
-    puppetlabs_spec_helper (0.4.1)
-      mocha (>= 0.10.5)
+    puppet-lint (1.1.0)
+    puppet-syntax (1.3.0)
       rake
-      rspec (>= 2.9.0)
-      rspec-puppet (>= 0.1.1)
-    rake (10.3.1)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rgen (0.6.6)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
+    puppet_forge (1.0.3)
+      her (~> 0.6)
+    puppetlabs_spec_helper (0.8.2)
+      mocha
+      puppet-lint
+      puppet-syntax
+      rake
+      rspec
+      rspec-puppet
+    rake (10.3.2)
+    rbvmomi (1.8.1)
+      builder
+      nokogiri (>= 1.4.1)
+      trollop
+    rest-client (1.7.2)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    retriable (1.4.1)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
+    rspec-its (1.0.1)
+      rspec-core (>= 2.99.0.beta1)
+      rspec-expectations (>= 2.99.0.beta1)
+    rspec-mocks (2.99.2)
     rspec-puppet (1.0.1)
       rspec
+    rsync (1.0.9)
+    serverspec (1.16.0)
+      highline
+      net-ssh
+      rspec (~> 2.99)
+      rspec-its
+      specinfra (~> 1.27)
+    signet (0.5.1)
+      addressable (>= 2.2.3)
+      faraday (>= 0.9.0.rc5)
+      jwt (>= 0.1.5)
+      multi_json (>= 1.0.0)
+    specinfra (1.27.5)
     thor (0.19.1)
+    thread_safe (0.3.4)
+    trollop (2.0)
+    tzinfo (0.3.42)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.6)
+    uuidtools (2.1.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  librarian-puppet (>= 0.9.13)
+  beaker (>= 1.17.0)
+  beaker-rspec (>= 2.1.0)
+  librarian-puppet (>= 2.0.0)
+  minitest (< 5.0.0)
   puppet (>= 2.7.17)
   puppet-blacksmith (>= 1.0.5)
   puppet-lint
diff --git a/Rakefile b/Rakefile
@@ -1,14 +1,15 @@
-require 'bundler'
-Bundler.require(:rake)
 require 'rake/clean'
 
-CLEAN.include('spec/fixtures/', 'doc', 'pkg')
+CLEAN.include('spec/fixtures/manifests/', 'spec/fixtures/modules/', 'doc', 'pkg')
 CLOBBER.include('.tmp', '.librarian')
 
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet_blacksmith/rake_tasks'
 
+require 'puppet-lint/tasks/puppet-lint'
 PuppetLint.configuration.send("disable_80chars")
+PuppetLint.configuration.fail_on_warnings = true
+PuppetLint.configuration.relative = true
 
 # use librarian-puppet to manage fixtures instead of .fixtures.yml
 # offers more possibilities like explicit version management, forge downloads,...
@@ -17,4 +18,9 @@ task :librarian_spec_prep do
 end
 task :spec_prep => :librarian_spec_prep
 
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:beaker) do |c|
+  c.pattern = "spec/acceptance/**/*_spec.rb"
+end
+
 task :default => [:clean, :spec]
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -63,6 +63,7 @@
   $group = $archiva::params::group,
   $manage_user = $archiva::params::manage_user,
   $service = $archiva::params::service,
+  $enable = $archiva::params::enable,
   $installroot = $archiva::params::installroot,
   $home = $archiva::params::home,
   $apache_mirror = $archiva::params::apache_mirror,
@@ -251,7 +252,7 @@
     ensure     => running,
     hasrestart => true,
     hasstatus  => true,
-    enable     => true,
+    enable     => $enable,
   }
 
   if $maxmemory != undef {
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -12,6 +12,7 @@
   $group = 'archiva',
   $manage_user = true,
   $service = 'archiva',
+  $enable = true,
   $installroot = '/usr/local',
   $home = '/var/local/archiva',
   $apache_mirror = 'http://archive.apache.org/dist',
diff --git a/spec/acceptance/archiva_system_spec.rb b/spec/acceptance/archiva_system_spec.rb
@@ -0,0 +1,20 @@
+require 'spec_helper_acceptance'
+
+describe 'archiva' do
+
+  let(:manifest) { %Q(
+    class { 'java': } ->
+    class { 'archiva':
+      enable => false,
+    }
+  ) }
+
+  it 'should install idempotently' do
+    apply_manifest(manifest, :catch_failures => true)
+    apply_manifest(manifest, :catch_changes => true)
+    # wait no more than 60 secs for service to be up
+    shell(%Q(timeout 60 sh -c "while ! grep 'Started SelectChannelConnector@0.0.0.0:8080' /var/local/archiva/logs/wrapper*.log; do sleep 1; done"))
+    port(8080).should be_listening
+  end
+
+end
diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
@@ -0,0 +1,14 @@
+HOSTS:
+  centos-65-x64:
+    roles:
+      - master
+    platform: el-6-x86_64
+    image: devopsil/puppet:3.5.1
+    # ip: localhost
+    hypervisor : docker
+    docker_image_commands:
+      - yum -y install tar
+      - useradd vagrant
+CONFIG:
+  log_level: debug
+  type: git
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
