From 58d9f5c0b3172809f7981e5ac78fcefa5d5ca8ee Mon Sep 17 00:00:00 2001 From: Frode Austvik Date: Sat, 14 Apr 2018 20:37:29 +0200 Subject: [PATCH] [fix, spec] Stop the kobo_touch_probe test from causing problems for other tests. (#3877) Previously, it caused problems because it was overriding G_reader_settings, which caused the Translator test to fail on the second (but not first) run. --- tools/kobo_touch_probe.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/kobo_touch_probe.lua b/tools/kobo_touch_probe.lua index 71aa2ad8c..7e2cf6759 100755 --- a/tools/kobo_touch_probe.lua +++ b/tools/kobo_touch_probe.lua @@ -9,10 +9,13 @@ local DataStorage = require("datastorage") local _ = require("gettext") -- read settings and check for language override +-- but don't re-read if already done, to avoid causing problems for unit tests -- has to be done before requiring other files because -- they might call gettext on load -G_reader_settings = require("luasettings"):open( - DataStorage:getDataDir().."/settings.reader.lua") +if G_reader_settings == nil then + G_reader_settings = require("luasettings"):open( + DataStorage:getDataDir().."/settings.reader.lua") +end local lang_locale = G_reader_settings:readSetting("language") if lang_locale then _.changeLang(lang_locale)