From 7175929cab984e070d15eb13625ab50459edf9ca Mon Sep 17 00:00:00 2001 From: Dave Page Date: Mon, 26 Sep 2016 16:38:27 +0100 Subject: [PATCH] Ensure that the directory paths are as they should be under the runtime. Note that this change requires (for now) the regression tests to be run from the web/regression directory. --- web/regression/README | 11 +++++++---- web/setup.py | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/web/regression/README b/web/regression/README index 203f77174..8cc299873 100644 --- a/web/regression/README +++ b/web/regression/README @@ -108,14 +108,17 @@ Execution: and registered automatically by its module name in 'pgadmin4/web/pgadmin/utils/test.py' file. +- Change to the regression test directory: + run 'cd web/regression' + - Execute the test framework for all nodes - run 'regression/runtests.py --pkg all' or just: - 'regression/runtests.py' + run 'python runtests.py --pkg all' or just: + 'python runtests.py' - Execute test framework for single node at a time Example 1) Run test framework for 'browser' node - run 'regression/runtests.py --pkg browser' + run 'python runtests.py --pkg browser' Example 2) Run test framework for 'database' node - run 'regression/runtests.py --pkg browser.server_groups.servers.databases' + run 'python runtests.py --pkg browser.server_groups.servers.databases' diff --git a/web/setup.py b/web/setup.py index 1abe3670d..64273fb18 100755 --- a/web/setup.py +++ b/web/setup.py @@ -360,7 +360,7 @@ if __name__ == '__main__': print("======================================\n") local_config = os.path.join( - os.path.dirname(os.path.dirname(__file__)), + os.path.dirname(os.path.realpath(__file__)), 'config_local.py' )