Improve ownCloud setup errors checking

zuazo · Sep 24, 2015 · 561cdec · 561cdec
1 parent b3dc45e
commit 561cdec
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -41,6 +41,9 @@ suites:
 - name: postgresql
   run_list: recipe[owncloud_test::postgresql]
 - name: sqlite
+  excludes:
+  # execute[run owncloud setup]: Writing to database failed
+  - centos-5.11
   run_list: recipe[owncloud_test::sqlite]
 - name: nginx
   run_list: recipe[owncloud_test::nginx]
diff --git a/recipes/default.rb b/recipes/default.rb
@@ -423,7 +423,7 @@ def mysql_password(user)
   cwd node['owncloud']['dir']
   command(
     "sudo -u '#{node[web_server]['user']}' php -f index.php "\
-    '| { ! grep -iA2 error; }'
+    '| { ! grep -iA2 -e error -e failed; }'
   )
   action :nothing
 end