rename "reset" testbed command to "revert"

diff --git a/doc/README.virtualisation-server b/doc/README.virtualisation-server
index 8bcdedf50ba672f3b3fb7139c357ea5d7ffcfa1a..1bb776600ed12677b1b286ab547e0ccea4641b63 100644 (file)
--- a/doc/README.virtualisation-server
+++ b/doc/README.virtualisation-server
@@ -76,7 +76,7 @@ Protocol
 
 
 * Command
-       reset
+       revert
 
   Restores the testbed, undoing all of the changes made so far.
   State: Open, remains Open.  Only available if the `revert'

diff --git a/runner/adt-run b/runner/adt-run
index a01649f319082170257b20e50fda6ead567c214f..0200d34b50e9f68c1e3940b18af542d4707020b0 100755 (executable)
--- a/runner/adt-run
+++ b/runner/adt-run
@@ -606,7 +606,7 @@ class Testbed:
        if 'revert' in tb.caps and (tb.modified or
            [d for d in tb.deps_processed if d not in deps_new]):
                tb._debug('reset **')
-               tb.command('reset')
+               tb.command('revert')
                tb.blamed = []
                for af in tb._ephemeral: af.invalidate(True)
        binaries.publish()
@@ -748,7 +748,7 @@ class Restriction_breaks_testbed(Restriction):
  def __init__(r, rname, base):
        if 'revert' not in testbed.caps:
                raise Unsupported(f.lno,
-                       'Test breaks testbed but testbed cannot reset')
+                       'Test breaks testbed but testbed cannot revert')
 
 class Field_Restrictions(FieldBase):
  def parse(f):

diff --git a/virt-subproc/VirtSubproc.py b/virt-subproc/VirtSubproc.py
index 68fc8c32692d4668a0c160ea8f65bef2611150b1..2c5e4f697df6367af3651d0db627d421ac358619 100644 (file)
--- a/virt-subproc/VirtSubproc.py
+++ b/virt-subproc/VirtSubproc.py
@@ -107,12 +107,12 @@ def cmd_open(c, ce):
        downtmp = caller.hook_open()
        return [downtmp]
 
-def cmd_reset(c, ce):
+def cmd_revert(c, ce):
        cmdnumargs(c, ce)
-       if not downtmp: bomb("`reset' when not open")
+       if not downtmp: bomb("`revert' when not open")
        if not 'revert' in caller.hook_capabilities():
-               bomb("`reset' when `revert' not advertised")
-       caller.hook_reset()
+               bomb("`revert' when `revert' not advertised")
+       caller.hook_revert()
 
 def down_python_script(gobody, functions=''):
        # Many things are made much harder by the inability of

diff --git a/virt-subproc/adt-virt-xenlvm b/virt-subproc/adt-virt-xenlvm
index a6c386d2d54b06e5b73f90094da7d1ad796ba03d..c0f7e851d79371d55f821052dea72575c1f9989d 100755 (executable)
--- a/virt-subproc/adt-virt-xenlvm
+++ b/virt-subproc/adt-virt-xenlvm
@@ -103,7 +103,7 @@ def do_close():
        withholder.stdout.close()
        rc = withholder.wait()
        withholder = None
-       if rc: vsp.bomb("with-testbed failed when closing/resetting,"
+       if rc: vsp.bomb("with-testbed failed when closing/reverting,"
                        " code %d" % rc)
 
 def hook_forked_inchild():
@@ -116,8 +116,8 @@ def hook_open():
        do_open()
        return downtmp
 
-def hook_reset():
-       check_pause('reset')
+def hook_revert():
+       check_pause('revert')
        do_close()
        do_open()