Remove remaining basic asserts

This commit is contained in:
Christophe Bedard 2019-06-24 14:34:05 +02:00
parent d6d5e943a7
commit 711c22664d
2 changed files with 8 additions and 8 deletions

View file

@ -99,9 +99,9 @@ class TestIntra(TraceTestCase):
# Check is_intra_process field value # Check is_intra_process field value
start_event_intra = start_events_intra[0] start_event_intra = start_events_intra[0]
is_intra_value_intra = self.get_field(start_event_intra, 'is_intra_process') self.assertFieldEquals(
self.assertEqual( start_event_intra,
is_intra_value_intra, 'is_intra_process',
1, 1,
'is_intra_process field value not valid for intra callback') 'is_intra_process field value not valid for intra callback')
@ -115,9 +115,9 @@ class TestIntra(TraceTestCase):
1, 1,
'none or more than one normal start event') 'none or more than one normal start event')
start_event_not_intra = start_events_not_intra[0] start_event_not_intra = start_events_not_intra[0]
is_intra_value_not_intra = self.get_field(start_event_not_intra, 'is_intra_process') self.assertFieldEquals(
self.assertEqual( start_event_not_intra,
is_intra_value_not_intra, 'is_intra_process',
0, 0,
'is_intra_process field value not valid for normal callback') 'is_intra_process field value not valid for normal callback')

View file

@ -51,7 +51,7 @@ class TestTimer(TraceTestCase):
for event in start_events: for event in start_events:
self.assertValidHandle(event, 'callback') self.assertValidHandle(event, 'callback')
# Should not be 1 for timer # Should not be 1 for timer
self.assertEqual( self.assertFieldEquals(
event, event,
'is_intra_process', 'is_intra_process',
0, 0,
@ -63,7 +63,7 @@ class TestTimer(TraceTestCase):
# Find and check given timer period # Find and check given timer period
test_timer_init_event = self.get_events_with_procname('test_timer', init_events) test_timer_init_event = self.get_events_with_procname('test_timer', init_events)
self.assertEqual(len(test_timer_init_event), 1) self.assertNumEvents(test_timer_init_event, 1, 'none or more test timer init events')
test_init_event = test_timer_init_event[0] test_init_event = test_timer_init_event[0]
self.assertFieldEquals(test_init_event, 'period', 1000000, 'invalid period') self.assertFieldEquals(test_init_event, 'period', 1000000, 'invalid period')