Skip to content

Commit 36fd267

Browse files
Ferenc-Ferenc-
committed
test: Refactor to use TC provided assert methods
Signed-off-by: Ferenc Géczi <[email protected]>
1 parent 52318d7 commit 36fd267

File tree

1 file changed

+85
-85
lines changed

1 file changed

+85
-85
lines changed

‎tests/platforms/test_host_collector.py‎

Lines changed: 85 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -53,100 +53,100 @@ def test_prepare_payload_basics(self):
5353
self.create_agent_and_setup_tracer()
5454

5555
payload = self.agent.collector.prepare_payload()
56-
assert (payload)
57-
58-
assert (len(payload.keys()) == 3)
59-
assert ('spans' in payload)
60-
assert (isinstance(payload['spans'], list))
61-
assert (len(payload['spans']) == 0)
62-
assert ('metrics' in payload)
63-
assert (len(payload['metrics'].keys()) == 1)
64-
assert ('plugins' in payload['metrics'])
65-
assert (isinstance(payload['metrics']['plugins'], list))
66-
assert (len(payload['metrics']['plugins']) == 1)
56+
self.assertTrue(payload)
57+
58+
self.assertEqual(len(payload.keys()), 3)
59+
self.assertIn('spans', payload)
60+
self.assertIsInstance(payload['spans'], list)
61+
self.assertEqual(len(payload['spans']), 0)
62+
self.assertIn('metrics', payload)
63+
self.assertEqual(len(payload['metrics'].keys()), 1)
64+
self.assertIn('plugins', payload['metrics'])
65+
self.assertIsInstance(payload['metrics']['plugins'], list)
66+
self.assertEqual(len(payload['metrics']['plugins']), 1)
6767

6868
python_plugin = payload['metrics']['plugins'][0]
69-
assert python_plugin['name'] == 'com.instana.plugin.python'
70-
assert python_plugin['entityId'] == str(os.getpid())
71-
assert 'data' in python_plugin
72-
assert 'snapshot' in python_plugin['data']
73-
assert 'metrics' in python_plugin['data']
69+
self.assertEqual(python_plugin['name'], 'com.instana.plugin.python')
70+
self.assertEqual(python_plugin['entityId'], str(os.getpid()))
71+
self.assertIn('data', python_plugin)
72+
self.assertIn('snapshot', python_plugin['data'])
73+
self.assertIn('metrics', python_plugin['data'])
7474

7575
# Validate that all metrics are reported on the first run
76-
assert 'ru_utime' in python_plugin['data']['metrics']
77-
assert type(python_plugin['data']['metrics']['ru_utime']) in [float, int]
78-
assert 'ru_stime' in python_plugin['data']['metrics']
79-
assert type(python_plugin['data']['metrics']['ru_stime']) in [float, int]
80-
assert 'ru_maxrss' in python_plugin['data']['metrics']
81-
assert type(python_plugin['data']['metrics']['ru_maxrss']) in [float, int]
82-
assert 'ru_ixrss' in python_plugin['data']['metrics']
83-
assert type(python_plugin['data']['metrics']['ru_ixrss']) in [float, int]
84-
assert 'ru_idrss' in python_plugin['data']['metrics']
85-
assert type(python_plugin['data']['metrics']['ru_idrss']) in [float, int]
86-
assert 'ru_isrss' in python_plugin['data']['metrics']
87-
assert type(python_plugin['data']['metrics']['ru_isrss']) in [float, int]
88-
assert 'ru_minflt' in python_plugin['data']['metrics']
89-
assert type(python_plugin['data']['metrics']['ru_minflt']) in [float, int]
90-
assert 'ru_majflt' in python_plugin['data']['metrics']
91-
assert type(python_plugin['data']['metrics']['ru_majflt']) in [float, int]
92-
assert 'ru_nswap' in python_plugin['data']['metrics']
93-
assert type(python_plugin['data']['metrics']['ru_nswap']) in [float, int]
94-
assert 'ru_inblock' in python_plugin['data']['metrics']
95-
assert type(python_plugin['data']['metrics']['ru_inblock']) in [float, int]
96-
assert 'ru_oublock' in python_plugin['data']['metrics']
97-
assert type(python_plugin['data']['metrics']['ru_oublock']) in [float, int]
98-
assert 'ru_msgsnd' in python_plugin['data']['metrics']
99-
assert type(python_plugin['data']['metrics']['ru_msgsnd']) in [float, int]
100-
assert 'ru_msgrcv' in python_plugin['data']['metrics']
101-
assert type(python_plugin['data']['metrics']['ru_msgrcv']) in [float, int]
102-
assert 'ru_nsignals' in python_plugin['data']['metrics']
103-
assert type(python_plugin['data']['metrics']['ru_nsignals']) in [float, int]
104-
assert 'ru_nvcsw' in python_plugin['data']['metrics']
105-
assert type(python_plugin['data']['metrics']['ru_nvcsw']) in [float, int]
106-
assert 'ru_nivcsw' in python_plugin['data']['metrics']
107-
assert type(python_plugin['data']['metrics']['ru_nivcsw']) in [float, int]
108-
assert 'alive_threads' in python_plugin['data']['metrics']
109-
assert type(python_plugin['data']['metrics']['alive_threads']) in [float, int]
110-
assert 'dummy_threads' in python_plugin['data']['metrics']
111-
assert type(python_plugin['data']['metrics']['dummy_threads']) in [float, int]
112-
assert 'daemon_threads' in python_plugin['data']['metrics']
113-
assert type(python_plugin['data']['metrics']['daemon_threads']) in [float, int]
114-
115-
assert 'gc' in python_plugin['data']['metrics']
116-
assert isinstance(python_plugin['data']['metrics']['gc'], dict)
117-
assert 'collect0' in python_plugin['data']['metrics']['gc']
118-
assert type(python_plugin['data']['metrics']['gc']['collect0']) in [float, int]
119-
assert 'collect1' in python_plugin['data']['metrics']['gc']
120-
assert type(python_plugin['data']['metrics']['gc']['collect1']) in [float, int]
121-
assert 'collect2' in python_plugin['data']['metrics']['gc']
122-
assert type(python_plugin['data']['metrics']['gc']['collect2']) in [float, int]
123-
assert 'threshold0' in python_plugin['data']['metrics']['gc']
124-
assert type(python_plugin['data']['metrics']['gc']['threshold0']) in [float, int]
125-
assert 'threshold1' in python_plugin['data']['metrics']['gc']
126-
assert type(python_plugin['data']['metrics']['gc']['threshold1']) in [float, int]
127-
assert 'threshold2' in python_plugin['data']['metrics']['gc']
128-
assert type(python_plugin['data']['metrics']['gc']['threshold2']) in [float, int]
76+
self.assertIn('ru_utime', python_plugin['data']['metrics'])
77+
self.assertIn(type(python_plugin['data']['metrics']['ru_utime']), [float, int])
78+
self.assertIn('ru_stime', python_plugin['data']['metrics'])
79+
self.assertIn(type(python_plugin['data']['metrics']['ru_stime']), [float, int])
80+
self.assertIn('ru_maxrss', python_plugin['data']['metrics'])
81+
self.assertIn(type(python_plugin['data']['metrics']['ru_maxrss']), [float, int])
82+
self.assertIn('ru_ixrss', python_plugin['data']['metrics'])
83+
self.assertIn(type(python_plugin['data']['metrics']['ru_ixrss']), [float, int])
84+
self.assertIn('ru_idrss', python_plugin['data']['metrics'])
85+
self.assertIn(type(python_plugin['data']['metrics']['ru_idrss']), [float, int])
86+
self.assertIn('ru_isrss', python_plugin['data']['metrics'])
87+
self.assertIn(type(python_plugin['data']['metrics']['ru_isrss']), [float, int])
88+
self.assertIn('ru_minflt', python_plugin['data']['metrics'])
89+
self.assertIn(type(python_plugin['data']['metrics']['ru_minflt']), [float, int])
90+
self.assertIn('ru_majflt', python_plugin['data']['metrics'])
91+
self.assertIn(type(python_plugin['data']['metrics']['ru_majflt']), [float, int])
92+
self.assertIn('ru_nswap', python_plugin['data']['metrics'])
93+
self.assertIn(type(python_plugin['data']['metrics']['ru_nswap']), [float, int])
94+
self.assertIn('ru_inblock', python_plugin['data']['metrics'])
95+
self.assertIn(type(python_plugin['data']['metrics']['ru_inblock']), [float, int])
96+
self.assertIn('ru_oublock', python_plugin['data']['metrics'])
97+
self.assertIn(type(python_plugin['data']['metrics']['ru_oublock']), [float, int])
98+
self.assertIn('ru_msgsnd', python_plugin['data']['metrics'])
99+
self.assertIn(type(python_plugin['data']['metrics']['ru_msgsnd']), [float, int])
100+
self.assertIn('ru_msgrcv', python_plugin['data']['metrics'])
101+
self.assertIn(type(python_plugin['data']['metrics']['ru_msgrcv']), [float, int])
102+
self.assertIn('ru_nsignals', python_plugin['data']['metrics'])
103+
self.assertIn(type(python_plugin['data']['metrics']['ru_nsignals']), [float, int])
104+
self.assertIn('ru_nvcsw', python_plugin['data']['metrics'])
105+
self.assertIn(type(python_plugin['data']['metrics']['ru_nvcsw']), [float, int])
106+
self.assertIn('ru_nivcsw', python_plugin['data']['metrics'])
107+
self.assertIn(type(python_plugin['data']['metrics']['ru_nivcsw']), [float, int])
108+
self.assertIn('alive_threads', python_plugin['data']['metrics'])
109+
self.assertIn(type(python_plugin['data']['metrics']['alive_threads']), [float, int])
110+
self.assertIn('dummy_threads', python_plugin['data']['metrics'])
111+
self.assertIn(type(python_plugin['data']['metrics']['dummy_threads']), [float, int])
112+
self.assertIn('daemon_threads', python_plugin['data']['metrics'])
113+
self.assertIn(type(python_plugin['data']['metrics']['daemon_threads']), [float, int])
114+
115+
self.assertIn('gc', python_plugin['data']['metrics'])
116+
self.assertIsInstance(python_plugin['data']['metrics']['gc'], dict)
117+
self.assertIn('collect0', python_plugin['data']['metrics']['gc'])
118+
self.assertIn(type(python_plugin['data']['metrics']['gc']['collect0']), [float, int])
119+
self.assertIn('collect1', python_plugin['data']['metrics']['gc'])
120+
self.assertIn(type(python_plugin['data']['metrics']['gc']['collect1']), [float, int])
121+
self.assertIn('collect2', python_plugin['data']['metrics']['gc'])
122+
self.assertIn(type(python_plugin['data']['metrics']['gc']['collect2']), [float, int])
123+
self.assertIn('threshold0', python_plugin['data']['metrics']['gc'])
124+
self.assertIn(type(python_plugin['data']['metrics']['gc']['threshold0']), [float, int])
125+
self.assertIn('threshold1', python_plugin['data']['metrics']['gc'])
126+
self.assertIn(type(python_plugin['data']['metrics']['gc']['threshold1']), [float, int])
127+
self.assertIn('threshold2', python_plugin['data']['metrics']['gc'])
128+
self.assertIn(type(python_plugin['data']['metrics']['gc']['threshold2']), [float, int])
129129

130130
def test_prepare_payload_basics_disable_runtime_metrics(self):
131131
os.environ["INSTANA_DISABLE_METRICS_COLLECTION"] = "TRUE"
132132
self.create_agent_and_setup_tracer()
133133

134134
payload = self.agent.collector.prepare_payload()
135-
assert (payload)
136-
137-
assert (len(payload.keys()) == 3)
138-
assert ('spans' in payload)
139-
assert (isinstance(payload['spans'], list))
140-
assert (len(payload['spans']) == 0)
141-
assert ('metrics' in payload)
142-
assert (len(payload['metrics'].keys()) == 1)
143-
assert ('plugins' in payload['metrics'])
144-
assert (isinstance(payload['metrics']['plugins'], list))
145-
assert (len(payload['metrics']['plugins']) == 1)
135+
self.assertTrue(payload)
136+
137+
self.assertEqual(len(payload.keys()), 3)
138+
self.assertIn('spans', payload)
139+
self.assertIsInstance(payload['spans'], list)
140+
self.assertEqual(len(payload['spans']), 0)
141+
self.assertIn('metrics', payload)
142+
self.assertEqual(len(payload['metrics'].keys()), 1)
143+
self.assertIn('plugins', payload['metrics'])
144+
self.assertIsInstance(payload['metrics']['plugins'], list)
145+
self.assertEqual(len(payload['metrics']['plugins']), 1)
146146

147147
python_plugin = payload['metrics']['plugins'][0]
148-
assert python_plugin['name'] == 'com.instana.plugin.python'
149-
assert python_plugin['entityId'] == str(os.getpid())
150-
assert 'data' in python_plugin
151-
assert 'snapshot' in python_plugin['data']
152-
assert 'metrics' not in python_plugin['data']
148+
self.assertEqual(python_plugin['name'], 'com.instana.plugin.python')
149+
self.assertEqual(python_plugin['entityId'], str(os.getpid()))
150+
self.assertIn('data', python_plugin)
151+
self.assertIn('snapshot', python_plugin['data'])
152+
self.assertNotIn('metrics', python_plugin['data'])

0 commit comments

Comments
 (0)