Skip to content

Commit

Permalink
Another attempt on fixing the packaging pipeline (#1528)
Browse files Browse the repository at this point in the history
Some packages require pycue to run their unit tests and this requirement
wasn't being installed on the dockerfile.

A `test_suite.py` file was added with the rules for test discover to
make sure all unit tests are executed on projects that are built with
python3.9.
  • Loading branch information
DiegoTavares authored Oct 2, 2024
1 parent c2904f2 commit d60caff
Show file tree
Hide file tree
Showing 6 changed files with 85 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cueadmin/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ COPY VERSION.in VERSIO[N] ./
RUN test -e VERSION || echo "$(cat VERSION.in)" | tee VERSION

RUN cd pycue && python3 -m pip install .
RUN cd pycue && python3 -m unittest tests/*.py
RUN cd cueadmin && python3 tests/test_suite.py

RUN cp LICENSE requirements.txt VERSION cueadmin/

Expand Down
27 changes: 27 additions & 0 deletions cueadmin/tests/test_suite.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Copyright Contributors to the OpenCue Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# pylint: disable=missing-function-docstring,missing-module-docstring

import unittest

def create_test_suite():
loader = unittest.TestLoader()
start_dir = '.' # Specify the directory where your test files reside
suite = loader.discover(start_dir, pattern='*_tests.py')
return suite

if __name__ == '__main__':
runner = unittest.TextTestRunner()
test_suite = create_test_suite()
runner.run(test_suite)
2 changes: 1 addition & 1 deletion pycue/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ COPY VERSION.in VERSIO[N] ./
RUN test -e VERSION || echo "$(cat VERSION.in)" | tee VERSION

RUN cd pycue && python3 -m pip install .
RUN cd pycue && python3 -m unittest tests/*.py
RUN cd pycue && python3 tests/test_suite.py

RUN cp LICENSE requirements.txt VERSION pycue/

Expand Down
27 changes: 27 additions & 0 deletions pycue/tests/test_suite.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Copyright Contributors to the OpenCue Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# pylint: disable=missing-function-docstring,missing-module-docstring

import unittest

def create_test_suite():
loader = unittest.TestLoader()
start_dir = '.' # Specify the directory where your test files reside
suite = loader.discover(start_dir, pattern='*_test.py')
return suite

if __name__ == '__main__':
runner = unittest.TextTestRunner()
test_suite = create_test_suite()
runner.run(test_suite)
3 changes: 2 additions & 1 deletion pyoutline/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@ COPY pyoutline/outline ./pyoutline/outline
COPY VERSION.in VERSIO[N] ./
RUN test -e VERSION || echo "$(cat VERSION.in)" | tee VERSION

# Install pycue as pyoutline depends on it to run tests
RUN cd pycue && python3 -m pip install .
RUN cd pycue && python3 -m unittest tests/*.py
RUN cd pyoutline && python3 tests/test_suite.py

RUN cp LICENSE requirements.txt VERSION pyoutline/

Expand Down
27 changes: 27 additions & 0 deletions pyoutline/tests/test_suite.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Copyright Contributors to the OpenCue Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# pylint: disable=missing-function-docstring,missing-module-docstring

import unittest

def create_test_suite():
loader = unittest.TestLoader()
start_dir = '.' # Specify the directory where your test files reside
suite = loader.discover(start_dir, pattern='*_test.py')
return suite

if __name__ == '__main__':
runner = unittest.TextTestRunner()
test_suite = create_test_suite()
runner.run(test_suite)

0 comments on commit d60caff

Please sign in to comment.