Skip to content

Commit

Permalink
test(manual): update test, clean link
Browse files Browse the repository at this point in the history
* don't try to stop non-existing service
  • Loading branch information
rbjorklin committed Mar 30, 2019
1 parent b7b0d1d commit 1f533d3
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ suites:
- vault
vault.sls:
vault:
# version: 1.0.3 # test upgrades by doing a double-converge, changing the version pillar between each one
version: 1.1.0
# version: 1.1.0 # test upgrades by doing a double-converge, changing the version pillar between each one
version: 1.0.3
verify_download: False

- name: dev_server
Expand Down
2 changes: 1 addition & 1 deletion test/integration/install_binary/vault_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
describe command('/usr/local/bin/vault -version') do
its(:exit_status) { should eq 0 }
its(:stderr) { should be_empty }
its(:stdout) { should match(/^Vault v0.11.2 \('2b1a4304374712953ff606c6a925bbe90a4e85dd'\)/) }
its(:stdout) { should match(/^Vault v1.0.3 \('85909e3373aa743c34a6a0ab59131f61fd9e8e43'\)/) }
end

describe service('vault') do
Expand Down
4 changes: 4 additions & 0 deletions vault/package/clean.sls
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ vault-package-clean-file-absent-data:
file.absent:
- name: /var/lib/vault

vault-package-clean-file-absent-link:
file.absent:
- name: /usr/local/bin/vault

vault-package-clean-user-absent:
user.absent:
- name: vault
Expand Down
1 change: 1 addition & 0 deletions vault/package/install.sls
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ vault-package-install-service-dead:
- name: vault
- onchanges:
- file: vault-package-install-file-managed
- onlyif: test -f /etc/systemd/system/vault.service

vault-package-install-archive-extracted:
archive.extracted:
Expand Down
2 changes: 1 addition & 1 deletion vault/service/init.sls
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ vault-service-init-file-managed:
vault-service-init-service-running:
service.running:
- name: vault
- enable: true
- enable: True
- watch:
- archive: vault-package-install-archive-extracted
- file: vault-service-init-file-managed

0 comments on commit 1f533d3

Please sign in to comment.