Browse Source

Merge "Remove 'trait list' from the method of 'test_check_events_and_traits'"

Jenkins 3 years ago
parent
commit
d2f04c2981
1 changed files with 2 additions and 12 deletions
  1. 2
    12
      fuel_health/tests/tests_platform/test_ceilometer.py

+ 2
- 12
fuel_health/tests/tests_platform/test_ceilometer.py View File

@@ -244,8 +244,7 @@ class CeilometerApiPlatformTests(ceilometermanager.CeilometerBaseTest):
244 244
             5. Check event traits description.
245 245
             6. Check that event exists for expected instance.
246 246
             7. Get information about expected event.
247
-            8. Get list of all traits for expected event type and trait name.
248
-            9. Delete the instance.
247
+            8. Delete the instance.
249 248
 
250 249
         Duration: 40 s.
251 250
 
@@ -311,18 +310,9 @@ class CeilometerApiPlatformTests(ceilometermanager.CeilometerBaseTest):
311 310
         self.verify(60, self.ceilometer_client.events.get, 7,
312 311
                     fail_msg, msg, message_id)
313 312
 
314
-        fail_msg = ('Failed to get list of all traits for "{event_type}" '
315
-                    'event type and "{trait_name}" trait name.'.format(
316
-                        event_type=event_type, trait_name=traits[0]))
317
-        msg = ('getting list of all traits for "{event_type}" event type and '
318
-               '"{trait_name}" trait name'.format(event_type=event_type,
319
-                                                  trait_name=traits[0]))
320
-        self.verify(60, self.ceilometer_client.traits.list, 8, fail_msg, msg,
321
-                    event_type, traits[0])
322
-
323 313
         fail_msg = 'Failed to delete the instance.'
324 314
         msg = 'instance deleting'
325
-        self.verify(60, self._delete_server, 9, fail_msg, msg, instance)
315
+        self.verify(60, self._delete_server, 8, fail_msg, msg, instance)
326 316
 
327 317
     @ceilometermanager.check_compute_nodes()
328 318
     def test_check_volume_events(self):

Loading…
Cancel
Save