[master] b60d6ebab varnishtest: Remove the err_shell command

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Mon Sep 20 06:53:05 UTC 2021


commit b60d6ebabe760114a26f5f6bf9db97907d798412
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Mon Sep 20 08:19:39 2021 +0200

    varnishtest: Remove the err_shell command
    
    It has been deprecated long enough and could have gone away with the 7.0
    release.
    
    Refs 3fb17e94de3e

diff --git a/bin/varnishtest/cmds.h b/bin/varnishtest/cmds.h
index dccdcf5bb..8afee5140 100644
--- a/bin/varnishtest/cmds.h
+++ b/bin/varnishtest/cmds.h
@@ -43,7 +43,6 @@ CMD_GLOBAL(shell)
   #define CMD_TOP(x)
 #endif
 CMD_TOP(client)
-CMD_TOP(err_shell)
 CMD_TOP(feature)
 CMD_TOP(haproxy)
 #ifdef VTEST_WITH_VTC_LOGEXPECT
diff --git a/bin/varnishtest/vtc_misc.c b/bin/varnishtest/vtc_misc.c
index ac5f6df96..a70d6aa55 100644
--- a/bin/varnishtest/vtc_misc.c
+++ b/bin/varnishtest/vtc_misc.c
@@ -246,34 +246,6 @@ cmd_shell(CMD_ARGS)
 	cmd_shell_engine(vl, ok, av[n], expect, re);
 }
 
-/* SECTION: err_shell err_shell
- *
- * NOTICE: err_shell is deprecated, use `shell -err -expect` instead.
- *
- * This is very similar to the the ``shell`` command, except it takes a first
- * string as argument before the command::
- *
- *         err_shell "foo" "echo foo"
- *
- * err_shell expect the shell command to fail AND stdout to match the string,
- * failing the test case otherwise.
- */
-
-void v_matchproto_(cmd_f)
-cmd_err_shell(CMD_ARGS)
-{
-	(void)priv;
-
-	if (av == NULL)
-		return;
-	AN(av[1]);
-	AN(av[2]);
-	AZ(av[3]);
-	vtc_log(vl, 1,
-	    "NOTICE: err_shell is deprecated, use 'shell -err -expect'");
-	cmd_shell_engine(vl, -1, av[2], av[1], NULL);
-}
-
 /* SECTION: setenv setenv
  *
  * Set or change an environment variable::


More information about the varnish-commit mailing list