tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

--graphs-root merged with --root option

Browse Source 
Reviewers: mferencevic, buda

Reviewed By: mferencevic

Differential Revision: https://phabricator.memgraph.io/D365
This commit is contained in:
Matej Gradiček 2017-05-16 08:21:08 +00:00
parent 3e6fa7bd51
commit 2d0fcc82e3
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
run
View File

@ -64,8 +64,7 @@ config_path="${memgraph_src_dir}/config/memgraph.yaml"
# run scenarios # run scenarios
cd ${script_dir} cd ${script_dir}
tck_flags="--root tck_engine/tests/$test_suite tck_flags="--root tck_engine/tests/$test_suite
--graphs-root tck_engine/tests/$test_suite
--no-side-effects --db memgraph" --no-side-effects --db memgraph"
if [[ $unstable = true ]]; then if [[ $unstable = true ]]; then

2
tck_engine/steps/graph.py
View File

@ -35,7 +35,7 @@ def create_graph(name, context):
and sets graph properties to beginning values. and sets graph properties to beginning values.
""" """
clear_graph(context) clear_graph(context)
path = find_graph_path(name, context.config.graphs_root) path = find_graph_path(name, context.config.root)
q_marks = ["'", '"', '`'] q_marks = ["'", '"', '`']

13
tck_engine/test_executor.py
View File

@ -8,10 +8,7 @@ import sys
def parse_args(): def parse_args():
argp = ArgumentParser(description=__doc__) argp = ArgumentParser(description=__doc__)
argp.add_argument("--root", default="tck_engine/tests/openCypher_M05", argp.add_argument("--root", default="tck_engine/tests/openCypher_M05",
help="Path to folder where tests are located, default is openCypher_M05/tck/features.") help="Path to folder where tests are located, default is tck_engine/tests/openCypher_M05")
argp.add_argument(
"--graphs-root", default="tck_engine/tests/openCypher_M05/tck/graphs",
help="Path to folder where files with graphs queries are located, default is openCypher_M05/tck/graphs.")
argp.add_argument( argp.add_argument(
"--stop", action="store_true", help="Stop testing after first fail.") "--stop", action="store_true", help="Stop testing after first fail.")
argp.add_argument("--no-side-effects", action="store_true", argp.add_argument("--no-side-effects", action="store_true",
@ -54,8 +51,6 @@ def main():
add_config("--database-password", dict(help="Database password.")) add_config("--database-password", dict(help="Database password."))
add_config("--database-username", dict(help="Database username.")) add_config("--database-username", dict(help="Database username."))
add_config("--database-uri", dict(help="Database uri.")) add_config("--database-uri", dict(help="Database uri."))
add_config("--graphs-root",
dict(help="Path to folder where graphs are given."))
add_config("--output-folder", dict( add_config("--output-folder", dict(
help="Folder where results of tests are written.")) help="Folder where results of tests are written."))
add_config("--root", dict(help="Folder with test features.")) add_config("--root", dict(help="Folder with test features."))
@ -81,12 +76,10 @@ def main():
behave_options.append(args.db_user) behave_options.append(args.db_user)
behave_options.append("--database-uri") behave_options.append("--database-uri")
behave_options.append(args.db_uri) behave_options.append(args.db_uri)
behave_options.append("--graphs-root")
behave_options.append(args.graphs_root)
behave_options.append("--output-folder")
behave_options.append(args.output_folder)
behave_options.append("--root") behave_options.append("--root")
behave_options.append(args.root) behave_options.append(args.root)
behave_options.append("--output-folder")
behave_options.append(args.output_folder)
# runs tests with options # runs tests with options
return behave_main(behave_options) return behave_main(behave_options)