Skip to content

Modified run_tests, added config version #29

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

Open
davidkeymer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Modified run_tests, added config version #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions configs/configurations/config_version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5.1.0.2
6 changes: 6 additions & 0 deletions run_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
import xmlrunner
import argparse

# Import the configurations upgrade tool
sys.path.append( os.path.join("C:\\", "Instrument", "Apps", "EPICS", "misc", "upgrade", "master"))
Copy link
Contributor

@DominicOram DominicOram Dec 20, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you use the EPICS_ROOT environment variable here?

from upgrade import perform_upgrade

SCRIPT_DIRECTORY = os.path.abspath(os.path.join(os.path.dirname(__file__)))
DEFAULT_DIRECTORY = os.path.join(SCRIPT_DIRECTORY, 'test-reports')
Expand Down Expand Up @@ -69,6 +72,9 @@
else:
shutil.copy(file_or_dir_src, dest)
Copy link
Contributor

@DominicOram DominicOram Dec 20, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This ends up copying config_version.txt to machine_name/configurations/configurations it should actually live in machine_name/configurations otherwise the upgrade script won't find it.


print("\n\n------ UPGRADING configurations ------")
perform_upgrade()
Copy link
Contributor

@DominicOram DominicOram Dec 20, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I get an error when this is run of No such file or directory: "src\\schemas\\new_banner.xsd"


print("\n\n------ BEGINNING genie_python SYSTEM TESTS ------")
ret_vals = list()
ret_vals.append(xmlrunner.XMLTestRunner(output=xml_dir).run(test_suite))
Expand Down