| 1 |
commit: 7fe6d28494f540339031150179d4906cf927d1ee |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 29 17:13:05 2011 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 29 17:32:35 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=7fe6d284 |
| 7 |
|
| 8 |
Adjust the tests relevant_/supported_eapis. |
| 9 |
|
| 10 |
--- |
| 11 |
pmstestsuite/library/standard/depend.py | 5 ----- |
| 12 |
pmstestsuite/library/standard/ext_cases.py | 3 +++ |
| 13 |
pmstestsuite/library/standard/special_vars.py | 6 ++---- |
| 14 |
pmstestsuite/library/standard/variable_scope.py | 1 - |
| 15 |
pmstestsuite/library/standard/workdir_fallback.py | 2 +- |
| 16 |
5 files changed, 6 insertions(+), 11 deletions(-) |
| 17 |
|
| 18 |
diff --git a/pmstestsuite/library/standard/depend.py b/pmstestsuite/library/standard/depend.py |
| 19 |
index 3a2bea9..2a3049f 100644 |
| 20 |
--- a/pmstestsuite/library/standard/depend.py |
| 21 |
+++ b/pmstestsuite/library/standard/depend.py |
| 22 |
@@ -8,7 +8,6 @@ from pmstestsuite.library.standard.util import EbuildToucher, FailingEbuild |
| 23 |
class DependTest(DBusEbuildDependencyTestCase): |
| 24 |
""" DEPEND fulfilling test. """ |
| 25 |
|
| 26 |
- relevant_eapis = (0,) |
| 27 |
depend_classes = [EbuildToucher] |
| 28 |
|
| 29 |
def __init__(self, *args, **kwargs): |
| 30 |
@@ -20,7 +19,6 @@ class DependTest(DBusEbuildDependencyTestCase): |
| 31 |
class RDependTest(DBusEbuildDependencyTestCase): |
| 32 |
""" RDEPEND fulfilling test. """ |
| 33 |
|
| 34 |
- relevant_eapis = (0,) |
| 35 |
rdepend_classes = [EbuildToucher] |
| 36 |
|
| 37 |
def __init__(self, *args, **kwargs): |
| 38 |
@@ -32,19 +30,16 @@ class RDependTest(DBusEbuildDependencyTestCase): |
| 39 |
class PDependTest(DBusEbuildDependencyTestCase): |
| 40 |
""" PDEPEND fulfilling test. """ |
| 41 |
|
| 42 |
- relevant_eapis = (0,) |
| 43 |
pdepend_classes = [EbuildToucher] |
| 44 |
|
| 45 |
class FailingDependTest(DBusEbuildDependencyTestCase): |
| 46 |
""" Unfulfilled DEPEND test. """ |
| 47 |
|
| 48 |
- relevant_eapis = (0,) |
| 49 |
depend_classes = [FailingEbuild] |
| 50 |
expect_failure = True |
| 51 |
|
| 52 |
class FailingRDependTest(DBusEbuildDependencyTestCase): |
| 53 |
""" Unfulfilled RDEPEND test. """ |
| 54 |
|
| 55 |
- relevant_eapis = (0,) |
| 56 |
depend_classes = [FailingEbuild] |
| 57 |
expect_failure = True |
| 58 |
|
| 59 |
diff --git a/pmstestsuite/library/standard/ext_cases.py b/pmstestsuite/library/standard/ext_cases.py |
| 60 |
index d1d5eb6..fef45a1 100644 |
| 61 |
--- a/pmstestsuite/library/standard/ext_cases.py |
| 62 |
+++ b/pmstestsuite/library/standard/ext_cases.py |
| 63 |
@@ -10,6 +10,9 @@ class DBusFetchingEbuildTestCase(DBusEbuildTestCase): |
| 64 |
sources -- to decrease ${DISTDIR} pollution. |
| 65 |
""" |
| 66 |
|
| 67 |
+ # temporary, due to SRC_URI arrow |
| 68 |
+ supported_eapis = (2, 3, 4) |
| 69 |
+ |
| 70 |
def __init__(self, *args, **kwargs): |
| 71 |
DBusEbuildTestCase.__init__(self, *args, **kwargs) |
| 72 |
# XXX: switch to a dedicated file without the arrow |
| 73 |
|
| 74 |
diff --git a/pmstestsuite/library/standard/special_vars.py b/pmstestsuite/library/standard/special_vars.py |
| 75 |
index 2a38897..0279b83 100644 |
| 76 |
--- a/pmstestsuite/library/standard/special_vars.py |
| 77 |
+++ b/pmstestsuite/library/standard/special_vars.py |
| 78 |
@@ -7,8 +7,6 @@ from pmstestsuite.library.standard.dbus_case import DBusEbuildTestCase |
| 79 |
class InheritedVariableTest(DBusEbuildTestCase): |
| 80 |
""" INHERITED variable definition test. """ |
| 81 |
|
| 82 |
- relevant_eapis = (0,) |
| 83 |
- |
| 84 |
phase_funcs = { |
| 85 |
'src_compile': [ |
| 86 |
'pms-test-dbus_append_result "${INHERITED}"' |
| 87 |
@@ -23,7 +21,7 @@ class InheritedVariableTest(DBusEbuildTestCase): |
| 88 |
class RDependFallbackTest(DBusEbuildTestCase): |
| 89 |
""" Test whether RDEPEND=${DEPEND} fallback works as expected. """ |
| 90 |
|
| 91 |
- relevant_eapis = (0, 3, 4) |
| 92 |
+ relevant_eapis = (3, 4) |
| 93 |
ebuild_vars = { |
| 94 |
# that one shall be pretty portable |
| 95 |
'DEPEND': 'virtual/libc' |
| 96 |
@@ -39,7 +37,7 @@ class RDependFallbackTest(DBusEbuildTestCase): |
| 97 |
class DefinedPhasesTest(DBusEbuildTestCase): |
| 98 |
""" Test whether DEFINED_PHASES are declared in EAPI 4. """ |
| 99 |
|
| 100 |
- relevant_eapis = (4,) |
| 101 |
+ supported_eapis = (4,) |
| 102 |
phase_funcs = { |
| 103 |
'pkg_setup': [ |
| 104 |
':' |
| 105 |
|
| 106 |
diff --git a/pmstestsuite/library/standard/variable_scope.py b/pmstestsuite/library/standard/variable_scope.py |
| 107 |
index bd78554..3bd7b94 100644 |
| 108 |
--- a/pmstestsuite/library/standard/variable_scope.py |
| 109 |
+++ b/pmstestsuite/library/standard/variable_scope.py |
| 110 |
@@ -9,7 +9,6 @@ from pmstestsuite.library.standard.dbus_case import DBusEbuildTestCase |
| 111 |
class VariableScopeTest(DBusEbuildTestCase): |
| 112 |
""" A test for scoping of variables. """ |
| 113 |
|
| 114 |
- relevant_eapis = (0,) |
| 115 |
ebuild_vars = { |
| 116 |
'GLOBAL_TEST': 'foo' |
| 117 |
} |
| 118 |
|
| 119 |
diff --git a/pmstestsuite/library/standard/workdir_fallback.py b/pmstestsuite/library/standard/workdir_fallback.py |
| 120 |
index 96cd2e8..d1fdd18 100644 |
| 121 |
--- a/pmstestsuite/library/standard/workdir_fallback.py |
| 122 |
+++ b/pmstestsuite/library/standard/workdir_fallback.py |
| 123 |
@@ -7,7 +7,7 @@ from pmstestsuite.library.standard.ext_cases import DBusFetchingEbuildTestCase |
| 124 |
class WorkdirFallbackTest(DBusFetchingEbuildTestCase): |
| 125 |
""" S=${WORKDIR} fallback test. """ |
| 126 |
|
| 127 |
- relevant_eapis = (2, 4) |
| 128 |
+ relevant_eapis = (3, 4) |
| 129 |
|
| 130 |
# In order to disallow S=${WORKDIR} fallback, we need to: |
| 131 |
# 1) have something in ${A} (i.e. fetch something), |
Archives