Skip to content

Commit

Permalink
Merge pull request #13 from EMSL-MSC/develop
Browse files Browse the repository at this point in the history
Develop Sync
  • Loading branch information
GitBytes committed Sep 3, 2015
2 parents c728a15 + b2b317d commit 18459d4
Show file tree
Hide file tree
Showing 11 changed files with 162 additions and 18 deletions.
17 changes: 10 additions & 7 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,34 @@ driver:

provisioner:
name: chef_zero
require_chef_omnibus: true
require_chef_omnibus: latest

platforms:
- name: debian-7.8

- name: ubuntu-12.04
run_list:
- recipe[apt]

- name: ubuntu-14.04
run_list:
- recipe[apt]
- name: centos-6.6

- name: centos-6.7

- name: centos-7.0

data_bags_path: test/integration/data_bags/
roles_path: test/integration/roles/
environments_path: test/integration/environments

suites:
- name: server
- name: aio-server
run_list:
- role[bareos_server]
attributes:
# bareos:
# dbpassword: 'ChangeMe1234#'
# dbaddress: '127.0.0.1'
- name: server-host-pools

- name: aio-server-pools
run_list:
- role[bareos_server]
attributes:
Expand Down
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ Bareos Cookbook CHANGELOG

This file is used to list changes made in each version of the bareos cookbook.


0.1.4
-----
- Ian smith
Expand All @@ -17,6 +16,9 @@ This file is used to list changes made in each version of the bareos cookbook.
- Revamping storage.rb and storage template to what I am thinking was meant to happen originally
- Adding new kitchen suite and tests to verify host pools work
- Bugfixes
- Updating Kitchen Tests and ChefSpec Configs to match for verifying
* Addressing race condition in ChefSpec tests where debian was taking
longer than expected to start the director

0.1.3
-----
Expand Down
2 changes: 1 addition & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '0.1.4'

supports 'centos', '>= 6.0'
supports 'debian', '>= 7.0'
supports 'ubuntu', '>= 12.04'
supports 'centos', '>= 6.0'

depends 'apt'
depends 'openssl'
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,28 +1,30 @@
require 'spec_helper'

describe package('bareos-director') do
# Check Packages are installed
describe package('bareos-filedaemon') do
it { should be_installed }
end

describe service('bareos-dir') do
it { should be_enabled }
it { should be_running }
describe package('bareos-storage') do
it { should be_installed }
end

describe package('bareos-storage') do
describe package('bareos-director') do
it { should be_installed }
end

describe service('bareos-sd') do
# Check Services are running and enabled
describe service('bareos-fd') do
it { should be_enabled }
it { should be_running }
end

describe package('bareos-filedaemon') do
it { should be_installed }
describe service('bareos-sd') do
it { should be_enabled }
it { should be_running }
end

describe service('bareos-fd') do
describe service('bareos-dir') do
it { should be_enabled }
it { should be_running }
end
2 changes: 2 additions & 0 deletions test/integration/aio-server/serverspec/.rspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
--color
--require spec_helper
30 changes: 30 additions & 0 deletions test/integration/aio-server/serverspec/bareos_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
require 'spec_helper'

# Check Packages are installed
describe package('bareos-filedaemon') do
it { should be_installed }
end

describe package('bareos-storage') do
it { should be_installed }
end

describe package('bareos-director') do
it { should be_installed }
end

# Check Services are running and enabled
describe service('bareos-fd') do
it { should be_enabled }
it { should be_running }
end

describe service('bareos-sd') do
it { should be_enabled }
it { should be_running }
end

describe service('bareos-dir') do
it { should be_enabled }
it { should be_running }
end
89 changes: 89 additions & 0 deletions test/integration/aio-server/serverspec/spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
# This file was generated by the `rspec --init` command. Conventionally, all
# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
# The generated `.rspec` file contains `--require spec_helper` which will cause this
# file to always be loaded, without a need to explicitly require it in any files.
#
# Given that it is always loaded, you are encouraged to keep this file as
# light-weight as possible. Requiring heavyweight dependencies from this file
# will add to the boot time of your test suite on EVERY test run, even for an
# individual file that may not need all of that loaded. Instead, consider making
# a separate helper file that requires the additional dependencies and performs
# the additional setup, and require it from the spec files that actually need it.
#
# The `.rspec` file also contains a few flags that are not defaults but that
# users commonly want.
#
# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
RSpec.configure do |config|
# rspec-expectations config goes here. You can use an alternate
# assertion/expectation library such as wrong or the stdlib/minitest
# assertions if you prefer.
config.expect_with :rspec do |expectations|
# This option will default to `true` in RSpec 4. It makes the `description`
# and `failure_message` of custom matchers include text for helper methods
# defined using `chain`, e.g.:
# be_bigger_than(2).and_smaller_than(4).description
# # => "be bigger than 2 and smaller than 4"
# ...rather than:
# # => "be bigger than 2"
expectations.include_chain_clauses_in_custom_matcher_descriptions = true
end

# rspec-mocks config goes here. You can use an alternate test double
# library (such as bogus or mocha) by changing the `mock_with` option here.
config.mock_with :rspec do |mocks|
# Prevents you from mocking or stubbing a method that does not exist on
# a real object. This is generally recommended, and will default to
# `true` in RSpec 4.
mocks.verify_partial_doubles = true
end

# The settings below are suggested to provide a good initial experience
# with RSpec, but feel free to customize to your heart's content.
begin
# These two settings work together to allow you to limit a spec run
# to individual examples or groups you care about by tagging them with
# `:focus` metadata. When nothing is tagged with `:focus`, all examples
# get run.
config.filter_run :focus
config.run_all_when_everything_filtered = true

# Limits the available syntax to the non-monkey patched syntax that is recommended.
# For more details, see:
# - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
# - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
# - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
config.disable_monkey_patching!

# This setting enables warnings. It's recommended, but in some cases may
# be too noisy due to issues in dependencies.
config.warnings = true

# Many RSpec users commonly either run the entire suite or an individual
# file, and it's useful to allow more verbose output when running an
# individual spec file.
if config.files_to_run.one?
# Use the documentation formatter for detailed output,
# unless a formatter has already been configured
# (e.g. via a command-line flag).
config.default_formatter = 'doc'
end

# Print the 10 slowest examples and example groups at the
# end of the spec run, to help surface which specs are running
# particularly slow.
config.profile_examples = 10

# Run specs in random order to surface order dependencies. If you find an
# order dependency and want to debug it, you can fix the order by providing
# the seed, which is printed after each run.
# --seed 1234
config.order = :random

# Seed global randomization in this process using the `--seed` CLI option.
# Setting this allows you to use `--seed` to deterministically reproduce
# test failures related to randomization by passing the same `--seed` value
# as the one that triggered the failure.
Kernel.srand config.seed
end
end
16 changes: 16 additions & 0 deletions test/integration/aio-server/serverspec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
require 'serverspec'

set :backend, :exec

RSpec.configure do |c|
c.before :all do
set :path, '$PATH:/sbin:/usr/local/sbin'
end

if ENV['ASK_SUDO_PASSWORD']
require 'highline/import'
c.sudo_password = ask('Enter sudo password: ') { |q| q.echo = false }
else
c.sudo_password = ENV['SUDO_PASSWORD']
end
end

0 comments on commit 18459d4

Please sign in to comment.