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.

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

Rqd multiple os #1566

Merged
Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
deef8d0
Add runDocker mode to rqd
DiegoTavares Oct 16, 2024
e4fc361
Merge branch 'master' into rqd_containerized_frame
DiegoTavares Oct 16, 2024
5ab915b
[cuegui] Fix TypeError in Comment viewer: Handle job object as iterab…
ramonfigueiredo Oct 17, 2024
170f170
[cuegui] Add Rocky 9 log root in cuegui.yaml (#1543)
ramonfigueiredo Oct 17, 2024
e56b145
Run rqd as root for docker mode
DiegoTavares Oct 17, 2024
a2283f4
Fix logging for deleteFrame
DiegoTavares Oct 18, 2024
90fce59
Update jobspec on dispatch test description
DiegoTavares Oct 18, 2024
8563f09
Allow multiple OSs on a dockerized rqd
DiegoTavares Oct 18, 2024
8a3da0b
Merge branch 'containerized_rqd' into rqd_multiple_os
DiegoTavares Oct 18, 2024
0867bd1
Minor fixes
DiegoTavares Oct 21, 2024
149b1e2
[tests] Change tests to not use setup.py, but use the unittest module…
lithorus Oct 22, 2024
3f62ded
Get the correct OS for procs
DiegoTavares Oct 22, 2024
f7244dd
[rqd] Avoid changing dict in place during iteration (#1554)
DiegoTavares Oct 24, 2024
c4547a0
Handle frame user on container
DiegoTavares Oct 24, 2024
ad0a3de
Simplify docker entrypoint cmd
DiegoTavares Oct 24, 2024
6778b9a
Add script for converting imports in grpc python modules and remove 2…
lithorus Oct 25, 2024
eb0962c
Stop logging exception for numby import
DiegoTavares Oct 25, 2024
1b637d1
Add unit tests for runOnDocker
DiegoTavares Oct 25, 2024
e25b56c
[cuegui] Fix multiple jobs and frames visualization (#1559)
ramonfigueiredo Oct 28, 2024
ebb4438
[cuegui] Fix TypeError in Comment viewer: Handle job object as iterab…
ramonfigueiredo Oct 17, 2024
98e5506
[cuegui] Add Rocky 9 log root in cuegui.yaml (#1543)
ramonfigueiredo Oct 17, 2024
fb3dcd6
[tests] Change tests to not use setup.py, but use the unittest module…
lithorus Oct 22, 2024
ebe966b
Rqd tests were not being executed
DiegoTavares Oct 26, 2024
be436e0
[rqd] Avoid changing dict in place during iteration (#1554)
DiegoTavares Oct 24, 2024
c8a9c2b
Add script for converting imports in grpc python modules and remove 2…
lithorus Oct 25, 2024
3b1d6b5
Fix pytest path
DiegoTavares Oct 26, 2024
0100ad6
Fix issue on rqmachine tests
DiegoTavares Oct 28, 2024
08a2625
Fix unit tests for rqcore and rqconstants
DiegoTavares Oct 28, 2024
8d7c0a2
Add runDocker mode to rqd
DiegoTavares Oct 16, 2024
e113df4
[EXPERIMENT] Rqd containerized frame (#1546)
DiegoTavares Oct 17, 2024
a292228
[EXPERIMENT] Rqd containerized frame (#1546)
DiegoTavares Oct 17, 2024
2933075
Add unit tests for runOnDocker
DiegoTavares Oct 25, 2024
f0ed725
Merge branch 'master' into rqd_multiple_os
DiegoTavares Oct 29, 2024
5345a52
Fix python lint
DiegoTavares Oct 29, 2024
80c1720
Fix lint
DiegoTavares Oct 29, 2024
21242b9
Fix lint issues
DiegoTavares Oct 29, 2024
88b8892
Fix migration
DiegoTavares Oct 29, 2024
8eba834
Remove undesired file
DiegoTavares Oct 29, 2024
a92fca4
[cuegui] Fix FrameContextMenu and test_rightClickItem to handle NoneT…
ramonfigueiredo Oct 29, 2024
2cf7f23
Make sure users are created with passwords
DiegoTavares Oct 29, 2024
73778ba
Merge branch 'AcademySoftwareFoundation:master' into rqd_multiple_os
DiegoTavares Oct 29, 2024
4c237ac
Merge branch 'containerized_rqd' into rqd_multiple_os
DiegoTavares Oct 30, 2024
4ed1ef6
Fix typo on dispatchQuery
DiegoTavares Oct 30, 2024
5d39b26
[rqd] Fix `keys` not iterable since it's a built-in function. (#1564)
lithorus Oct 31, 2024
a35d19a
Handle some possibly None variables
DiegoTavares Oct 31, 2024
69ab7e1
Merge branch 'master' into rqd_multiple_os
DiegoTavares Oct 31, 2024
050af9f
Merge branch 'containerized_rqd' into rqd_multiple_os
DiegoTavares Oct 31, 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
Prev Previous commit
Next Next commit
[tests] Change tests to not use setup.py, but use the unittest module…
… directly (#1547)

**Summarize your change.**
Have changed most tests to use `-m unittest discover` instead og
`setup.py test`

The old `setup.py test` doesn't work in newer versions of python since
it has been deprecated
lithorus authored Oct 22, 2024
commit 149b1e246bc023d30d92d4aa68b3a50afc415c6c
2 changes: 1 addition & 1 deletion ci/run_gui_test.sh
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ fi
echo "Using Python binary ${py}"

test_log="/tmp/cuegui_result.log"
PYTHONPATH=pycue xvfb-run -d "${py}" cuegui/setup.py test | tee ${test_log}
PYTHONPATH=pycue xvfb-run -d "${py}" -m unittest discover -s cuegui/tests -t cuegui -p "*.py"| tee ${test_log}

grep -Pz 'Ran \d+ tests in [0-9\.]+s\n\nOK' ${test_log}
if [ $? -eq 0 ]; then
11 changes: 6 additions & 5 deletions ci/run_python_tests.sh
Original file line number Diff line number Diff line change
@@ -22,11 +22,12 @@ python -m grpc_tools.protoc -I=proto/ --python_out=rqd/rqd/compiled_proto --grpc
2to3 -wn -f import pycue/opencue/compiled_proto/*_pb2*.py
2to3 -wn -f import rqd/rqd/compiled_proto/*_pb2*.py

python pycue/setup.py test
PYTHONPATH=pycue python pyoutline/setup.py test
PYTHONPATH=pycue python cueadmin/setup.py test
PYTHONPATH=pycue:pyoutline python cuesubmit/setup.py test
python rqd/setup.py test
python3 -m unittest discover -s pycue/tests -t pycue -p "*.py"
PYTHONPATH=pycue python3 -m unittest discover -s pyoutline/tests -t pyoutline -p "*.py"
PYTHONPATH=pycue python3 -m unittest discover -s cueadmin/tests -t cueadmin -p "*.py"
PYTHONPATH=pycue:pyoutline python3 -m unittest discover -s cuesubmit/tests -t cuesubmit -p "*.py"
python3 -m unittest discover -s rqd/tests -t rqd -p "*.py"


# Xvfb no longer supports Python 2.
if [[ "$python_version" =~ "Python 3" && ${args[0]} != "--no-gui" ]]; then