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

Make sure test runner does not import itself #1795

Merged
merged 2 commits into from
Oct 29, 2021
+2 −2
Merged

Make sure test runner does not import itself #1795

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce98d20
Make sure test runner does not import itself
JGamache-autodesk Oct 29, 2021
6565804
Apply same fix on test scripts and commands.
JGamache-autodesk Oct 29, 2021
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
4 changes: 2 additions & 2 deletions cmake/test.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ except Exception:\\n\
\")")
set(COMMAND_CALL ${MAYA_EXECUTABLE} -c ${MEL_PY_EXEC_COMMAND})
else()
set(SCRIPT ${CMAKE_BINARY_DIR}/test/Temporary/scripts/${test_name}.py)
set(SCRIPT ${CMAKE_BINARY_DIR}/test/Temporary/scripts/runner_${test_name}.py)
FILE(WRITE ${SCRIPT} "${PREFIX_PYTHON_SCRIPT}")
set(COMMAND_CALL ${MAYA_PY_EXECUTABLE} ${SCRIPT})
endif()
Expand All @@ -170,7 +170,7 @@ finally:
)
endif()

set(SCRIPT ${CMAKE_BINARY_DIR}/test/Temporary/scripts/${test_name}.py)
set(SCRIPT ${CMAKE_BINARY_DIR}/test/Temporary/scripts/runner_${test_name}.py)
Copy link
Collaborator

Choose a reason for hiding this comment

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

@boudrey Should we also make this fix on line 149?

Copy link
Contributor

Choose a reason for hiding this comment

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

That would be a good idea to keep it similar.

Copy link
Collaborator

Choose a reason for hiding this comment

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

@JGamache-autodesk Can you please fix line 149 as well. Thanks.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This will have no effect because there is no module import in that branch. I can do it for the sake of keeping these two paths similar.

FILE(WRITE ${SCRIPT} "${PYTEST_CODE}")
set(COMMAND_CALL ${MAYA_PY_EXECUTABLE} ${SCRIPT})
endif()
Expand Down