From 134feb4747f38793127a32b5032b7a9363a13a16 Mon Sep 17 00:00:00 2001
From: Laurier Loiselle <lal@xiphos.com>
Date: Wed, 25 Jan 2023 13:27:58 -0500
Subject: [PATCH] tools: build_examples: call cli directly instead of using
 runner

---
 src/wireviz/tools/build_examples.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/wireviz/tools/build_examples.py b/src/wireviz/tools/build_examples.py
index fa651cd..c51c0cf 100755
--- a/src/wireviz/tools/build_examples.py
+++ b/src/wireviz/tools/build_examples.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import argparse
-from click.testing import CliRunner
+import click
 import os
 import sys
 from pathlib import Path
@@ -53,7 +53,6 @@ def collect_filenames(description, groupkey, ext_list):
 
 
 def build_generated(groupkeys):
-    runner = CliRunner()
     for key in groupkeys:
         # preparation
         path = groups[key]["path"]
@@ -65,13 +64,12 @@ def build_generated(groupkeys):
                 out.write(f'# {groups[key]["title"]}\n\n')
         # collect and iterate input YAML files
         for yaml_file in collect_filenames("Building", key, input_extensions):
-            res = runner.invoke(cli, args=[
-                '--format', 'ghpst',
-                str(yaml_file)
-            ])
-            if res.exit_code != 0:
+            try:
+                res = cli(['--format', 'ghpst', str(yaml_file)])
+            except BaseException as e:
+                if str(e) != '0' and not isinstance(e, (click.ClickException, SystemExit)):
+                    raise
 
-                raise RuntimeError(f'Cli failed for {yaml_file} with result: {res}') from res.exception
             if build_readme:
                 i = "".join(filter(str.isdigit, yaml_file.stem))