From 61a45ff8f7fbd64e1f176f887735cb29371cb2ae Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Tue, 23 May 2023 17:10:19 +0000 Subject: [PATCH] fix: -update flag --- testscript/script_test.go | 6 +++++- testscript/testdata/script/settings.txtar | 5 +++++ testscript/testdata/script/user_management.txtar | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/testscript/script_test.go b/testscript/script_test.go index 74ae3bebefc9949833c1aec13dc2a474819c8903..7b29d75cfbf6db1078ed4f96b89958a3edde4ce9 100644 --- a/testscript/script_test.go +++ b/testscript/script_test.go @@ -2,6 +2,7 @@ package testscript import ( "context" + "flag" "fmt" "path/filepath" "testing" @@ -12,7 +13,10 @@ import ( "github.com/rogpeppe/go-internal/testscript" ) +var update = flag.Bool("update", false, "update script files") + func TestScript(t *testing.T) { + flag.Parse() key, err := filepath.Abs("./testdata/admin1") if err != nil { t.Fatal(err) @@ -20,7 +24,7 @@ func TestScript(t *testing.T) { testscript.Run(t, testscript.Params{ Dir: "testdata/script", - UpdateScripts: true, + UpdateScripts: *update, Cmds: map[string]func(ts *testscript.TestScript, neg bool, args []string){ "soft": func(ts *testscript.TestScript, _ bool, args []string) { args = append([]string{ diff --git a/testscript/testdata/script/settings.txtar b/testscript/testdata/script/settings.txtar index 5118f8fbfafb3165a9bbe0a36bedad70d402b353..8026699a6bd277226ba53bdad1e133183cce2488 100644 --- a/testscript/testdata/script/settings.txtar +++ b/testscript/testdata/script/settings.txtar @@ -1,14 +1,19 @@ +# vi: set ft=conf +# check default allow-keyless soft settings allow-keyless true soft settings allow-keyless cmp stdout allow-keyless1.txt +# change allow-keyless and check soft settings allow-keyless false soft settings allow-keyless cmp stdout allow-keyless2.txt +# check default anon-access soft settings anon-access cmp stdout anon-access1.txt +# chaneg anon-access to all available options, and check them soft settings anon-access no-access soft settings anon-access cmp stdout anon-access2.txt diff --git a/testscript/testdata/script/user_management.txtar b/testscript/testdata/script/user_management.txtar index 9ae73a4da3ebb9e5d355b1fbe810e203cf72fbd6..50fdeb5e2a9b9752b75eb78af817a52fb860a38a 100644 --- a/testscript/testdata/script/user_management.txtar +++ b/testscript/testdata/script/user_management.txtar @@ -1,3 +1,4 @@ +# vi: set ft=conf # add key to admin soft user add-pubkey admin "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPjUeXhBzj18/WZbqcD1aPJlCALzBMMZxhpaU45KgVqL" soft user info admin