beaker 2.5.1 → 2.6.0

data/acceptance/fixtures/module/spec/acceptance/nodesets/centos-59-x64.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  centos-59-x64:
+    roles:
+      - master
+    platform: el-5-x86_64
+    box : centos-59-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  type: git

data/acceptance/fixtures/module/spec/acceptance/nodesets/centos-64-x64-pe.yml

@@ -0,0 +1,12 @@
+HOSTS:
+  centos-64-x64:
+    roles:
+      - master
+      - database
+      - dashboard
+    platform: el-6-x86_64
+    box : centos-64-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  type: pe

data/acceptance/fixtures/module/spec/acceptance/nodesets/centos-64-x64.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  centos-64-x64:
+    roles:
+      - master
+    platform: el-6-x86_64
+    box : centos-64-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  type: foss

data/acceptance/fixtures/module/spec/acceptance/nodesets/centos-65-x64.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  centos-65-x64:
+    roles:
+      - master
+    platform: el-6-x86_64
+    box : centos-65-x64-vbox436-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  type: foss

data/acceptance/fixtures/module/spec/acceptance/nodesets/default.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  centos-64-x64:
+    roles:
+      - master
+    platform: el-6-x86_64
+    box : centos-64-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  type: foss

data/acceptance/fixtures/module/spec/acceptance/nodesets/fedora-18-x64.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  fedora-18-x64:
+    roles:
+      - master
+    platform: fedora-18-x86_64
+    box : fedora-18-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  type: foss

data/acceptance/fixtures/module/spec/acceptance/nodesets/internal-vpool.yml

@@ -0,0 +1,17 @@
+HOSTS:
+  centos-7-x86_64-master:
+    roles:
+      - agent
+      - dashboard
+      - database
+      - master
+    hypervisor: vcloud
+    platform: centos-7-x86_64
+    template: Delivery/Quality Assurance/Templates/vCloud/centos-7-x86_64
+CONFIG:
+  pooling_api: http://vcloud.delivery.puppetlabs.net
+  datastore: instance0
+  folder: Delivery/Quality Assurance/Staging/Dynamic
+  resourcepool: delivery/Quality Assurance/Staging/Dynamic
+  nfs_server: none
+  consoleport: 443

data/acceptance/fixtures/module/spec/acceptance/nodesets/sles-11-x64.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  sles-11-x64.local:
+    roles:
+      - master
+    platform: sles-11-x64
+    box : sles-11sp1-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+    type: foss

data/acceptance/fixtures/module/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  ubuntu-server-10044-x64:
+    roles:
+      - master
+    platform: ubuntu-10.04-amd64
+    box : ubuntu-server-10044-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  type: foss

data/acceptance/fixtures/module/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  ubuntu-server-12042-x64:
+    roles:
+      - master
+    platform: ubuntu-12.04-amd64
+    box : ubuntu-server-12042-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  type: foss

data/acceptance/fixtures/module/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml

@@ -0,0 +1,11 @@
+HOSTS:
+  ubuntu-server-1404-x64:
+    roles:
+      - master
+    platform: ubuntu-14.04-amd64
+    box : puppetlabs/ubuntu-14.04-64-nocm
+    box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
+    hypervisor : vagrant
+CONFIG:
+  log_level   : debug
+  type: git

data/acceptance/fixtures/module/spec/acceptance/nodesets/ubuntu-server-14042-x64.yml

@@ -0,0 +1,16 @@
+HOSTS:
+  ubuntu1404:
+    roles:
+      - agent
+    platform: ubuntu-14.04-amd64
+    template: ubuntu-1404-x86_64
+    hypervisor: vcloud
+CONFIG:
+  type: foss
+  keyfile: ~/.ssh/id_rsa-acceptance
+  nfs_server: none
+  consoleport: 443
+  datastore: instance0
+  folder: Delivery/Quality Assurance/Enterprise/Dynamic
+  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
+  pooling_api: http://vcloud.delivery.puppetlabs.net/

data/acceptance/fixtures/module/spec/classes/init_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+describe 'demo' do
+
+  context 'with defaults for all parameters' do
+    it { should contain_class('demo') }
+  end
+end

data/acceptance/fixtures/module/spec/spec_helper.rb

@@ -0,0 +1 @@
+require 'puppetlabs_spec_helper/module_spec_helper'

data/acceptance/fixtures/module/spec/spec_helper_acceptance.rb

@@ -0,0 +1,38 @@
+require 'beaker-rspec'
+
+unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
+  # This will install the latest available package on el and deb based
+  # systems fail on windows and osx, and install via gem on other *nixes
+  foss_opts = {:default_action => 'gem_install'}
+
+  if default.is_pe?; then
+    install_pe;
+  else
+    install_puppet(foss_opts);
+  end
+
+  hosts.each do |host|
+    unless host.is_pe?
+      on host, "/bin/echo '' > #{host.puppet('hiera_config')}"
+    end
+    on host, "mkdir -p #{host['distmoduledir']}"
+  end
+end
+
+RSpec.configure do |c|
+  # Project root
+  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
+  # Readable test descriptions
+  c.formatter = :documentation
+
+  # Configure all nodes in nodeset
+  c.before :suite do
+    hosts.each do |host|
+      on host, "mkdir -p #{host['distmoduledir']}/demo"
+      %w(lib manifests metadata.json).each do |file|
+        scp_to host, "#{proj_root}/#{file}", "#{host['distmoduledir']}/ntp"
+      end
+    end
+  end
+end

data/acceptance/fixtures/module/tests/init.pp

@@ -0,0 +1,12 @@
+# The baseline for module testing used by Puppet Labs is that each manifest
+# should have a corresponding test manifest that declares that class or defined
+# type.
+#
+# Tests are then run by using puppet apply --noop (to check for compilation
+# errors and view a log of events) or by fully applying the test in a virtual
+# environment (to compare the resulting system state to the desired state).
+#
+# Learn more about module testing here:
+# http://docs.puppetlabs.com/guides/tests_smoke.html
+#
+include demo

data/acceptance/fixtures/module/vendor/bundle/ruby/gems.txt

@@ -0,0 +1 @@
+test gems would live in this directory

data/acceptance/pre_suite/README.md

@@ -0,0 +1,7 @@
+# Beaker Acceptance Tests: pre-suite
+
+Collection of pre-suites for SUT configuration before test execution.
+
+Options:
+* install PE
+* install FOSS Puppet

data/acceptance/tests/base/README.md

@@ -0,0 +1,4 @@
+# Beaker Acceptance Tests: base
+
+Tests that do not depend upon Puppet being installed on the SUTs.
+

data/acceptance/tests/base/host.rb

@@ -0,0 +1,154 @@
+test_name "confirm host object behave correctly"
+
+step "#port_open? : can determine if a port is open on hosts"
+hosts.each do |host|
+  logger.debug "port 22 (ssh) should be open on #{host}"
+  assert_equal(true, host.port_open?(22), "port 22 on #{host} should be open")
+  logger.debug "port 65535 should be closed on #{host}"
+  assert_equal(false, host.port_open?(65535), "port 65535 on #{host} should be closed")
+end
+
+step "#ip : can determine the ip address on hosts"
+hosts.each do |host|
+  ip = host.ip
+  # confirm ip format
+  logger.debug("format of #{ip} for #{host} should be correct")
+  assert_match(/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/, ip, "#{ip} on #{host} isn't correct format")
+end
+
+step "#is_x86_64? : can determine arch on hosts"
+hosts.each do |host|
+  if host['platform'] =~ /x86_64|_64|amd64|-64/
+    assert_equal(true, host.is_x86_64?, "is_x86_64? should be true on #{host}: #{host['platform']}")
+  else
+    assert_equal(false, host.is_x86_64?, "is_x86_64? should be false on #{host}: #{host['platform']}")
+  end
+end
+
+step "#add_env_var : can add an environment variable"
+hosts.each do |host|
+  logger.debug("add TEST=1")
+  host.add_env_var("TEST", "1")
+  logger.debug("add TEST=1 again (shouldn't create duplicate entry)")
+  host.add_env_var("test", "1")
+  logger.debug("add test=2")
+  host.add_env_var("test", "2")
+  logger.debug("ensure that TEST env var has correct setting")
+  logger.debug("add test=3")
+  host.add_env_var("test", "3")
+  logger.debug("ensure that TEST env var has correct setting")
+  val = host.get_env_var("test")
+  assert_match(/TEST=3(;|:)2(;|:)1$/, val, "add_env_var can correctly add env vars")
+end
+
+step "#delete_env_var : can delete an environment"
+hosts.each do |host|
+  logger.debug("remove TEST=3")
+  host.delete_env_var("TEST", "3")
+  val = host.get_env_var("test")
+  assert_match(/TEST=2(;|:)1$/, val, "delete_env_var can correctly delete part of a chained env var")
+  logger.debug("remove TEST=1")
+  host.delete_env_var("TEST", "1")
+  val = host.get_env_var("test")
+  assert_match(/TEST=2$/, val, "delete_env_var can correctly delete part of a chained env var")
+  logger.debug("remove TEST=2")
+  host.delete_env_var("TEST", "2")
+  val = host.get_env_var("test")
+  assert_equal("", val, "delete_env_var fully removes empty env var")
+end
+
+step "#mkdir_p : can recursively create a directory structure on a host"
+hosts.each do |host|
+  #clean up first!
+  host.rm_rf("test1")
+  #test dir construction
+  logger.debug("create test1/test2/test3/test4")
+  assert_equal(true, host.mkdir_p("test1/test2/test3/test4"), "can create directory structure")
+  logger.debug("should be able to create a file in the new dir")
+  on host, host.touch("test1/test2/test3/test4/test.txt", false)
+end
+
+step "#do_scp_to : can copy a directory to the host with no ignores"
+current_dir = File.dirname(__FILE__)
+module_fixture = File.join(current_dir, "../../fixtures/module")
+hosts.each do |host|
+  logger.debug("can recursively copy a module over")
+  #make sure that we are clean on the test host
+  host.rm_rf("module")
+  host.do_scp_to(module_fixture, ".", {})
+  Dir.mktmpdir do |tmp_dir|
+    #grab copy from host
+    host.do_scp_from("module", tmp_dir, {})
+    #compare to local copy
+    local_paths = Dir.glob(File.join(module_fixture, "**/*")).select { |f| File.file?(f) }
+    host_paths  = Dir.glob(File.join(File.join(tmp_dir, "module"), "**/*")).select { |f| File.file?(f) }
+    #each local file should have a single match on the host
+    local_paths.each do |path|
+      search_name = path.gsub(/^.*fixtures\//, '') #reduce down to the path that should match
+      matched = host_paths.select{ |check| check =~ /#{Regexp.escape(search_name)}$/ }
+      assert_equal(1, matched.length, "should have found a single instance of path #{search_name}, found #{matched.length}: \n #{matched}")
+      host_paths = host_paths - matched
+    end
+    assert_equal(0, host_paths.length, "there are extra paths on #{host} (#{host_paths})")
+  end
+end
+
+step "#do_scp_to with :ignore : can copy a dir to the host, excluding ignored patterns that DO NOT appear in the source absolute path"
+current_dir = File.dirname(__FILE__)
+module_fixture = File.expand_path(File.join(current_dir, "../../fixtures/module"))
+hosts.each do |host|
+  logger.debug("can recursively copy a module over, ignoring some files/dirs")
+  #make sure that we are clean on the test host
+  host.rm_rf("module")
+  host.do_scp_to(module_fixture, ".", {:ignore => ['vendor', 'Gemfile']})
+  Dir.mktmpdir do |tmp_dir|
+    #grab copy from host
+    host.do_scp_from("module", tmp_dir, {})
+    #compare to local copy
+    local_paths = Dir.glob(File.join(module_fixture, "**/*")).select { |f| File.file?(f) }
+    host_paths  = Dir.glob(File.join(File.join(tmp_dir, "module"), "**/*")).select { |f| File.file?(f) }
+    #each local file should have a single match on the host
+    local_paths.each do |path|
+      search_name = path.gsub(/^.*fixtures\//, '') #reduce down to the path that should match
+      matched = host_paths.select{ |check| check =~ /#{Regexp.escape(search_name)}$/ }
+      re =  /((\/|\A)vendor(\/|\z))|((\/|\A)Gemfile(\/|\z))/
+      if path !~ re
+        assert_equal(1, matched.length, "should have found a single instance of path #{search_name}, found #{matched.length}: \n #{matched}")
+      else
+        assert_equal(0, matched.length, "should have found no instances of path #{search_name}, found #{matched.length}: \n #{matched}")
+      end
+      host_paths = host_paths - matched
+    end
+    assert_equal(0, host_paths.length, "there are extra paths on #{host} (#{host_paths})")
+  end
+end
+
+step "#do_scp_to with :ignore : can copy a dir to the host, excluding ignored patterns that DO appear in the source absolute path"
+current_dir = File.dirname(__FILE__)
+module_fixture = File.expand_path(File.join(current_dir, "../../fixtures/module"))
+hosts.each do |host|
+  logger.debug("can recursively copy a module over, ignoring some sub-files/sub-dirs that also appear in the absolute path")
+  #make sure that we are clean on the test host
+  host.rm_rf("module")
+  host.do_scp_to(module_fixture, ".", {:ignore => ['module', 'Gemfile']})
+  Dir.mktmpdir do |tmp_dir|
+    #grab copy from host
+    host.do_scp_from("module", tmp_dir, {})
+    #compare to local copy
+    local_paths = Dir.glob(File.join(module_fixture, "**/*")).select { |f| File.file?(f) }
+    host_paths  = Dir.glob(File.join(File.join(tmp_dir, "module"), "**/*")).select { |f| File.file?(f) }
+    #each local file should have a single match on the host
+    local_paths.each do |path|
+      search_name = path.gsub(/^.*fixtures\/module\//, '') #reduce down to the path that should match
+      matched = host_paths.select{ |check| check =~ /#{Regexp.escape(search_name)}$/ }
+      re =  /((\/|\A)module(\/|\z))|((\/|\A)Gemfile(\/|\z))/
+      if path.gsub(/^.*module\//, '') !~ re
+        assert_equal(1, matched.length, "should have found a single instance of path #{search_name}, found #{matched.length}: \n #{matched}")
+      else
+        assert_equal(0, matched.length, "should have found no instances of path #{search_name}, found #{matched.length}: \n #{matched}")
+      end
+      host_paths = host_paths - matched
+    end
+    assert_equal(0, host_paths.length, "there are extra paths on #{host} (#{host_paths})")
+  end
+end

data/acceptance/tests/puppet/README.md

@@ -0,0 +1,3 @@
+# Beaker Acceptance Tests: puppet
+
+Tests that depend upon Puppet being installed on the SUTs.

data/lib/beaker/answers/version20.rb

@@ -109,7 +109,7 @@ module Beaker
       master = only_host_with_role(@hosts, 'master')
       @hosts.each do |h|
         the_answers[h.name] = host_answers(h, master, dashboard, @options)
-        if h[:custom_answers]
+        if the_answers[h.name] && h[:custom_answers]
           the_answers[h.name] = the_answers[h.name].merge(h[:custom_answers])
         end
         h[:answers] = the_answers[h.name]

data/lib/beaker/answers/version28.rb

@@ -109,7 +109,7 @@ module Beaker
       master = only_host_with_role(@hosts, 'master')
       @hosts.each do |h|
         the_answers[h.name] = host_answers(h, master, dashboard, @options)
-        if h[:custom_answers]
+        if the_answers[h.name] && h[:custom_answers]
           the_answers[h.name] = the_answers[h.name].merge(h[:custom_answers])
         end
         h[:answers] = the_answers[h.name]

data/lib/beaker/answers/version30.rb

@@ -211,7 +211,7 @@ module Beaker
         else
           the_answers[h.name] = host_answers(h, master, database, dashboard, @options)
         end
-        if h[:custom_answers]
+        if the_answers[h.name] && h[:custom_answers]
           the_answers[h.name] = the_answers[h.name].merge(h[:custom_answers])
         end
         h[:answers] = the_answers[h.name]

data/lib/beaker/dsl/helpers.rb

@@ -1405,7 +1405,7 @@ module Beaker
           hiera_config=Hash.new
           hiera_config[:backends] = 'yaml'
           hiera_config[:yaml] = {}
-          hiera_config[:yaml][:datadir] = host[:hieradatadir]
+          hiera_config[:yaml][:datadir] = hiera_datadir(host)
           hiera_config[:hierarchy] = hierarchy
           hiera_config[:logger] = 'console'
           create_remote_file host, host.puppet['hiera_config'], hiera_config.to_yaml
@@ -1424,7 +1424,7 @@ module Beaker
       #                           or a role (String or Symbol) that identifies one or more hosts.
       # @param[String]            Directory containing the hiera data files.
       def copy_hiera_data_to(host, source)
-        scp_to host, File.expand_path(source), host[:hieradatadir]
+        scp_to host, File.expand_path(source), hiera_datadir(host)
       end
 
       # Copy hiera data files to the default host
@@ -1433,6 +1433,16 @@ module Beaker
         copy_hiera_data_to(default, source)
       end
 
+      # Get file path to the hieradatadir for a given host.
+      # Handles whether or not a host is AIO-based & backwards compatibility
+      #
+      # @param[Host] host Host you want to use the hieradatadir from
+      #
+      # @return [String] Path to the hiera data directory
+      def hiera_datadir(host)
+        host[:type] =~ /aio/ ? File.join(host.puppet['codedir'], 'hieradata') : host[:hieradatadir]
+      end
+
     end
   end
 end