Gentoo Archives: gentoo-commits

From: "André Erdmann" <dywi@×××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/R_overlay:master commit in: tests/
Date: Sat, 23 Aug 2014 19:03:16
Message-Id: 1408820335.14ce917c1ff12f93894adcd6712a00ca5331e12a.dywi@gentoo
1 commit: 14ce917c1ff12f93894adcd6712a00ca5331e12a
2 Author: André Erdmann <dywi <AT> mailerd <DOT> de>
3 AuthorDate: Sat Aug 23 18:58:55 2014 +0000
4 Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
5 CommitDate: Sat Aug 23 18:58:55 2014 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=14ce917c
7
8 tests/depres.py: print test data identifier
9
10 Helps when tests fail.
11
12 ---
13 tests/depres.py | 12 +++++++-----
14 1 file changed, 7 insertions(+), 5 deletions(-)
15
16 diff --git a/tests/depres.py b/tests/depres.py
17 index 77a6857..238731c 100644
18 --- a/tests/depres.py
19 +++ b/tests/depres.py
20 @@ -61,7 +61,7 @@ class DepresTestCase ( tests.interface.RoverlayInterfaceTestCase ):
21 self.depres.update()
22 # --- end of tearDown (...) ---
23
24 - def do_depres_test ( self, rule_names, test_data ):
25 + def do_depres_test ( self, test_identifier, rule_names, test_data ):
26 unpacked = lambda T: \
27 ( "" if T[0] is None else T[0] ) if T and len ( T ) == 1 else T
28
29 @@ -81,21 +81,21 @@ class DepresTestCase ( tests.interface.RoverlayInterfaceTestCase ):
30
31 self.assertEquals (
32 result, expected_result,
33 - "{!r} should be resolved as {!r} and not {!r}".format (
34 - depstr, expected_result, result
35 + "{!s}: {!r} should be resolved as {!r} and not {!r}".format (
36 + test_identifier, depstr, expected_result, result
37 )
38 )
39 # --- end of do_depres_test (...) ---
40
41 def do_randomized_depres_test (
42 - self, rule_names, test_data, allow_modify=False
43 + self, test_identifier, rule_names, test_data, allow_modify=False
44 ):
45 if allow_modify and isinstance ( test_data, list ):
46 rand_list = test_data
47 else:
48 rand_list = list ( test_data )
49 random.shuffle ( rand_list )
50 - return self.do_depres_test ( rule_names, rand_list )
51 + return self.do_depres_test ( test_identifier, rule_names, rand_list )
52 # --- end of do_randomized_depres_test (...) ---
53
54 def get_depres_include ( self, dataset_name ):
55 @@ -140,6 +140,7 @@ class DepresTestCase ( tests.interface.RoverlayInterfaceTestCase ):
56 def test_depres_static ( self ):
57 for name, test_data in DEPRES_DATA.items():
58 self.do_depres_test (
59 + name,
60 self.get_depres_include ( name ),
61 DEPRES_DATA [test_data] if isinstance ( test_data, str )
62 else test_data
63 @@ -153,6 +154,7 @@ class DepresTestCase ( tests.interface.RoverlayInterfaceTestCase ):
64 for name in data_keys:
65 test_data = DEPRES_DATA [name]
66 self.do_randomized_depres_test (
67 + name,
68 self.get_depres_include ( name ),
69 DEPRES_DATA [test_data] if isinstance ( test_data, str )
70 else test_data