fix(cadcclient): more robust switching of stdout

Author: tjzegmott

dtcli/utilities/cadcclient.py

@@ -239,20 +239,23 @@ def size(directory: str, namespace: str = "cadc:CHIMEFRB", timeout: int = 60) ->
     query = query.replace("//", "/")
     logger.info(f"Running query: {query}")
     buffer = StringIO()
-    sys.stdout = buffer
-    _, _, queryClient = _connect()
-    queryClient.query(  # type: ignore
-        query=query,
-        output_file=None,
-        response_format="csv",
-        tmptable=None,
-        lang="ADQL",
-        timeout=timeout,
-        data_only=True,
-        no_column_names=True,
-    )
-    content = buffer.getvalue()
-    sys.stdout = sys.__stdout__
+    original_stdout = sys.stdout
+    try:
+        sys.stdout = buffer
+        _, _, queryClient = _connect()
+        queryClient.query(  # type: ignore
+            query=query,
+            output_file=None,
+            response_format="csv",
+            tmptable=None,
+            lang="ADQL",
+            timeout=timeout,
+            data_only=True,
+            no_column_names=True,
+        )
+        content = buffer.getvalue()
+    finally:
+        sys.stdout = original_stdout
     return float(content.split("\n")[0])
 
 

tests/test_cli.py

@@ -39,7 +39,7 @@ def test_cli_help(runner: CliRunner) -> None:
     Args:
         runner (CliRunner) -> None: Click runner.
     """
-    result = runner.invoke(datatrail)
+    result = runner.invoke(datatrail, "--help")
     expected_response = """Usage: cli [OPTIONS] COMMAND [ARGS]...
 
   Datatrail Command Line Interface.
@@ -66,7 +66,7 @@ def test_cli_config_help(runner: CliRunner) -> None:
     Args:
         runner (CliRunner) -> None: Click runner.
     """
-    result = runner.invoke(datatrail, ["config"])
+    result = runner.invoke(datatrail, ["config", "--help"])
     expected_response = """Usage: cli config [OPTIONS] COMMAND [ARGS]...
 
   Datatrail CLI Configuration.