Refactor- added teardown decorator

Author: kiran-chaudhary

integration/test_alerts.py

@@ -1,7 +1,7 @@
 import json
 
 from integration import run_command
-from integration.util import cleanup
+from integration.util import cleanup_after_validation
 
 
 def _parse_response(response):
@@ -18,13 +18,16 @@ def test_alert_prints_to_stdout_and_filters_result_between_given_date():
         assert record["createdAt"].startswith("2020-05-18") 
 
 
+def _validate_severity(response):
+    parsed_response = _parse_response(response)
+    for record in parsed_response:
+        assert record["severity"] == "MEDIUM"
+
+
+@cleanup_after_validation("./integration/alerts")
 def test_alert_writes_to_file_and_filters_result_by_severity():
-    command = "code42 alerts write-to ./integration/alerts -b 2020-05-18 -e " \
-              "2020-05-20 --severity MEDIUM"
+    command = "code42 alerts write-to ./integration/alerts -b 2020-05-18 -e 2020-05-20 " \
+              "--severity MEDIUM"
     return_code, response = run_command(command)
     assert return_code is 0
-    with cleanup("./integration/alerts") as f:
-        response = f.read()
-        parsed_response = _parse_response(response)
-        for record in parsed_response:
-            assert record["severity"] == "MEDIUM"
+    return _validate_severity

integration/util.py

@@ -10,3 +10,14 @@ def __enter__(self):
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         run_command("rm -f {}".format(self.filename))
+
+
+def cleanup_after_validation(filename):
+    def wrap(test_function):
+        def wrapper():
+            validate = test_function()
+            with cleanup(filename) as f:
+                response = f.read()
+                validate(response)
+        return wrapper
+    return wrap