diff --git a/.kitchen.yml b/.kitchen.yml index 585087f..faf5e87 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -7,13 +7,17 @@ provisioner: require_chef_omnibus: 11.14 platforms: - - name: ubuntu-14.04 - name: centos-6.6 - name: centos-7.0 driver: network: - ["forwarded_port", {guest: 4444, host: 4444}] - ["forwarded_port", {guest: 5555, host: 5555}] + - name: ubuntu-14.04 + driver: + network: + - ["forwarded_port", {guest: 4444, host: 4445}] + - ["forwarded_port", {guest: 5555, host: 5556}] suites: - name: selenium_test diff --git a/CHANGELOG.md b/CHANGELOG.md index a396336..8c7c0e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 2.3.3 - 6/9/2015 + +- Fix #13 org.openqa.selenium.WebDriverException: chrome not reachable on CentOS 7.0/Ubuntu 14.04 + ## 2.3.2 - 6/4/2015 - Update Selenium and IE driver from 2.45.0 to 2.46.0 diff --git a/metadata.rb b/metadata.rb index 3d74c44..968d9dd 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license 'MIT' description 'Installs/Configures Selenium' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '2.3.2' +version '2.3.3' supports 'centos' supports 'redhat' diff --git a/templates/default/debian_initd.erb b/templates/default/debian_initd.erb index 0db432c..f1ae8f0 100644 --- a/templates/default/debian_initd.erb +++ b/templates/default/debian_initd.erb @@ -11,6 +11,7 @@ set -e +user=<%=@user%> exec=<%=@exec%> args="<%=@args%>" pidfile="/var/run/<%=@name%>.pid" @@ -38,9 +39,12 @@ fi if [ "$1" = "start" -o "$1" = "restart" ]; then if [ ! -f "$pidfile" ]; then - export DISPLAY=$display - nohup $exec $args >> $logfile 2>&1 & - PID=$! - echo $PID > $pidfile + touch $pidfile + chown $user $pidfile + + touch $logfile + chown $user $logfile + + /bin/su - $user -c "DISPLAY=\"$display\" nohup $exec $args >> $logfile 2>&1 & echo \$! > $pidfile" fi fi