Skip to content
This repository was archived by the owner on Jan 10, 2023. It is now read-only.

Commit a0dc0f1

Browse files
committed
Merge pull request #105 from patcon/feature/serverspec
Migrate to serverspec tests
2 parents 042bca6 + e371e65 commit a0dc0f1

File tree

21 files changed

+120
-214
lines changed

21 files changed

+120
-214
lines changed

.kitchen.yml

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,41 @@ platforms:
1111
- name: centos-6
1212
driver_config:
1313
box: chef/centos-6.6
14+
run_list:
15+
- recipe[yum]
1416
- name: centos-7
1517
driver_config:
1618
box: chef/centos-7.0
19+
run_list:
20+
- recipe[yum]
1721
- name: ubuntu-12.04
1822
driver_config:
1923
box: chef/ubuntu-12.04
24+
run_list:
25+
- recipe[apt]
2026
- name: ubuntu-14.04
2127
driver_config:
2228
box: chef/ubuntu-14.04
29+
run_list:
30+
- recipe[apt]
31+
32+
default_attributes: &DEFAULT_ATTRIBUTES
33+
java:
34+
install_flavor: oracle
35+
java_home: /usr/lib/jvm/java-7-oracle
36+
jdk_version: 7
37+
oracle:
38+
accept_oracle_download_terms: true
2339

2440
suites:
25-
- name: default
41+
- name: default # mysql
2642
run_list:
27-
- recipe[minitest-handler]
28-
- recipe[stash_test]
29-
attributes: {}
43+
- recipe[test-helper]
44+
- recipe[java]
45+
- recipe[stash]
46+
attributes:
47+
<<: *DEFAULT_ATTRIBUTES
48+
mysql:
49+
server_root_password: iloverandompasswordsbutthiswilldo
50+
server_repl_password: iloverandompasswordsbutthiswilldo
51+
server_debian_password: iloverandompasswordsbutthiswilldo

Berksfile

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,14 @@ source 'https://supermarket.chef.io'
33
metadata
44

55
group :integration do
6-
cookbook 'java'
7-
cookbook 'minitest-handler'
8-
cookbook 'stash_test', :path => 'test/cookbooks/stash_test'
6+
cookbook 'apt'
7+
cookbook 'java',
8+
# Pending release: ark_java fails when tar is not installed
9+
# See: https://github.com/agileorbit-cookbooks/java/issues/263
10+
github: 'agileorbit-cookbooks/java'
11+
cookbook 'test-helper',
12+
# Pending release: Add ohai attribute support (automatic attrs)
13+
# Ref: https://github.com/lipro-cookbooks/test-helper/pull/2
14+
github: 'lipro-cookbooks/test-helper'
15+
cookbook 'yum'
916
end

files/default/tests/minitest/apache2_test.rb

Lines changed: 0 additions & 17 deletions
This file was deleted.

files/default/tests/minitest/configuration_test.rb

Lines changed: 0 additions & 9 deletions
This file was deleted.

files/default/tests/minitest/default_test.rb

Lines changed: 0 additions & 5 deletions
This file was deleted.

files/default/tests/minitest/linux_standalone_test.rb

Lines changed: 0 additions & 13 deletions
This file was deleted.

files/default/tests/minitest/service_init_test.rb

Lines changed: 0 additions & 13 deletions
This file was deleted.

files/default/tests/minitest/support/helpers.rb

Lines changed: 0 additions & 17 deletions
This file was deleted.

test/cookbooks/stash_test/CHANGELOG.md

Lines changed: 0 additions & 16 deletions
This file was deleted.

test/cookbooks/stash_test/README.md

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)