Merge branch 'runcmd' into 'main'

simplify steps to run obnam client

See merge request larswirzenius/obnam!130

3 files changed, 2 insertions, 12 deletions

diff --git a/obnam.md b/obnam.md
index c79c952..959415d 100644
--- a/obnam.md
+++ b/obnam.md
@@ -1381,7 +1381,7 @@ and a Unix socket live/socket
 and a named pipe live/pipe
 and a manifest of the directory live in live.yaml
 when I run obnam --config smoke.yaml backup
-when I invoke obnam --config smoke.yaml restore latest rest
+when I run obnam --config smoke.yaml restore latest rest
 given a manifest of the directory live restored in rest in rest.yaml
 then manifests live.yaml and rest.yaml match
 ~~~
@@ -1484,7 +1484,7 @@ given a file live/more.dat containing some random data
 and a manifest of the directory live in second.yaml
 when I run obnam --config metadata.yaml backup
 
-when I invoke obnam --config metadata.yaml restore latest rest
+when I run obnam --config metadata.yaml restore latest rest
 given a manifest of the directory live restored in rest in rest.yaml
 then manifests second.yaml and rest.yaml match
 ~~~
diff --git a/subplot/client.py b/subplot/client.py
index 966324e..90642f3 100644
--- a/subplot/client.py
+++ b/subplot/client.py
@@ -35,10 +35,6 @@ def run_obnam_restore(ctx, filename=None, genid=None, todir=None):
     run_obnam_restore_with_genref(ctx, filename=filename, genref=genid, todir=todir)
 
 
-def run_obnam_restore_latest(ctx, filename=None, todir=None):
-    run_obnam_restore_with_genref(ctx, filename=filename, genref="latest", todir=todir)
-
-
 def run_obnam_restore_with_genref(ctx, filename=None, genref=None, todir=None):
     runcmd_run = globals()["runcmd_run"]
 
diff --git a/subplot/client.yaml b/subplot/client.yaml
index b76b96a..eba9212 100644
--- a/subplot/client.yaml
+++ b/subplot/client.yaml
@@ -5,15 +5,9 @@
 - given: "a client config based on {filename}"
   function: configure_client
 
-- when: "I invoke obnam --config {filename} config"
-  function: run_obnam_config
-
 - when: "I invoke obnam --config {filename} restore <{genid}> {todir}"
   function: run_obnam_restore
 
-- when: "I invoke obnam --config {filename} restore latest {todir}"
-  function: run_obnam_restore_latest
-
 - when: "I invoke obnam --config {filename} get-chunk <{gen_id}>"
   function: run_obnam_get_chunk