1 |
commit: 14499d0e86f67f556e2631c687eaf20e82ca9e43 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 3 12:14:20 2012 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 3 12:14:20 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=14499d0e |
7 |
|
8 |
Remove old dbus_case API. |
9 |
|
10 |
--- |
11 |
pmstestsuite/library/standard/banned_commands.py | 20 +++----------------- |
12 |
pmstestsuite/library/standard/dbus_case.py | 20 -------------------- |
13 |
pmstestsuite/library/standard/depend.py | 20 +++++++++----------- |
14 |
pmstestsuite/library/standard/deprecated_vars.py | 12 +++++------- |
15 |
pmstestsuite/library/standard/doins_fail.py | 6 +++--- |
16 |
pmstestsuite/library/standard/eclass_depend.py | 12 ++++++------ |
17 |
pmstestsuite/library/standard/eclass_metadata.py | 13 ++++--------- |
18 |
pmstestsuite/library/standard/ext_cases.py | 8 ++++---- |
19 |
.../library/standard/phase_function_order.py | 7 +++---- |
20 |
pmstestsuite/library/standard/special_vars.py | 13 ++++--------- |
21 |
pmstestsuite/library/standard/util.py | 8 ++++---- |
22 |
pmstestsuite/library/standard/variable_scope.py | 6 ++---- |
23 |
pmstestsuite/library/standard/workdir_fallback.py | 6 +++--- |
24 |
13 files changed, 50 insertions(+), 101 deletions(-) |
25 |
|
26 |
diff --git a/pmstestsuite/library/standard/banned_commands.py b/pmstestsuite/library/standard/banned_commands.py |
27 |
index 216d6df..7e3de17 100644 |
28 |
--- a/pmstestsuite/library/standard/banned_commands.py |
29 |
+++ b/pmstestsuite/library/standard/banned_commands.py |
30 |
@@ -2,13 +2,13 @@ |
31 |
# (c) 2011-2012 Michał Górny <mgorny@g.o> |
32 |
# Released under the terms of the 2-clause BSD license. |
33 |
|
34 |
-from .dbus_case import DBusEbuildTestCase |
35 |
+from pmstestsuite.library.case import EbuildTestCase |
36 |
|
37 |
-class BannedCommandTest(DBusEbuildTestCase): |
38 |
+class BannedCommandTest(EbuildTestCase): |
39 |
supported_eapis = (range(0, 4), (4,)) |
40 |
|
41 |
def __init__(self, *args, **kwargs): |
42 |
- DBusEbuildTestCase.__init__(self, *args, **kwargs) |
43 |
+ EbuildTestCase.__init__(self, *args, **kwargs) |
44 |
self._path = '/tmp/pms-test-suite-%d' % id(self) |
45 |
self.phase_funcs['src_install'].extend([ |
46 |
'{ echo > foo; } || die', |
47 |
@@ -32,13 +32,6 @@ class DoHardCommandTest(BannedCommandTest): |
48 |
|
49 |
def check_dbus_result(self, output, pm): |
50 |
try: |
51 |
- BannedCommandTest.check_dbus_result(self, output, pm) |
52 |
- except AssertionError as e: |
53 |
- exc = e |
54 |
- else: |
55 |
- exc = None |
56 |
- |
57 |
- try: |
58 |
res = True if output[0] == '0' else False |
59 |
except IndexError: |
60 |
res = None |
61 |
@@ -77,13 +70,6 @@ class DoSedCommandTest(BannedCommandTest): |
62 |
|
63 |
def check_dbus_result(self, output, pm): |
64 |
try: |
65 |
- BannedCommandTest.check_dbus_result(self, output, pm) |
66 |
- except AssertionError as e: |
67 |
- exc = e |
68 |
- else: |
69 |
- exc = None |
70 |
- |
71 |
- try: |
72 |
res = output[0].strip() |
73 |
except IndexError: |
74 |
res = None |
75 |
|
76 |
diff --git a/pmstestsuite/library/standard/dbus_case.py b/pmstestsuite/library/standard/dbus_case.py |
77 |
deleted file mode 100644 |
78 |
index 14258b7..0000000 |
79 |
--- a/pmstestsuite/library/standard/dbus_case.py |
80 |
+++ /dev/null |
81 |
@@ -1,20 +0,0 @@ |
82 |
-# vim:fileencoding=utf-8 |
83 |
-# (c) 2011-2012 Michał Górny <mgorny@g.o> |
84 |
-# Released under the terms of the 2-clause BSD license. |
85 |
- |
86 |
-from pmstestsuite.library.case import EbuildTestCase |
87 |
-from pmstestsuite.library.depend_case import EbuildDependencyTestCase, \ |
88 |
- EclassDependencyTestCase |
89 |
-from pmstestsuite.library.eclass_case import EclassTestCase |
90 |
- |
91 |
-class DBusEbuildTestCase(EbuildTestCase): |
92 |
- pass |
93 |
- |
94 |
-class DBusEclassTestCase(EclassTestCase): |
95 |
- pass |
96 |
- |
97 |
-class DBusEbuildDependencyTestCase(EbuildDependencyTestCase): |
98 |
- pass |
99 |
- |
100 |
-class DBusEclassDependencyTestCase(EclassDependencyTestCase): |
101 |
- pass |
102 |
|
103 |
diff --git a/pmstestsuite/library/standard/depend.py b/pmstestsuite/library/standard/depend.py |
104 |
index f95f090..843229c 100644 |
105 |
--- a/pmstestsuite/library/standard/depend.py |
106 |
+++ b/pmstestsuite/library/standard/depend.py |
107 |
@@ -2,46 +2,44 @@ |
108 |
# (c) 2011-2012 Michał Górny <mgorny@g.o> |
109 |
# Released under the terms of the 2-clause BSD license. |
110 |
|
111 |
-from .dbus_case import DBusEbuildDependencyTestCase |
112 |
+from pmstestsuite.library.depend_case import EbuildDependencyTestCase |
113 |
from .util import EbuildToucher, FailingEbuild |
114 |
|
115 |
-class DependTest(DBusEbuildDependencyTestCase): |
116 |
+class DependTest(EbuildDependencyTestCase): |
117 |
""" DEPEND fulfilling test. """ |
118 |
|
119 |
depend_classes = [EbuildToucher] |
120 |
|
121 |
def __init__(self, *args, **kwargs): |
122 |
- DBusEbuildDependencyTestCase.__init__(self, *args, **kwargs) |
123 |
+ EbuildDependencyTestCase.__init__(self, *args, **kwargs) |
124 |
self.phase_funcs['src_compile'].append( |
125 |
'pms-test-suite-%s || die' % self.dependant_ebuilds[0].pv |
126 |
) |
127 |
|
128 |
-class RDependTest(DBusEbuildDependencyTestCase): |
129 |
+class RDependTest(EbuildDependencyTestCase): |
130 |
""" RDEPEND fulfilling test. """ |
131 |
|
132 |
rdepend_classes = [EbuildToucher] |
133 |
|
134 |
def __init__(self, *args, **kwargs): |
135 |
- DBusEbuildDependencyTestCase.__init__(self, *args, **kwargs) |
136 |
+ EbuildDependencyTestCase.__init__(self, *args, **kwargs) |
137 |
self.phase_funcs['pkg_postinst'].append( |
138 |
'pms-test-suite-%s || die' % self.dependant_ebuilds[0].pv |
139 |
) |
140 |
|
141 |
-class PDependTest(DBusEbuildDependencyTestCase): |
142 |
+class PDependTest(EbuildDependencyTestCase): |
143 |
""" PDEPEND fulfilling test. """ |
144 |
|
145 |
pdepend_classes = [EbuildToucher] |
146 |
|
147 |
def __init__(self, *args, **kwargs): |
148 |
- DBusEbuildDependencyTestCase.__init__(self, *args, **kwargs) |
149 |
+ EbuildDependencyTestCase.__init__(self, *args, **kwargs) |
150 |
self.phase_funcs['pkg_postinst'].extend([ |
151 |
'pms-test-suite-%s' % self.dependant_ebuilds[0].pv, |
152 |
'pms-test_dbus_append_result ${?}' |
153 |
]) |
154 |
|
155 |
def check_dbus_result(self, output, pm): |
156 |
- DBusEbuildDependencyTestCase.check_dbus_result(self, output, pm) |
157 |
- |
158 |
try: |
159 |
res = output[0] == '0' |
160 |
except IndexError: |
161 |
@@ -49,13 +47,13 @@ class PDependTest(DBusEbuildDependencyTestCase): |
162 |
self.assertFalse(res, 'PDEP merged before ebuild', |
163 |
undefined = True) |
164 |
|
165 |
-class FailingDependTest(DBusEbuildDependencyTestCase): |
166 |
+class FailingDependTest(EbuildDependencyTestCase): |
167 |
""" Unfulfilled DEPEND test. """ |
168 |
|
169 |
depend_classes = [FailingEbuild] |
170 |
expect_failure = True |
171 |
|
172 |
-class FailingRDependTest(DBusEbuildDependencyTestCase): |
173 |
+class FailingRDependTest(EbuildDependencyTestCase): |
174 |
""" Unfulfilled RDEPEND test. """ |
175 |
|
176 |
depend_classes = [FailingEbuild] |
177 |
|
178 |
diff --git a/pmstestsuite/library/standard/deprecated_vars.py b/pmstestsuite/library/standard/deprecated_vars.py |
179 |
index 14d1bd6..a4a4a6b 100644 |
180 |
--- a/pmstestsuite/library/standard/deprecated_vars.py |
181 |
+++ b/pmstestsuite/library/standard/deprecated_vars.py |
182 |
@@ -4,10 +4,10 @@ |
183 |
|
184 |
import os.path |
185 |
|
186 |
-from .dbus_case import DBusEbuildTestCase |
187 |
-from .ext_cases import DBusFetchingEbuildTestCase |
188 |
+from pmstestsuite.library.case import EbuildTestCase |
189 |
+from .ext_cases import FetchingEbuildTestCase |
190 |
|
191 |
-class AATest(DBusFetchingEbuildTestCase): |
192 |
+class AATest(FetchingEbuildTestCase): |
193 |
""" Test whether AA is declared. """ |
194 |
|
195 |
supported_eapis = (range(0, 4), (4,)) |
196 |
@@ -21,7 +21,7 @@ class AATest(DBusFetchingEbuildTestCase): |
197 |
} |
198 |
|
199 |
def __init__(self, *args, **kwargs): |
200 |
- DBusFetchingEbuildTestCase.__init__(self, *args, **kwargs) |
201 |
+ FetchingEbuildTestCase.__init__(self, *args, **kwargs) |
202 |
self._expect_fn = os.path.split(self.ebuild_vars['SRC_URI'])[1] |
203 |
self.ebuild_vars['SRC_URI'] = 'pms_tests_magical_hidden_use? ( %s )' \ |
204 |
% self.ebuild_vars['SRC_URI'] |
205 |
@@ -32,10 +32,9 @@ class AATest(DBusFetchingEbuildTestCase): |
206 |
else: |
207 |
expect = '' |
208 |
|
209 |
- DBusEbuildTestCase.check_dbus_result(self, output, pm) |
210 |
self.assertEqual(output[0], expect, '${AA}') |
211 |
|
212 |
-class KVTest(DBusEbuildTestCase): |
213 |
+class KVTest(EbuildTestCase): |
214 |
""" Test whether KV is declared. """ |
215 |
|
216 |
supported_eapis = (range(0, 4), (4,)) |
217 |
@@ -46,7 +45,6 @@ class KVTest(DBusEbuildTestCase): |
218 |
} |
219 |
|
220 |
def check_dbus_result(self, output, pm): |
221 |
- DBusEbuildTestCase.check_dbus_result(self, output, pm) |
222 |
func = self.assertEqual if self.eapi == 4 \ |
223 |
else self.assertNotEqual |
224 |
func(output[0], '', '${KV}') |
225 |
|
226 |
diff --git a/pmstestsuite/library/standard/doins_fail.py b/pmstestsuite/library/standard/doins_fail.py |
227 |
index a965377..0088fe6 100644 |
228 |
--- a/pmstestsuite/library/standard/doins_fail.py |
229 |
+++ b/pmstestsuite/library/standard/doins_fail.py |
230 |
@@ -2,9 +2,9 @@ |
231 |
# (c) 2011 Michał Górny <mgorny@g.o> |
232 |
# Released under the terms of the 2-clause BSD license. |
233 |
|
234 |
-from .dbus_case import DBusEbuildTestCase |
235 |
+from pmstestsuite.library.case import EbuildTestCase |
236 |
|
237 |
-class DoInsFailureTest(DBusEbuildTestCase): |
238 |
+class DoInsFailureTest(EbuildTestCase): |
239 |
""" doins() failure handling test. """ |
240 |
|
241 |
supported_eapis = (range(0, 4), (4,)) |
242 |
@@ -17,5 +17,5 @@ class DoInsFailureTest(DBusEbuildTestCase): |
243 |
} |
244 |
|
245 |
def __init__(self, *args, **kwargs): |
246 |
- DBusEbuildTestCase.__init__(self, *args, **kwargs) |
247 |
+ EbuildTestCase.__init__(self, *args, **kwargs) |
248 |
self.expect_failure = (self.eapi == 4) |
249 |
|
250 |
diff --git a/pmstestsuite/library/standard/eclass_depend.py b/pmstestsuite/library/standard/eclass_depend.py |
251 |
index 8812fb0..8f98ca5 100644 |
252 |
--- a/pmstestsuite/library/standard/eclass_depend.py |
253 |
+++ b/pmstestsuite/library/standard/eclass_depend.py |
254 |
@@ -2,10 +2,10 @@ |
255 |
# (c) 2011 Michał Górny <mgorny@g.o> |
256 |
# Released under the terms of the 2-clause BSD license. |
257 |
|
258 |
-from .dbus_case import DBusEclassDependencyTestCase |
259 |
+from pmstestsuite.library.case import EbuildTestCase |
260 |
from .util import EbuildToucher |
261 |
|
262 |
-class DependInheritanceTest(DBusEclassDependencyTestCase): |
263 |
+class DependInheritanceTest(EclassDependencyTestCase): |
264 |
""" DEPEND variable inheritance test. """ |
265 |
|
266 |
depend_classes = [EbuildToucher] |
267 |
@@ -13,13 +13,13 @@ class DependInheritanceTest(DBusEclassDependencyTestCase): |
268 |
eclass_contents = '' |
269 |
|
270 |
def __init__(self, *args, **kwargs): |
271 |
- DBusEclassDependencyTestCase.__init__(self, *args, **kwargs) |
272 |
+ EclassDependencyTestCase.__init__(self, *args, **kwargs) |
273 |
self.phase_funcs['src_compile'].extend(( |
274 |
'pms-test-suite-%s || die' % self.dependant_ebuilds[0].pv, |
275 |
'pms-test-suite-%s || die' % self.dependant_ebuilds[1].pv |
276 |
)) |
277 |
|
278 |
-class RDependInheritanceTest(DBusEclassDependencyTestCase): |
279 |
+class RDependInheritanceTest(EclassDependencyTestCase): |
280 |
""" RDEPEND variable inheritance test. """ |
281 |
|
282 |
rdepend_classes = [EbuildToucher] |
283 |
@@ -27,13 +27,13 @@ class RDependInheritanceTest(DBusEclassDependencyTestCase): |
284 |
eclass_contents = '' |
285 |
|
286 |
def __init__(self, *args, **kwargs): |
287 |
- DBusEclassDependencyTestCase.__init__(self, *args, **kwargs) |
288 |
+ EclassDependencyTestCase.__init__(self, *args, **kwargs) |
289 |
self.phase_funcs['pkg_postinst'].extend(( |
290 |
'pms-test-suite-%s || die' % self.dependant_ebuilds[0].pv, |
291 |
'pms-test-suite-%s || die' % self.dependant_ebuilds[1].pv |
292 |
)) |
293 |
|
294 |
-class PDependInheritanceTest(DBusEclassDependencyTestCase): |
295 |
+class PDependInheritanceTest(EclassDependencyTestCase): |
296 |
""" PDEPEND variable inheritance test. """ |
297 |
|
298 |
pdepend_classes = [EbuildToucher] |
299 |
|
300 |
diff --git a/pmstestsuite/library/standard/eclass_metadata.py b/pmstestsuite/library/standard/eclass_metadata.py |
301 |
index d7b6cf6..18a4686 100644 |
302 |
--- a/pmstestsuite/library/standard/eclass_metadata.py |
303 |
+++ b/pmstestsuite/library/standard/eclass_metadata.py |
304 |
@@ -4,9 +4,9 @@ |
305 |
|
306 |
from abc import abstractproperty |
307 |
|
308 |
-from .dbus_case import DBusEclassTestCase |
309 |
+from pmstestsuite.library.case import EclassTestCase |
310 |
|
311 |
-class VariableInheritanceTest(DBusEclassTestCase): |
312 |
+class VariableInheritanceTest(EclassTestCase): |
313 |
""" Eclass variable inheritance test. """ |
314 |
|
315 |
@abstractproperty |
316 |
@@ -29,7 +29,7 @@ class VariableInheritanceTest(DBusEclassTestCase): |
317 |
return '%s=%s\n' % (self.var_name, repr(self.var_eclass_value)) |
318 |
|
319 |
def __init__(self, *args, **kwargs): |
320 |
- DBusEclassTestCase.__init__(self, *args, **kwargs) |
321 |
+ EclassTestCase.__init__(self, *args, **kwargs) |
322 |
self.ebuild_vars[self.var_name] = self.var_ebuild_value |
323 |
|
324 |
class IUseInheritanceTest(VariableInheritanceTest): |
325 |
@@ -40,16 +40,13 @@ class IUseInheritanceTest(VariableInheritanceTest): |
326 |
var_ebuild_value = 'bar' |
327 |
|
328 |
def check_dbus_result(self, output, pm): |
329 |
- # ensure it got installed first |
330 |
- DBusEclassTestCase.check_dbus_result(self, output, pm) |
331 |
- |
332 |
spl = pm.installed[self.atom(pm)].use |
333 |
self.assertContains(self.var_eclass_value, spl, 'IUSE (eclass)') |
334 |
self.assertContains(self.var_ebuild_value, spl, 'IUSE (ebuild)') |
335 |
|
336 |
# XXX: REQUIRED_USE |
337 |
|
338 |
-class EclassDefinedPhasesTest(DBusEclassTestCase): |
339 |
+class EclassDefinedPhasesTest(EclassTestCase): |
340 |
""" Check whether eclasses set DEFINED_PHASES as well. """ |
341 |
|
342 |
supported_eapis = ((4,),) |
343 |
@@ -70,8 +67,6 @@ EXPORT_FUNCTIONS src_compile |
344 |
''' % self.pn |
345 |
|
346 |
def check_dbus_result(self, output, pm): |
347 |
- DBusEclassTestCase.check_dbus_result(self, output, pm) |
348 |
- |
349 |
phases = pm.installed[self.atom(pm)].defined_phases |
350 |
self.assertContains('compile', phases, 'DEFINED_PHASES (eclass)') |
351 |
self.assertContains('install', phases, 'DEFINED_PHASES (ebuild)') |
352 |
|
353 |
diff --git a/pmstestsuite/library/standard/ext_cases.py b/pmstestsuite/library/standard/ext_cases.py |
354 |
index 94a93cc..8fcbf12 100644 |
355 |
--- a/pmstestsuite/library/standard/ext_cases.py |
356 |
+++ b/pmstestsuite/library/standard/ext_cases.py |
357 |
@@ -2,16 +2,16 @@ |
358 |
# (c) 2011 Michał Górny <mgorny@g.o> |
359 |
# Released under the terms of the 2-clause BSD license. |
360 |
|
361 |
-from .dbus_case import DBusEbuildTestCase |
362 |
+from pmstestsuite.library.case import EbuildTestCase |
363 |
|
364 |
-class DBusFetchingEbuildTestCase(DBusEbuildTestCase): |
365 |
+class FetchingEbuildTestCase(EbuildTestCase): |
366 |
""" |
367 |
- A DBusEbuildTestCase variant with a standarized way of fetching |
368 |
+ A EbuildTestCase variant with a standarized way of fetching |
369 |
sources -- to decrease {${DISTDIR}} pollution. |
370 |
""" |
371 |
|
372 |
def __init__(self, *args, **kwargs): |
373 |
- DBusEbuildTestCase.__init__(self, *args, **kwargs) |
374 |
+ EbuildTestCase.__init__(self, *args, **kwargs) |
375 |
val = 'http://dev.gentoo.org/~mgorny/pmsts-temp.bin' |
376 |
if 'SRC_URI' in self.ebuild_vars: |
377 |
val = '%s %s' % (self.ebuild_vars['SRC_URI'], val) |
378 |
|
379 |
diff --git a/pmstestsuite/library/standard/phase_function_order.py b/pmstestsuite/library/standard/phase_function_order.py |
380 |
index a9f24ac..12a2234 100644 |
381 |
--- a/pmstestsuite/library/standard/phase_function_order.py |
382 |
+++ b/pmstestsuite/library/standard/phase_function_order.py |
383 |
@@ -2,15 +2,15 @@ |
384 |
# (c) 2011-2012 Michał Górny <mgorny@g.o> |
385 |
# Released under the terms of the 2-clause BSD license. |
386 |
|
387 |
-from .dbus_case import DBusEbuildTestCase |
388 |
+from pmstestsuite.library.case import EbuildTestCase |
389 |
|
390 |
-class PhaseFunctionOrderTest(DBusEbuildTestCase): |
391 |
+class PhaseFunctionOrderTest(EbuildTestCase): |
392 |
""" Phase function execution order test. """ |
393 |
|
394 |
supported_eapis = ((0, 1), (2, 3), (4,)) |
395 |
|
396 |
def __init__(self, *args, **kwargs): |
397 |
- DBusEbuildTestCase.__init__(self, *args, **kwargs) |
398 |
+ EbuildTestCase.__init__(self, *args, **kwargs) |
399 |
for k, lines in self.phase_funcs.items(): |
400 |
lines.append('pms-test_dbus_append_result %s' % k) |
401 |
|
402 |
@@ -24,5 +24,4 @@ class PhaseFunctionOrderTest(DBusEbuildTestCase): |
403 |
expect.extend(['src_prepare', 'src_configure']) |
404 |
expect.extend(['src_compile', 'src_install', 'pkg_preinst', 'pkg_postinst']) |
405 |
|
406 |
- DBusEbuildTestCase.check_dbus_result(self, output, pm) |
407 |
self.assertEqual(output, expect, 'Executed phases') |
408 |
|
409 |
diff --git a/pmstestsuite/library/standard/special_vars.py b/pmstestsuite/library/standard/special_vars.py |
410 |
index 8283a60..acbfd32 100644 |
411 |
--- a/pmstestsuite/library/standard/special_vars.py |
412 |
+++ b/pmstestsuite/library/standard/special_vars.py |
413 |
@@ -2,9 +2,9 @@ |
414 |
# (c) 2011-2012 Michał Górny <mgorny@g.o> |
415 |
# Released under the terms of the 2-clause BSD license. |
416 |
|
417 |
-from .dbus_case import DBusEbuildTestCase |
418 |
+from pmstestsuite.library.case import EbuildTestCase |
419 |
|
420 |
-class InheritedVariableTest(DBusEbuildTestCase): |
421 |
+class InheritedVariableTest(EbuildTestCase): |
422 |
""" INHERITED variable definition test. """ |
423 |
|
424 |
phase_funcs = { |
425 |
@@ -14,11 +14,10 @@ class InheritedVariableTest(DBusEbuildTestCase): |
426 |
} |
427 |
|
428 |
def check_dbus_result(self, output, pm): |
429 |
- DBusEbuildTestCase.check_dbus_result(self, output, pm) |
430 |
inherits = output[0].split() |
431 |
self.assertContains('pms-test', inherits, 'INHERITED') |
432 |
|
433 |
-class RDependFallbackTest(DBusEbuildTestCase): |
434 |
+class RDependFallbackTest(EbuildTestCase): |
435 |
""" Test whether RDEPEND=${DEPEND} fallback works as expected. """ |
436 |
|
437 |
supported_eapis = (range(0, 4), (4,)) |
438 |
@@ -28,8 +27,6 @@ class RDependFallbackTest(DBusEbuildTestCase): |
439 |
} |
440 |
|
441 |
def check_dbus_result(self, output, pm): |
442 |
- DBusEbuildTestCase.check_dbus_result(self, output, pm) |
443 |
- |
444 |
class DepMatcher(object): |
445 |
def __eq__(self, other): |
446 |
return other.key == str(self) |
447 |
@@ -50,7 +47,7 @@ class RDependFallbackTest(DBusEbuildTestCase): |
448 |
else: |
449 |
self.assertContains(mydep, rdep, 'RDEPEND') |
450 |
|
451 |
-class DefinedPhasesTest(DBusEbuildTestCase): |
452 |
+class DefinedPhasesTest(EbuildTestCase): |
453 |
""" Test whether DEFINED_PHASES are declared in EAPI 4. """ |
454 |
|
455 |
supported_eapis = ((4,),) |
456 |
@@ -61,7 +58,5 @@ class DefinedPhasesTest(DBusEbuildTestCase): |
457 |
} |
458 |
|
459 |
def check_dbus_result(self, output, pm): |
460 |
- DBusEbuildTestCase.check_dbus_result(self, output, pm) |
461 |
- |
462 |
phases = pm.installed[self.atom(pm)].defined_phases |
463 |
self.assertEqual(tuple(phases), ('setup',), 'DEFINED_PHASES') |
464 |
|
465 |
diff --git a/pmstestsuite/library/standard/util.py b/pmstestsuite/library/standard/util.py |
466 |
index 0bee1b5..37e44f8 100644 |
467 |
--- a/pmstestsuite/library/standard/util.py |
468 |
+++ b/pmstestsuite/library/standard/util.py |
469 |
@@ -2,9 +2,9 @@ |
470 |
# (c) 2011 Michał Górny <mgorny@g.o> |
471 |
# Released under the terms of the 2-clause BSD license. |
472 |
|
473 |
-from .dbus_case import DBusEbuildTestCase |
474 |
+from pmstestsuite.library.case import EbuildTestCase |
475 |
|
476 |
-class EbuildToucher(DBusEbuildTestCase): |
477 |
+class EbuildToucher(EbuildTestCase): |
478 |
""" Touched file installer (for dependency tests). """ |
479 |
|
480 |
@property |
481 |
@@ -12,7 +12,7 @@ class EbuildToucher(DBusEbuildTestCase): |
482 |
return id(self) |
483 |
|
484 |
def __init__(self, *args, **kwargs): |
485 |
- DBusEbuildTestCase.__init__(self, *args, **kwargs) |
486 |
+ EbuildTestCase.__init__(self, *args, **kwargs) |
487 |
self.phase_funcs['src_unpack'].append( |
488 |
'''cat >> mytrue.sh <<_EOF_ |
489 |
#!/bin/sh |
490 |
@@ -23,7 +23,7 @@ _EOF_''' |
491 |
'newbin mytrue.sh pms-test-suite-%s || die' % self.pv |
492 |
) |
493 |
|
494 |
-class FailingEbuild(DBusEbuildTestCase): |
495 |
+class FailingEbuild(EbuildTestCase): |
496 |
""" A failing ebuild. """ |
497 |
|
498 |
phase_funcs = { |
499 |
|
500 |
diff --git a/pmstestsuite/library/standard/variable_scope.py b/pmstestsuite/library/standard/variable_scope.py |
501 |
index bee1d7e..614f6ee 100644 |
502 |
--- a/pmstestsuite/library/standard/variable_scope.py |
503 |
+++ b/pmstestsuite/library/standard/variable_scope.py |
504 |
@@ -4,9 +4,9 @@ |
505 |
|
506 |
import re |
507 |
|
508 |
-from .dbus_case import DBusEbuildTestCase |
509 |
+from pmstestsuite.library.case import EbuildTestCase |
510 |
|
511 |
-class VariableScopeTest(DBusEbuildTestCase): |
512 |
+class VariableScopeTest(EbuildTestCase): |
513 |
""" A test for scoping of variables. """ |
514 |
|
515 |
ebuild_vars = { |
516 |
@@ -70,5 +70,3 @@ class VariableScopeTest(DBusEbuildTestCase): |
517 |
|
518 |
for var, regexp in zip(output, matches): |
519 |
self.assertEqual(var, regexp, regexp.name) |
520 |
- |
521 |
- return DBusEbuildTestCase.check_dbus_result(self, output, pm) |
522 |
|
523 |
diff --git a/pmstestsuite/library/standard/workdir_fallback.py b/pmstestsuite/library/standard/workdir_fallback.py |
524 |
index 04ce281..6416ac6 100644 |
525 |
--- a/pmstestsuite/library/standard/workdir_fallback.py |
526 |
+++ b/pmstestsuite/library/standard/workdir_fallback.py |
527 |
@@ -2,9 +2,9 @@ |
528 |
# (c) 2011 Michał Górny <mgorny@g.o> |
529 |
# Released under the terms of the 2-clause BSD license. |
530 |
|
531 |
-from .ext_cases import DBusFetchingEbuildTestCase |
532 |
+from .ext_cases import FetchingEbuildTestCase |
533 |
|
534 |
-class WorkdirFallbackTest(DBusFetchingEbuildTestCase): |
535 |
+class WorkdirFallbackTest(FetchingEbuildTestCase): |
536 |
""" S=${WORKDIR} fallback test. """ |
537 |
|
538 |
supported_eapis = (range(0, 4), (4,)) |
539 |
@@ -27,5 +27,5 @@ class WorkdirFallbackTest(DBusFetchingEbuildTestCase): |
540 |
} |
541 |
|
542 |
def __init__(self, *args, **kwargs): |
543 |
- DBusFetchingEbuildTestCase.__init__(self, *args, **kwargs) |
544 |
+ FetchingEbuildTestCase.__init__(self, *args, **kwargs) |
545 |
self.expect_failure = (self.eapi == 4) |