Skip to content
This repository has been archived by the owner on Dec 31, 2022. It is now read-only.

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
ajgon committed Oct 24, 2016
1 parent 86c20b7 commit 96841a9
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 69 deletions.
2 changes: 1 addition & 1 deletion .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ suites:
# no attributes at all, to prove that cookbook can work "out of the box"
attributes:
- name: all_options
data_bags_path: "test/integration/data_bags/all_options"
data_bags_path: "test/integration/data_bags/default"
run_list:
- recipe[opsworks_ruby::setup]
- recipe[opsworks_ruby::provision]
Expand Down
8 changes: 6 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
---
sudo: required
services: docker
services:
- docker
- postgresql

rvm:
- 'ruby-2.3.1'
Expand All @@ -18,7 +20,9 @@ env:
- INSTANCE=default-ubuntu-1404
- INSTANCE=all-options-ubuntu-1404

before_install: "gem install bundler"
before_install:
- gem install bundler

install:
- pip install --user yamllint
- chef exec bundle install --jobs=5 --retry=5
Expand Down
1 change: 0 additions & 1 deletion libraries/drivers_db_sqlite.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ class Sqlite < Base
adapter :sqlite3
allowed_engines :sqlite, :sqlite3
packages debian: 'libsqlite3-dev', rhel: 'sqlite-devel'
output filter: [:adapter, :database, :pool, :timeout]

def out
output = super
Expand Down
8 changes: 0 additions & 8 deletions recipes/provision.rb
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
# frozen_string_literal: true
# Used for tests, don't touch!

package 'postgresql' do
action :install
end

execute 'createuser -s deploy' do
user 'postgres'
end

file '/etc/monit/conf.d/00_httpd.monitrc' do
content "set httpd port 2812 and\n use address localhost\n allow localhost"
end
4 changes: 2 additions & 2 deletions test/integration/all_options/serverspec/all_options_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
it { should be_installed }
end

describe package('libpq-dev') do
describe package('libsqlite3-dev') do
it { should be_installed }
end

Expand Down Expand Up @@ -94,7 +94,7 @@

context 'framework' do
describe file('/srv/www/dummy_project/current/config/database.yml') do
its(:content) { should include 'adapter: postgresql' }
its(:content) { should include 'adapter: sqlite3' }
its(:content) { should include 'reaping_frequency: 10' }
end
end
Expand Down

This file was deleted.

This file was deleted.

0 comments on commit 96841a9

Please sign in to comment.