feat: actually run client and server

Also, switch Subplot step functions to Python: it was too hard to
debug failures in the Rust ones.

Sponsored-by: author

3 files changed, 33 insertions, 5 deletions

diff --git a/subplot/benchmark.py b/subplot/benchmark.py
new file mode 100644
index 0000000..5400692
--- /dev/null
+++ b/subplot/benchmark.py
@@ -0,0 +1,28 @@
+import json
+import os
+
+
+def install_rust_program(ctx):
+    runcmd_prepend_to_path = globals()["runcmd_prepend_to_path"]
+    srcdir = globals()["srcdir"]
+
+    # Add the directory with built Rust binaries to the path.
+    default_target = os.path.join(srcdir, "target")
+    target = os.environ.get("CARGO_TARGET_DIR", default_target)
+    runcmd_prepend_to_path(ctx, dirname=os.path.join(target, "debug"))
+
+
+def file_is_at_least_this_long(ctx, filename=None, number=None):
+    st = os.lstat(filename)
+    assert st.st_size >= int(number)
+
+
+def json_files_match(ctx, first=None, second=None):
+    assert_eq = globals()["assert_eq"]
+    first = json.load(open(first))
+    second = json.load(open(second))
+    assert_eq(first, second)
+
+
+def file_is_valid_json(ctx, filename=None):
+    json.load(open(filename))
diff --git a/subplot/benchmark.rs b/subplot/benchmark.rs
index 082e02b..d7eda37 100644
--- a/subplot/benchmark.rs
+++ b/subplot/benchmark.rs
@@ -51,7 +51,7 @@ fn json_files_match(context: &ScenarioContext, first: &str, second: &str) {
             Ok(())
         },
         false,
-    );
+    )?;
 }
 
 #[step]
diff --git a/subplot/benchmark.yaml b/subplot/benchmark.yaml
index dc3a136..f745b23 100644
--- a/subplot/benchmark.yaml
+++ b/subplot/benchmark.yaml
@@ -1,19 +1,19 @@
 - given: an installed Rust program obnam-benchmark
   impl:
-    rust:
+    python:
       function: install_rust_program
 
 - then: JSON files {first} and {second} match
   impl:
-    rust:
+    python:
       function: json_files_match
 
 - then: file {filename} is valid JSON
   impl:
-    rust:
+    python:
       function: file_is_valid_json
 
 - then: file {filename} is at least {number:int} bytes long
   impl:
-    rust:
+    python:
       function: file_is_at_least_this_long