diff --git a/.kitchen.yml b/.kitchen.yml index 654dbaf..f0c16b9 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -38,20 +38,8 @@ platforms: suites: - name: mysql run_list: recipe[owncloud_test::mysql] -- name: mysqlport - run_list: recipe[owncloud_test::mysql] - attributes: - owncloud: - config: - dbport: 4321 - name: postgresql run_list: recipe[owncloud_test::postgresql] -- name: postgresqlport - run_list: recipe[owncloud_test::postgresql] - attributes: - owncloud: - config: - dbport: 4321 - name: sqlite run_list: recipe[owncloud_test::sqlite] - name: nginx diff --git a/test/integration/mysqlport/bats/cron.bats b/test/integration/mysqlport/bats/cron.bats deleted file mode 100644 index d993eda..0000000 --- a/test/integration/mysqlport/bats/cron.bats +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bats - -@test "owncloud cron should be enabled" { - if id www-data >/dev/null 2>&1 - then - APACHE_USER='www-data' - else - APACHE_USER='apache' - fi - crontab -l -u "${APACHE_USER}" | grep -q "php -f '.*/owncloud/cron.php'" -} diff --git a/test/integration/mysqlport/bats/default.bats b/test/integration/mysqlport/bats/default.bats deleted file mode 100644 index 0ecc340..0000000 --- a/test/integration/mysqlport/bats/default.bats +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bats - -@test "database should be created" { - echo "show databases" | mysql -uroot -h 127.0.0.1 -P 4321 -pvagrant_root | grep -q "^owncloud$" -} - -@test "owncloud should be installed" { - wget -qO- 'localhost/status.php' | grep -qE '"installed":"?true"?' -} - -@test "ssl should be enabled" { - wget --no-check-certificate -qO- 'https://localhost' -} - -@test "admin user should be created" { - wget -qO- 'http://test:test@localhost/ocs/v1.php/privatedata/getattribute' | grep -qF 'ok' -} diff --git a/test/integration/mysqlport/bats/mail.bats b/test/integration/mysqlport/bats/mail.bats deleted file mode 100644 index 14d75c0..0000000 --- a/test/integration/mysqlport/bats/mail.bats +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bats - -@test "owncloud should be able to send emails" { - wget -qO/dev/null 'http://localhost/emailtest.php' - sleep 1 - if [ -f '/var/spool/mail/root' ] - then - MAIL_FILE='/var/spool/mail/root' - else - MAIL_FILE='/var/spool/mail/vagrant' - fi - grep -qF 'kitchen-test@' "${MAIL_FILE}" -} diff --git a/test/integration/postgresqlport/bats/cron.bats b/test/integration/postgresqlport/bats/cron.bats deleted file mode 100644 index d993eda..0000000 --- a/test/integration/postgresqlport/bats/cron.bats +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bats - -@test "owncloud cron should be enabled" { - if id www-data >/dev/null 2>&1 - then - APACHE_USER='www-data' - else - APACHE_USER='apache' - fi - crontab -l -u "${APACHE_USER}" | grep -q "php -f '.*/owncloud/cron.php'" -} diff --git a/test/integration/postgresqlport/bats/default.bats b/test/integration/postgresqlport/bats/default.bats deleted file mode 100644 index e0e4c11..0000000 --- a/test/integration/postgresqlport/bats/default.bats +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bats - -@test "database should be created" { - su -c "psql -p 4321 -qlt" postgres | cut -d\| -f1 | grep -q '^ *owncloud *$' -} - -@test "owncloud should be installed" { - wget -qO- 'localhost/status.php' | grep -qE '"installed":"?true"?' -} - -@test "ssl should be enabled" { - wget --no-check-certificate -qO- 'https://localhost' -} - -@test "admin user should be created" { - wget -qO- 'http://test:test@localhost/ocs/v1.php/privatedata/getattribute' | grep -qF 'ok' -} diff --git a/test/integration/postgresqlport/bats/mail.bats b/test/integration/postgresqlport/bats/mail.bats deleted file mode 100644 index 14d75c0..0000000 --- a/test/integration/postgresqlport/bats/mail.bats +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bats - -@test "owncloud should be able to send emails" { - wget -qO/dev/null 'http://localhost/emailtest.php' - sleep 1 - if [ -f '/var/spool/mail/root' ] - then - MAIL_FILE='/var/spool/mail/root' - else - MAIL_FILE='/var/spool/mail/vagrant' - fi - grep -qF 'kitchen-test@' "${MAIL_FILE}" -}