* [gentoo-commits] proj/pms-test-suite:master commit in: PMSTestSuite/library/standard/basic/
@ 2011-05-31 19:18 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2011-05-31 19:18 UTC (permalink / raw
To: gentoo-commits
commit: 9b3181199100d54d19a112f600a2c89a8094b48e
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 19:05:11 2011 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 31 19:05:11 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=9b318119
Fix expected results in phase function order test.
---
.../library/standard/basic/phase_function_order.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/PMSTestSuite/library/standard/basic/phase_function_order.py b/PMSTestSuite/library/standard/basic/phase_function_order.py
index c8ca950..d46837c 100644
--- a/PMSTestSuite/library/standard/basic/phase_function_order.py
+++ b/PMSTestSuite/library/standard/basic/phase_function_order.py
@@ -27,8 +27,8 @@ pkg_postinst"""
expect = """pkg_setup
src_unpack
src_prepare
-src_compile
src_configure
+src_compile
src_install
pkg_preinst
pkg_postinst"""
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/pms-test-suite:master commit in: PMSTestSuite/library/standard/basic/
@ 2011-05-31 21:06 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2011-05-31 21:06 UTC (permalink / raw
To: gentoo-commits
commit: 64b9ef07fabef514d48f47fde0f8a66913a53822
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 21:03:39 2011 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 31 21:03:39 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=64b9ef07
phase-function-order: fix EAPI 4 expected results.
---
.../library/standard/basic/phase_function_order.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/PMSTestSuite/library/standard/basic/phase_function_order.py b/PMSTestSuite/library/standard/basic/phase_function_order.py
index d46837c..4bc9104 100644
--- a/PMSTestSuite/library/standard/basic/phase_function_order.py
+++ b/PMSTestSuite/library/standard/basic/phase_function_order.py
@@ -37,8 +37,8 @@ pkg_postinst"""
pkg_setup
src_unpack
src_prepare
-src_compile
src_configure
+src_compile
src_install
pkg_preinst
pkg_postinst"""
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/pms-test-suite:master commit in: PMSTestSuite/library/standard/basic/
@ 2011-06-14 8:32 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2011-06-14 8:32 UTC (permalink / raw
To: gentoo-commits
commit: 13078838744312067437202f67692d397111a26b
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 07:38:13 2011 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 07:38:13 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=13078838
Use pre-generated phase functions instead of referring to list.
---
.../library/standard/basic/phase_function_order.py | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/PMSTestSuite/library/standard/basic/phase_function_order.py b/PMSTestSuite/library/standard/basic/phase_function_order.py
index cf4dd0a..8475d72 100644
--- a/PMSTestSuite/library/standard/basic/phase_function_order.py
+++ b/PMSTestSuite/library/standard/basic/phase_function_order.py
@@ -2,7 +2,6 @@
# (c) 2011 Michał Górny <mgorny@gentoo.org>
# Released under the terms of the 2-clause BSD license.
-from PMSTestSuite.library.case import phase_func_names
from PMSTestSuite.library.standard.dbus_case import DBusEbuildTestCase
class PhaseFunctionOrderTest(DBusEbuildTestCase):
@@ -12,9 +11,10 @@ class PhaseFunctionOrderTest(DBusEbuildTestCase):
'DESCRIPTION': 'Phase function execution order test'
}
- phase_funcs = dict([(x, [
- "pms-test-dbus_append_result %s" % x
- ]) for x in phase_func_names])
+ def __init__(self, *args, **kwargs):
+ DBusEbuildTestCase.__init__(self, *args, **kwargs)
+ for k, lines in self.phase_funcs.items():
+ lines.append('pms-test-dbus_append_result %s' % k)
def check_dbus_result(self, output, res):
if self.eapi < 2:
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/pms-test-suite:master commit in: PMSTestSuite/library/standard/basic/
@ 2011-06-14 8:32 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2011-06-14 8:32 UTC (permalink / raw
To: gentoo-commits
commit: e8da4c1622a8ccfee625e319e869641c4f2cb4d8
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 08:32:15 2011 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 08:32:15 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=e8da4c16
Make DependTest actually work.
---
PMSTestSuite/library/standard/basic/depend.py | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/PMSTestSuite/library/standard/basic/depend.py b/PMSTestSuite/library/standard/basic/depend.py
index 5bafd90..c477427 100644
--- a/PMSTestSuite/library/standard/basic/depend.py
+++ b/PMSTestSuite/library/standard/basic/depend.py
@@ -8,10 +8,26 @@ from PMSTestSuite.library.depend_case import EbuildDependencyTestCase
class EbuildToucher(DBusEbuildTestCase):
""" Touched file installer (for dependency tests). """
- pass
+ def __init__(self, *args, **kwargs):
+ DBusEbuildTestCase.__init__(self, *args, **kwargs)
+ self.phase_funcs['src_unpack'].append(
+ '''cat >> mytrue.sh <<_EOF_
+#!/bin/sh
+true
+_EOF_'''
+ )
+ self.phase_funcs['src_install'].append(
+ 'newbin mytrue.sh pms-test-suite-%s || die' % id(self)
+ )
class DependTest(EbuildDependencyTestCase):
""" DEPEND fulfilling test. """
relevant_eapis = (0,)
depend_classes = [EbuildToucher]
+
+ def __init__(self, *args, **kwargs):
+ EbuildDependencyTestCase.__init__(self, *args, **kwargs)
+ self.phase_funcs['src_compile'].append(
+ 'pms-test-suite-%s || die' % id(self.depend_objs[0])
+ )
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/pms-test-suite:master commit in: PMSTestSuite/library/standard/basic/
@ 2011-06-14 12:35 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2011-06-14 12:35 UTC (permalink / raw
To: gentoo-commits
commit: 0bc403b5e2576ba75e6c09bf2537da3a0c75cbf8
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 12:13:52 2011 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 12:13:52 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=0bc403b5
Use object id as EbuildToucher's PV.
---
PMSTestSuite/library/standard/basic/depend.py | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/PMSTestSuite/library/standard/basic/depend.py b/PMSTestSuite/library/standard/basic/depend.py
index c477427..171b6f0 100644
--- a/PMSTestSuite/library/standard/basic/depend.py
+++ b/PMSTestSuite/library/standard/basic/depend.py
@@ -8,6 +8,10 @@ from PMSTestSuite.library.depend_case import EbuildDependencyTestCase
class EbuildToucher(DBusEbuildTestCase):
""" Touched file installer (for dependency tests). """
+ @property
+ def pv(self):
+ return id(self)
+
def __init__(self, *args, **kwargs):
DBusEbuildTestCase.__init__(self, *args, **kwargs)
self.phase_funcs['src_unpack'].append(
@@ -17,7 +21,7 @@ true
_EOF_'''
)
self.phase_funcs['src_install'].append(
- 'newbin mytrue.sh pms-test-suite-%s || die' % id(self)
+ 'newbin mytrue.sh pms-test-suite-%s || die' % self.pv
)
class DependTest(EbuildDependencyTestCase):
@@ -29,5 +33,5 @@ class DependTest(EbuildDependencyTestCase):
def __init__(self, *args, **kwargs):
EbuildDependencyTestCase.__init__(self, *args, **kwargs)
self.phase_funcs['src_compile'].append(
- 'pms-test-suite-%s || die' % id(self.depend_objs[0])
+ 'pms-test-suite-%s || die' % self.depend_objs[0].pv
)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/pms-test-suite:master commit in: PMSTestSuite/library/standard/basic/
@ 2011-06-17 5:59 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2011-06-17 5:59 UTC (permalink / raw
To: gentoo-commits
commit: d07323a5b44cfb6cdafc6d938cce18942f7d2d46
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 17 05:58:47 2011 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jun 17 05:59:24 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=d07323a5
Ensure phase function order tests were merged.
---
.../library/standard/basic/phase_function_order.py | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/PMSTestSuite/library/standard/basic/phase_function_order.py b/PMSTestSuite/library/standard/basic/phase_function_order.py
index b829349..7a439e9 100644
--- a/PMSTestSuite/library/standard/basic/phase_function_order.py
+++ b/PMSTestSuite/library/standard/basic/phase_function_order.py
@@ -14,7 +14,7 @@ class PhaseFunctionOrderTest(DBusEbuildTestCase):
for k, lines in self.phase_funcs.items():
lines.append('pms-test-dbus_append_result %s' % k)
- def check_dbus_result(self, output, res):
+ def check_dbus_result(self, output, pm):
if self.eapi < 2:
expect = """pkg_setup
src_unpack
@@ -42,4 +42,5 @@ src_install
pkg_preinst
pkg_postinst"""
- return (output == expect)
+ return (output == expect) \
+ and DBusEbuildTestCase.check_dbus_result(self, output, pm)
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-06-17 5:59 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-31 19:18 [gentoo-commits] proj/pms-test-suite:master commit in: PMSTestSuite/library/standard/basic/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2011-05-31 21:06 Michał Górny
2011-06-14 8:32 Michał Górny
2011-06-14 8:32 Michał Górny
2011-06-14 12:35 Michał Górny
2011-06-17 5:59 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox