Commit dbcf7f7f authored by Marc Vef's avatar Marc Vef
Browse files

Merge branch 'rnou/214-gkfs_daemon_log_level-needs-to-be-modified-in-tests' into 'master' 

Resolve "GKFS_DAEMON_LOG_LEVEL needs to be modified in tests"

Closes #214

See merge request !138
parents 0014c3e4 3503aa28

tests/integration/harness/gkfs.py

+2 −2
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ class Daemon: 
            'LD_LIBRARY_PATH'      : libdirs,

            'GKFS_HOSTS_FILE'      : self.cwd / gkfs_hosts_file,

            'GKFS_DAEMON_LOG_PATH' : self.logdir / gkfs_daemon_log_file,

            'GKFS_LOG_LEVEL'       : gkfs_daemon_log_level,

            'GKFS_DAEMON_LOG_LEVEL': gkfs_daemon_log_level,

        }

        self._env.update(self._patched_env)
@@ -717,7 +717,7 @@ class FwdDaemon: 
            'LD_LIBRARY_PATH'      : libdirs,

            'GKFS_HOSTS_FILE'      : self.cwd / gkfwd_hosts_file,

            'GKFS_DAEMON_LOG_PATH' : self.logdir / gkfwd_daemon_log_file,

            'GKFS_LOG_LEVEL'       : gkfwd_daemon_log_level

            'GKFS_DAEMON_LOG_LEVEL': gkfwd_daemon_log_level

        }

        self._env.update(self._patched_env)