Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use pathlib in lshca_regression #99

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Use pathlib in lshca_regression #99

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b0fd51
Use pathlib in lshca_regression
amaslenn Sep 19, 2023
7b3b9b7
Remove condition which is always false
amaslenn Sep 19, 2023
8d2fb78
Restore --data-source functionality and running from regression/ folder
amaslenn Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 33 additions & 51 deletions regression/lshca_regression.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import difflib
import hashlib
import os
from pathlib import Path
import pickle
import re
import shutil
Expand Down Expand Up @@ -152,7 +153,6 @@ def regression():
curr - current data
'''))
parser.add_argument('--display-recorded-fields', action='store_true', help="Display ONLY originaly recorded fields. Overwrites -p")
parser.add_argument('--data-source', nargs="+", help="Select single data souce from recorded_data directory")
MrBr-github marked this conversation as resolved.
Show resolved Hide resolved
parser.add_argument('-p', dest="parameters", nargs=argparse.REMAINDER,
help=textwrap.dedent('''\
override saved parameters and pass new ones
Expand All @@ -167,24 +167,7 @@ def regression():
cust_user_args.append(member)
args = parser.parse_args(cust_user_args)

rec_data_dir_path = os.path.dirname(os.path.abspath(__file__)) + "/../recorded_data/"
if args.data_source:
if os.path.isfile(rec_data_dir_path + str(args.data_source[0])):
recorded_data_files_list = [str(args.data_source[0])]
else:
print("No such data source \"" + str(args.data_source[0]) + "\"")
sys.exit(1)
else:
file_list = os.listdir(rec_data_dir_path)
if sys.version_info.major == 3:
p3_only_files = os.listdir(os.path.join(rec_data_dir_path, "py3-only"))
p3_only_files = [ os.path.join("py3-only", f) for f in p3_only_files ]
file_list.extend(p3_only_files)

recorded_data_files_list = []
for file in file_list:
if file.endswith('.tar'):
recorded_data_files_list.append(file)
recorded_data_files_list = load_case_files()

if not recorded_data_files_list:
print("WARNING: no test cases ran")
Expand All @@ -193,45 +176,37 @@ def regression():
tmp_dir_name = tempfile.mkdtemp(prefix="lshca_regression_")
regression_run_succseeded = True
for full_recorded_data_file in recorded_data_files_list:
if not os.path.isfile(rec_data_dir_path + full_recorded_data_file):
continue

recorded_data_file = full_recorded_data_file.split('/')[-1]
recorded_data_file_prefix = full_recorded_data_file.replace(recorded_data_file, '')
shutil.copyfile(
os.path.join(rec_data_dir_path, recorded_data_file_prefix, recorded_data_file),
os.path.join(tmp_dir_name, recorded_data_file)
)
untared_data_source_dir = tmp_dir_name + "/" + recorded_data_file.replace(".tar", "")
os.mkdir(untared_data_source_dir)
str(full_recorded_data_file),
str(Path(tmp_dir_name) / full_recorded_data_file.name)
)
untared_data_source_dir = Path(tmp_dir_name) / full_recorded_data_file.stem
untared_data_source_dir.mkdir()

tar = tarfile.open(tmp_dir_name + "/" + recorded_data_file)
tar.extractall(path=untared_data_source_dir)
tar = tarfile.open(str(Path(tmp_dir_name) / full_recorded_data_file.name))
tar.extractall(path=str(untared_data_source_dir))
MrBr-github marked this conversation as resolved.
Show resolved Hide resolved

if args.parameters:
recorded_sys_args = args.parameters[0].split(" ")
recorded_sys_args.insert(0, "lshca_run_by_regression")
else:
f = open(untared_data_source_dir + "/cmd", "rb")
try:
recorded_sys_args = pickle.load(f)
recorded_sys_args = pickle.loads((untared_data_source_dir / "cmd").read_bytes())
except ValueError as e:
print("\nFailed unpickling %s \n\n" % str(recorded_data_file))
print("\nFailed unpickling %s \n\n" % str(full_recorded_data_file.name))
raise e

recorded_sys_args = recorded_sys_args.split(" ")
if args.display_recorded_fields:
try:
f = open(untared_data_source_dir + "/output_fields", "rb")
recorded_output_fields = pickle.load(f)
recorded_output_fields = pickle.loads((untared_data_source_dir / "output_fields").read_bytes())
except:
print(BColors.FAIL + "Error: No output fileds saved in " + recorded_data_file + BColors.ENDC )
print(BColors.FAIL + "Error: No output fileds saved in " + full_recorded_data_file.name + BColors.ENDC )
sys.exit(1)
recorded_sys_args.append("-o")
recorded_sys_args.append(",".join(recorded_output_fields))

f = open(untared_data_source_dir + "/environment", "rb")
tmp = pickle.load(f)
tmp = pickle.loads((untared_data_source_dir / "environment").read_bytes())
for item in tmp:
if 'LSHCA:' in item:
recorded_lshca_version = item.split(" ")[1]
Expand All @@ -244,7 +219,7 @@ def regression():
regression_conf = RegressionConfig()
regression_conf.skip_missing = args.skip_missing
regression_conf.recorded_lshca_version = recorded_lshca_version
main(untared_data_source_dir, recorded_sys_args, regression_conf)
main(str(untared_data_source_dir), recorded_sys_args, regression_conf)
except Exception as e:
lshca_output = StringIO(str(e))
finally:
Expand All @@ -256,8 +231,8 @@ def regression():
print("Command: " + " ".join(recorded_sys_args))
print('**************************************************************************************')

saved_output = load_saved_output(recorded_data_file, untared_data_source_dir)
saved_errors = load_saved_errors(recorded_data_file, untared_data_source_dir)
saved_output = load_saved_output(untared_data_source_dir)
saved_errors = load_saved_errors(untared_data_source_dir)

print(regression_conf.output_separator_char)
test_errors = lshca_errors.getvalue()
Expand All @@ -277,27 +252,34 @@ def regression():
if not regression_run_succseeded:
sys.exit(1)

def load_saved_errors(recorded_data_file, untared_data_source_dir):
def load_case_files():
rec_data_dir_path = Path("recorded_data/")
amaslenn marked this conversation as resolved.
Show resolved Hide resolved
recorded_data_files_list = [p for p in rec_data_dir_path.glob('*.tar')]
if sys.version_info.major == 3:
recorded_data_files_list.extend([p for p in (rec_data_dir_path / "py3-only").glob('*.tar')])
return recorded_data_files_list

def load_saved_errors(untared_data_source_dir):
amaslenn marked this conversation as resolved.
Show resolved Hide resolved
# recording of errors started from version 3.9
# this comes to handle recordings with missing errors
saved_errors = None
if os.path.exists(untared_data_source_dir + "/errors"):
err = untared_data_source_dir / "errors"
if err.exists():
try:
f = open(untared_data_source_dir + "/errors", "rb")
saved_errors = pickle.load(f)
saved_errors = pickle.loads(err.read_bytes())
except ValueError as e:
print("\nFailed unpickling %s \n\n" % str(recorded_data_file))
print("\nFailed unpickling %s \n\n" % str(err))
raise e
else:
print("{}Warring{}: Missing recorded errors".format(BColors.WARNING, BColors.ENDC))
return saved_errors

def load_saved_output(recorded_data_file, untared_data_source_dir):
def load_saved_output(untared_data_source_dir):
out = untared_data_source_dir / "output"
try:
f = open(untared_data_source_dir + "/output", "rb")
saved_output = pickle.load(f)
saved_output = pickle.loads(out.read_bytes())
MrBr-github marked this conversation as resolved.
Show resolved Hide resolved
except ValueError as e:
print("\nFailed unpickling %s \n\n" % str(recorded_data_file))
print("\nFailed unpickling %s \n\n" % str(out))
amaslenn marked this conversation as resolved.
Show resolved Hide resolved
raise e
return saved_output

Expand Down
Loading