check only if dirs are writable if they already exist (i.e. are mounted)

Author: angelo-v

src/checks.sh

@@ -6,20 +6,26 @@ check_failed()
 {
   checks_failed=$((checks_failed + 1))
 }
-check_dir_exists()
+check_if_writable()
 {
+  # checks if the given dir is writable, if it exists
+  # it's ok if the dir does not exist at all, because it will be created
+  # during solid server startup then and have the correct permissions
   dir=$1
-  if [ -f "${dir}" ]; then
-    echo "✓ ${dir} exists"
-  else
-    echo "✗ ${dir} missing"
-    check_failed
+  if [ -d "${dir}" ]; then
+    if [ -w "${dir}" ]; then
+      ls -lah ${dir};
+      echo "✓ ${dir} is accessible by $(whoami)"
+    else
+      echo "✗ ${dir} not writable by $(whoami)"
+      check_failed
+    fi
   fi
 }
 
-check_dir_exists "${SOLID_HOME}/data"
-check_dir_exists "${SOLID_HOME}/.db"
-check_dir_exists "${SOLID_HOME}/config"
+check_if_writable "${SOLID_HOME}/config"
+check_if_writable "${SOLID_HOME}/data"
+check_if_writable "${SOLID_HOME}/.db"
 
 if [ "$checks_failed" -gt 0 ]; then
   echo "Finished: ERROR"

test/test_precondition_checks.py

@@ -32,8 +32,8 @@ def container(client, image):
 def test_container_fails_with_errors(container):
   assert container.status == "created"
   logs = container.logs()
-  assert "✗ /opt/solid/data missing" in logs
-  assert "✗ /opt/solid/.db missing" in logs
-  assert "✗ /opt/solid/config missing" in logs
+  assert "✗ /opt/solid/config not writable by node" in logs
+  assert "✗ /opt/solid/data not writable by node" in logs
+  assert "✗ /opt/solid/.db not writable by node" in logs
   assert "Finished: ERROR" in logs
   assert not "Finished: SUCCESS" in logs

test/test_solid_default_config.py

@@ -64,4 +64,4 @@ def test_solid_is_running(host):
     assert solid.group == "node"
 
 def test_solid_is_listening_on_port_8443(host):
-    assert host.socket("tcp://0.0.0.0:8443").is_listening
+    assert host.socket("tcp://0.0.0.0:8443").is_listening