ACLP Logs - Reduce integration tests runtime - remove unnecessary updates

Author: sjer-akamai

test/integration/models/monitor/test_monitor_logs.py

@@ -408,8 +408,8 @@ def test_get_stream_by_id(
 
     assert isinstance(stream, LogsStream)
     assert stream.id == provisioned_stream.id
-    assert stream.label == provisioned_stream.label
-    assert stream.status == provisioned_stream.status
+    assert provisioned_stream.label in stream.label
+    assert stream.status in (LogsStreamStatus.active, LogsStreamStatus.inactive)
     assert len(stream.destinations) == 1
 
 
@@ -439,27 +439,17 @@ def test_update_stream_label_and_status(
     result = stream.save()
     assert result is True
 
-    try:
-        updated = test_linode_client.load(LogsStream, provisioned_stream.id)
-        assert updated.label == new_label
-        assert updated.status == new_status
+    updated = test_linode_client.load(LogsStream, provisioned_stream.id)
+    assert updated.label == new_label
+    assert updated.status == new_status
 
-        history = updated.history
-        snapshot_original = next(
-            h for h in history if h.version == version_before
-        )
-        snapshot_updated = next(
-            h for h in history if h.version == updated.version
-        )
+    history = updated.history
+    snapshot_original = next(h for h in history if h.version == version_before)
+    snapshot_updated = next(h for h in history if h.version == updated.version)
 
-        assert snapshot_original.label == original_label
-        assert snapshot_updated.label == new_label
-        assert snapshot_updated.id == provisioned_stream.id
-    finally:
-        # Revert to original label and status
-        stream.label = original_label
-        stream.status = original_status
-        stream.save()
+    assert snapshot_original.label == original_label
+    assert snapshot_updated.label == new_label
+    assert snapshot_updated.id == provisioned_stream.id
 
 
 @_SKIP_STREAM_TESTS
@@ -480,24 +470,15 @@ def test_update_stream_destinations(
     result = stream.update_destinations([create_secondary_destination.id])
     assert result is True
 
-    try:
-        updated = test_linode_client.load(LogsStream, provisioned_stream.id)
-        assert len(updated.destinations) == 1
-        assert updated.destinations[0].id == create_secondary_destination.id
+    updated = test_linode_client.load(LogsStream, provisioned_stream.id)
+    assert len(updated.destinations) == 1
+    assert updated.destinations[0].id == create_secondary_destination.id
 
-        history = updated.history
-        snapshot_original = next(
-            h for h in history if h.version == version_before
-        )
-        snapshot_updated = next(
-            h for h in history if h.version == updated.version
-        )
+    history = updated.history
+    snapshot_original = next(h for h in history if h.version == version_before)
+    snapshot_updated = next(h for h in history if h.version == updated.version)
 
-        assert snapshot_original.destinations[0].id == original_destinations[0]
-        assert (
-            snapshot_updated.destinations[0].id
-            == create_secondary_destination.id
-        )
-    finally:
-        # Revert to original destination
-        stream.update_destinations(original_destinations)
+    assert snapshot_original.destinations[0].id == original_destinations[0]
+    assert (
+        snapshot_updated.destinations[0].id == create_secondary_destination.id
+    )