tests: adapt to latest ucode

 - Environment must be set before preloading and executing modules
 - Caching of fs module must be inhibited
 - Mocklib class object should be returned

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/run_tests.sh b/run_tests.sh
index 8f0c2938d6b376d76df638d15c8d0167e08f114f..2bdefbd5029cbd09136ca61ba3ab458755afbdf1 100755 (executable)
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -70,12 +70,12 @@ run_testcase() {
        local code=$7
        local fail=0
 
-       ucode -m mocklib -m fw4 ${uenv:+-e "$uenv"} -e '{
+       ucode ${uenv:+-e "$uenv"} -e '{
                "MOCK_SEARCH_PATH": [
                        "'"$dir"'/files",
                        "./tests/mocks"
                ]
-       }' ${env:+-e "$(cat "$env")"} -i - <"$in" >"$dir/res.out" 2>"$dir/res.err"
+       }' ${env:+-e "$(cat "$env")"} -m mocklib -m fw4 -i - <"$in" >"$dir/res.out" 2>"$dir/res.err"
 
        printf "%d\n" $? > "$dir/res.code"
 

diff --git a/tests/lib/mocklib.uc b/tests/lib/mocklib.uc
index db38022c32ab86edd61e57f9baa59e6e3d39e61a..bcbb74054a42458695ea3691b28d6e865c41d0bf 100644 (file)
--- a/tests/lib/mocklib.uc
+++ b/tests/lib/mocklib.uc
@@ -1,6 +1,9 @@
 {%
        let _fs = require("fs");
 
+       /* Force reloading fs module on next require */
+       delete global.modules.fs;
+
        let _log = (level, fmt, ...args) => {
                let color, prefix;
 
@@ -222,3 +225,5 @@
                        global.print(...args);
        };
 
+       return global.mocklib;
+