1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
|
Description: Remove network-related unit tests to comply with CI policy
Author: Julien Lamy <lamy@unistra.fr>
Forwarded: not-needed
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,
|
