From: Ray Spear <[email protected]>
Signed-off-by: Raymond Spear <[email protected]>
---
cli/action_common_unittest.py | 14 +++++++++-----
cli/topic_common_unittest.py | 7 +++----
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/cli/action_common_unittest.py b/cli/action_common_unittest.py
index 3f3e33c..0dbeb2a 100755
--- a/cli/action_common_unittest.py
+++ b/cli/action_common_unittest.py
@@ -111,9 +111,10 @@ class atest_list_unittest(cli_mock.cli_unittest):
mytest.execute(op='get_labels',
filters=filters,
check_results=check_results))
+ errors = mytest.failed
(out, err) = self.god.unmock_io()
self.god.check_playback()
- return (out, err)
+ return (out, err, errors)
def test_atest_list_execute_no_filters(self):
@@ -125,7 +126,7 @@ class atest_list_unittest(cli_mock.cli_unittest):
check_results = {}
filters['name__in'] = ['label0', 'label1']
check_results['name__in'] = 'name'
- (out, err) = self._atest_list_execute(filters, check_results)
+ (out, err, errors) = self._atest_list_execute(filters, check_results)
self.assertEqual(err, '')
@@ -134,8 +135,11 @@ class atest_list_unittest(cli_mock.cli_unittest):
check_results = {}
filters['name__in'] = ['label0', 'label1', 'label2']
check_results['name__in'] = 'name'
- (out, err) = self._atest_list_execute(filters, check_results)
- self.assertWords(err, ['Unknown', 'label2'])
+ (out, err, errors) = self._atest_list_execute(filters, check_results)
+ K = errors.keys()[0]
+ V = errors.values()[0].keys()[0]
+ self.assertIn('Unknown',K)
+ self.assertIn('label2',V)
def test_atest_list_execute_items_good_and_bad_no_check(self):
@@ -143,7 +147,7 @@ class atest_list_unittest(cli_mock.cli_unittest):
check_results = {}
filters['name__in'] = ['label0', 'label1', 'label2']
check_results['name__in'] = None
- (out, err) = self._atest_list_execute(filters, check_results)
+ (out, err, errors) = self._atest_list_execute(filters, check_results)
self.assertEqual(err, '')
diff --git a/cli/topic_common_unittest.py b/cli/topic_common_unittest.py
index 59bc180..3d2446d 100755
--- a/cli/topic_common_unittest.py
+++ b/cli/topic_common_unittest.py
@@ -343,10 +343,9 @@ class atest_unittest(cli_mock.cli_unittest):
def test_invalid_arg_continue(self):
- self.god.mock_io()
- self.atest.invalid_arg('This is sort of ok')
- (output, err) = self.god.unmock_io()
- self.assert_(err.find('This is sort of ok') >= 0)
+ # The string will be placed into self.atest.failed
+ self.atest.invalid_arg('This is sort of ok')
+ self.assert_('This is sort of ok' in self.atest.failed.keys())
def test_failure_continue(self):
--
1.7.10.4
_______________________________________________
Autotest mailing list
[email protected]
http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
