[med-svn] [Git][med-team/odil][master] Remove network-related unit tests
Julien Lamy (@lamy-guest)
gitlab at salsa.debian.org
Thu Dec 16 14:27:52 GMT 2021
Julien Lamy pushed to branch master at Debian Med / odil
Commits:
16f4c127 by Julien Lamy at 2021-12-16T15:27:28+01:00
Remove network-related unit tests
- - - - -
3 changed files:
- debian/changelog
- + debian/patches/remove-network-unit-tests.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+odil (0.12.1-3) UNRELEASED; urgency=medium
+
+ * Closes: #1001614
+
+ -- Julien Lamy <lamy at unistra.fr> Thu, 16 Dec 2021 11:54:07 +0100
+
odil (0.12.1-2) unstable; urgency=medium
[ Andreas Tille ]
=====================================
debian/patches/remove-network-unit-tests.patch
=====================================
@@ -0,0 +1,179 @@
+Index: odil/.ci/deb/post_build
+===================================================================
+--- odil.orig/.ci/deb/post_build
++++ odil/.ci/deb/post_build
+@@ -17,22 +17,23 @@ export ODIL_PEER_PORT=11112
+ export ODIL_PEER_AET=REMOTE
+ export PATH=${WORKSPACE}/tests/tools:${PATH}
+
+-cd "${WORKSPACE}/tests/data"
+-dcmqridx ./ dataset.dcm
+-dcmqrscp -ll error -c dcmqrscp.config 11112 &
+-sleep 1
++#cd "${WORKSPACE}/tests/data"
++#dcmqridx ./ dataset.dcm
++#dcmqrscp -ll error -c dcmqrscp.config 11112 &
++#sleep 1
+
+ cd "${BUILD_DIR}"
+
+-ctest --output-on-failure
++ctest --output-on-failure \
++ -E '^(Association_Associate|(Echo|Find|Get|Move|NCreate|Store|)SC|Transport)'
+ R1=$?
+
+ ${PYTHON} -m unittest discover -s ${WORKSPACE}/tests/wrappers/
+ R2=$?
+
+-kill %1
+-cd "${WORKSPACE}/tests/data"
+-rm -f index.dat RAW_*.dcm
++#kill %1
++#cd "${WORKSPACE}/tests/data"
++#rm -f index.dat RAW_*.dcm
+
+ RETURNCODE=$(if test ${R2} -gt ${R1}; then echo ${R2} ; else echo ${R1}; fi)
+ exit ${RETURNCODE}
+Index: odil/tests/wrappers/test_echo_scp.py
+===================================================================
+--- odil.orig/tests/wrappers/test_echo_scp.py
++++ odil/tests/wrappers/test_echo_scp.py
+@@ -9,7 +9,7 @@ if sys.platform == "darwin" and multipro
+
+ import odil
+
+-class TestEchoSCP(unittest.TestCase):
++class TestEchoSCP(object):
+ def test_echo_scp_release(self):
+ process = multiprocessing.Process(target=lambda: self.run_server(False))
+ process.start()
+Index: odil/tests/wrappers/test_echo_scu.py
+===================================================================
+--- odil.orig/tests/wrappers/test_echo_scu.py
++++ odil/tests/wrappers/test_echo_scu.py
+@@ -7,7 +7,7 @@ import odil
+ sys.path.append(os.path.dirname(os.path.dirname(__file__)))
+ from peer_fixture_base import PeerFixtureBase
+
+-class TestEchoSCU(PeerFixtureBase):
++class TestEchoSCU(object):
+ def setUp(self):
+ PeerFixtureBase.setUp(
+ self,
+Index: odil/tests/wrappers/test_find_scp.py
+===================================================================
+--- odil.orig/tests/wrappers/test_find_scp.py
++++ odil/tests/wrappers/test_find_scp.py
+@@ -39,7 +39,7 @@ class Generator(odil.FindSCP.DataSetGene
+ def get(self):
+ return self._responses[self._response_index]
+
+-class TestFindSCP(unittest.TestCase):
++class TestFindSCP(object):
+ def test_find_scp_release(self):
+ process = multiprocessing.Process(target=self.run_server)
+ process.start()
+Index: odil/tests/wrappers/test_find_scu.py
+===================================================================
+--- odil.orig/tests/wrappers/test_find_scu.py
++++ odil/tests/wrappers/test_find_scu.py
+@@ -7,7 +7,7 @@ import odil
+ sys.path.append(os.path.dirname(os.path.dirname(__file__)))
+ from peer_fixture_base import PeerFixtureBase
+
+-class TestFindSCU(PeerFixtureBase):
++class TestFindSCU(object):
+ def setUp(self):
+ PeerFixtureBase.setUp(
+ self,
+Index: odil/tests/wrappers/test_get_scp.py
+===================================================================
+--- odil.orig/tests/wrappers/test_get_scp.py
++++ odil/tests/wrappers/test_get_scp.py
+@@ -50,7 +50,7 @@ class Generator(odil.GetSCP.DataSetGener
+ def count(self):
+ return 2
+
+-class TestGetSCP(unittest.TestCase):
++class TestGetSCP(object):
+ def test_get_scp_release(self):
+ process = multiprocessing.Process(target=self.run_server)
+ process.start()
+Index: odil/tests/wrappers/test_get_scu.py
+===================================================================
+--- odil.orig/tests/wrappers/test_get_scu.py
++++ odil/tests/wrappers/test_get_scu.py
+@@ -7,7 +7,7 @@ import odil
+ sys.path.append(os.path.dirname(os.path.dirname(__file__)))
+ from peer_fixture_base import PeerFixtureBase
+
+-class TestGetSCU(PeerFixtureBase):
++class TestGetSCU(object):
+ def setUp(self):
+ PeerFixtureBase.setUp(
+ self,
+Index: odil/tests/wrappers/test_move_scp.py
+===================================================================
+--- odil.orig/tests/wrappers/test_move_scp.py
++++ odil/tests/wrappers/test_move_scp.py
+@@ -70,7 +70,7 @@ class Generator(odil.MoveSCP.DataSetGene
+
+ return move_association
+
+-class TestMoveSCP(unittest.TestCase):
++class TestMoveSCP(object):
+ def test_move_scp_release(self):
+ process = multiprocessing.Process(target=self.run_server)
+ process.start()
+Index: odil/tests/wrappers/test_move_scu.py
+===================================================================
+--- odil.orig/tests/wrappers/test_move_scu.py
++++ odil/tests/wrappers/test_move_scu.py
+@@ -7,7 +7,7 @@ import odil
+ sys.path.append(os.path.dirname(os.path.dirname(__file__)))
+ from peer_fixture_base import PeerFixtureBase
+
+-class TestMoveSCU(PeerFixtureBase):
++class TestMoveSCU(object):
+ def setUp(self):
+ PeerFixtureBase.setUp(
+ self,
+Index: odil/tests/wrappers/test_scp_dispatcher.py
+===================================================================
+--- odil.orig/tests/wrappers/test_scp_dispatcher.py
++++ odil/tests/wrappers/test_scp_dispatcher.py
+@@ -9,7 +9,7 @@ if sys.platform == "darwin" and multipro
+
+ import odil
+
+-class TestSCPDispatcher(unittest.TestCase):
++class TestSCPDispatcher(object):
+ def test_echo(self):
+ process = multiprocessing.Process(target=lambda: self.run_server(False))
+ process.start()
+Index: odil/tests/wrappers/test_store_scp.py
+===================================================================
+--- odil.orig/tests/wrappers/test_store_scp.py
++++ odil/tests/wrappers/test_store_scp.py
+@@ -9,7 +9,7 @@ import unittest
+
+ import odil
+
+-class TestStoreSCP(unittest.TestCase):
++class TestStoreSCP(object):
+ def __init__(self, *args, **kwargs):
+ unittest.TestCase.__init__(self, *args, **kwargs)
+ self.directory = None
+Index: odil/tests/wrappers/test_store_scu.py
+===================================================================
+--- odil.orig/tests/wrappers/test_store_scu.py
++++ odil/tests/wrappers/test_store_scu.py
+@@ -7,7 +7,7 @@ import odil
+ sys.path.append(os.path.dirname(os.path.dirname(__file__)))
+ from peer_fixture_base import PeerFixtureBase
+
+-class TestStoreSCU(PeerFixtureBase):
++class TestStoreSCU(object):
+ def setUp(self):
+ PeerFixtureBase.setUp(
+ self,
=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ remove-soname-in-wrappers.patch
remove_boost_exception.patch
fix-interpreter-path.patch
upgrade_cxx_standard.patch
+remove-network-unit-tests.patch
View it on GitLab: https://salsa.debian.org/med-team/odil/-/commit/16f4c1277ffba5cd6a8e8b88aee4d9802822628d
--
View it on GitLab: https://salsa.debian.org/med-team/odil/-/commit/16f4c1277ffba5cd6a8e8b88aee4d9802822628d
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20211216/d88c839f/attachment-0001.htm>
More information about the debian-med-commit
mailing list