From b99110aae3aa73ea033e48da9e6c4e4c7dc6e3f8 Mon Sep 17 00:00:00 2001 From: David Dworken Date: Sat, 23 Dec 2023 15:09:39 -0800 Subject: [PATCH] Update goldens to split them based on OS so they can run on GH actions --- client/testdata/TestTui-Exit | 3 --- client/testdata/TestTui-Exit-darwin | 3 +++ client/testdata/TestTui-Exit-linux | 3 +++ client/testdata/testControlR-ControlC-bash | 2 -- client/testdata/testControlR-ControlC-bash-darwin | 2 ++ client/testdata/testControlR-ControlC-bash-linux | 2 ++ client/testdata/testControlR-ControlC-zsh | 1 - client/testdata/testControlR-ControlC-zsh-darwin | 1 + client/testdata/testControlR-ControlC-zsh-linux | 1 + client/testdata/testControlR-fish-Disabled | 3 --- client/testdata/testControlR-fish-Disabled-darwin | 6 ++++++ client/testdata/testControlR-fish-Disabled-linux | 6 ++++++ client/testdata/testUninstall-post-uninstall-bash | 8 -------- client/testdata/testUninstall-post-uninstall-bash-darwin | 8 ++++++++ client/testdata/testUninstall-post-uninstall-bash-linux | 8 ++++++++ client/testdata/testUninstall-post-uninstall-zsh | 7 ------- client/testdata/testUninstall-post-uninstall-zsh-darwin | 7 +++++++ client/testdata/testUninstall-post-uninstall-zsh-linux | 7 +++++++ 18 files changed, 54 insertions(+), 24 deletions(-) delete mode 100644 client/testdata/TestTui-Exit create mode 100644 client/testdata/TestTui-Exit-darwin create mode 100644 client/testdata/TestTui-Exit-linux delete mode 100644 client/testdata/testControlR-ControlC-bash create mode 100644 client/testdata/testControlR-ControlC-bash-darwin create mode 100644 client/testdata/testControlR-ControlC-bash-linux delete mode 100644 client/testdata/testControlR-ControlC-zsh create mode 100644 client/testdata/testControlR-ControlC-zsh-darwin create mode 100644 client/testdata/testControlR-ControlC-zsh-linux delete mode 100644 client/testdata/testControlR-fish-Disabled create mode 100644 client/testdata/testControlR-fish-Disabled-darwin create mode 100644 client/testdata/testControlR-fish-Disabled-linux delete mode 100644 client/testdata/testUninstall-post-uninstall-bash create mode 100644 client/testdata/testUninstall-post-uninstall-bash-darwin create mode 100644 client/testdata/testUninstall-post-uninstall-bash-linux delete mode 100644 client/testdata/testUninstall-post-uninstall-zsh create mode 100644 client/testdata/testUninstall-post-uninstall-zsh-darwin create mode 100644 client/testdata/testUninstall-post-uninstall-zsh-linux diff --git a/client/testdata/TestTui-Exit b/client/testdata/TestTui-Exit deleted file mode 100644 index 7a05853..0000000 --- a/client/testdata/TestTui-Exit +++ /dev/null @@ -1,3 +0,0 @@ -ghaction-runner-hostname% hishtory tquery - -ghaction-runner-hostname% \ No newline at end of file diff --git a/client/testdata/TestTui-Exit-darwin b/client/testdata/TestTui-Exit-darwin new file mode 100644 index 0000000..85f9bb6 --- /dev/null +++ b/client/testdata/TestTui-Exit-darwin @@ -0,0 +1,3 @@ +runner@ghaction-runner-hostname hishtory % hishtory tquery + +runner@ghaction-runner-hostname hishtory % \ No newline at end of file diff --git a/client/testdata/TestTui-Exit-linux b/client/testdata/TestTui-Exit-linux new file mode 100644 index 0000000..85f9bb6 --- /dev/null +++ b/client/testdata/TestTui-Exit-linux @@ -0,0 +1,3 @@ +runner@ghaction-runner-hostname hishtory % hishtory tquery + +runner@ghaction-runner-hostname hishtory % \ No newline at end of file diff --git a/client/testdata/testControlR-ControlC-bash b/client/testdata/testControlR-ControlC-bash deleted file mode 100644 index bf7db3c..0000000 --- a/client/testdata/testControlR-ControlC-bash +++ /dev/null @@ -1,2 +0,0 @@ -runner@ghaction-runner-hostname:~/work/hishtory/hishtory$ source /home/runner/.bashrc -runner@ghaction-runner-hostname:~/work/hishtory/hishtory$ echo \ No newline at end of file diff --git a/client/testdata/testControlR-ControlC-bash-darwin b/client/testdata/testControlR-ControlC-bash-darwin new file mode 100644 index 0000000..3ca36ad --- /dev/null +++ b/client/testdata/testControlR-ControlC-bash-darwin @@ -0,0 +1,2 @@ +bash-5.2$ source /Users/runner/.bashrc +bash-5.2$ echo \ No newline at end of file diff --git a/client/testdata/testControlR-ControlC-bash-linux b/client/testdata/testControlR-ControlC-bash-linux new file mode 100644 index 0000000..3ca36ad --- /dev/null +++ b/client/testdata/testControlR-ControlC-bash-linux @@ -0,0 +1,2 @@ +bash-5.2$ source /Users/runner/.bashrc +bash-5.2$ echo \ No newline at end of file diff --git a/client/testdata/testControlR-ControlC-zsh b/client/testdata/testControlR-ControlC-zsh deleted file mode 100644 index ef2d9c3..0000000 --- a/client/testdata/testControlR-ControlC-zsh +++ /dev/null @@ -1 +0,0 @@ -ghaction-runner-hostname% echo \ No newline at end of file diff --git a/client/testdata/testControlR-ControlC-zsh-darwin b/client/testdata/testControlR-ControlC-zsh-darwin new file mode 100644 index 0000000..aab83b8 --- /dev/null +++ b/client/testdata/testControlR-ControlC-zsh-darwin @@ -0,0 +1 @@ +runner@ghaction-runner-hostname hishtory % echo \ No newline at end of file diff --git a/client/testdata/testControlR-ControlC-zsh-linux b/client/testdata/testControlR-ControlC-zsh-linux new file mode 100644 index 0000000..aab83b8 --- /dev/null +++ b/client/testdata/testControlR-ControlC-zsh-linux @@ -0,0 +1 @@ +runner@ghaction-runner-hostname hishtory % echo \ No newline at end of file diff --git a/client/testdata/testControlR-fish-Disabled b/client/testdata/testControlR-fish-Disabled deleted file mode 100644 index 1e046d4..0000000 --- a/client/testdata/testControlR-fish-Disabled +++ /dev/null @@ -1,3 +0,0 @@ -Welcome to fish, the friendly interactive shell -Type help for instructions on how to use fish -david@Davids-MacBook-Air ~/c/hishtory (master)> \ No newline at end of file diff --git a/client/testdata/testControlR-fish-Disabled-darwin b/client/testdata/testControlR-fish-Disabled-darwin new file mode 100644 index 0000000..c4eafa6 --- /dev/null +++ b/client/testdata/testControlR-fish-Disabled-darwin @@ -0,0 +1,6 @@ +Welcome to fish, the friendly interactive shell +Type help for instructions on how to use fish +runner@ghaction-runner-hostname ~/w/h/hishtory ((eacb8793))> echo 'aaaaaa bbbb' +search: +► echo 'aaaaaa bbbb' ► set -emo pipefail ► hishtory config-set enable-control-r true ► /tmp/client install +► hishtory export ► HISHTORY_REDACT_FORCE=true hishtory redact set emo pipefail ► hishtory disable \ No newline at end of file diff --git a/client/testdata/testControlR-fish-Disabled-linux b/client/testdata/testControlR-fish-Disabled-linux new file mode 100644 index 0000000..c4eafa6 --- /dev/null +++ b/client/testdata/testControlR-fish-Disabled-linux @@ -0,0 +1,6 @@ +Welcome to fish, the friendly interactive shell +Type help for instructions on how to use fish +runner@ghaction-runner-hostname ~/w/h/hishtory ((eacb8793))> echo 'aaaaaa bbbb' +search: +► echo 'aaaaaa bbbb' ► set -emo pipefail ► hishtory config-set enable-control-r true ► /tmp/client install +► hishtory export ► HISHTORY_REDACT_FORCE=true hishtory redact set emo pipefail ► hishtory disable \ No newline at end of file diff --git a/client/testdata/testUninstall-post-uninstall-bash b/client/testdata/testUninstall-post-uninstall-bash deleted file mode 100644 index 6da7f8e..0000000 --- a/client/testdata/testUninstall-post-uninstall-bash +++ /dev/null @@ -1,8 +0,0 @@ -runner@ghaction-runner-hostname:~/work/hishtory/hishtory$ source /home/runner/.bashrc -runner@ghaction-runner-hostname:~/work/hishtory/hishtory$ echo foo -foo -runner@ghaction-runner-hostname:~/work/hishtory/hishtory$ hishtory -hishtory: command not found -runner@ghaction-runner-hostname:~/work/hishtory/hishtory$ echo bar -bar -runner@ghaction-runner-hostname:~/work/hishtory/hishtory$ \ No newline at end of file diff --git a/client/testdata/testUninstall-post-uninstall-bash-darwin b/client/testdata/testUninstall-post-uninstall-bash-darwin new file mode 100644 index 0000000..7d12ebe --- /dev/null +++ b/client/testdata/testUninstall-post-uninstall-bash-darwin @@ -0,0 +1,8 @@ +bash-5.2$ source /Users/runner/.bashrc +bash-5.2$ echo foo +foo +bash-5.2$ hishtory +bash: hishtory: command not found +bash-5.2$ echo bar +bar +bash-5.2$ \ No newline at end of file diff --git a/client/testdata/testUninstall-post-uninstall-bash-linux b/client/testdata/testUninstall-post-uninstall-bash-linux new file mode 100644 index 0000000..7d12ebe --- /dev/null +++ b/client/testdata/testUninstall-post-uninstall-bash-linux @@ -0,0 +1,8 @@ +bash-5.2$ source /Users/runner/.bashrc +bash-5.2$ echo foo +foo +bash-5.2$ hishtory +bash: hishtory: command not found +bash-5.2$ echo bar +bar +bash-5.2$ \ No newline at end of file diff --git a/client/testdata/testUninstall-post-uninstall-zsh b/client/testdata/testUninstall-post-uninstall-zsh deleted file mode 100644 index f6e0539..0000000 --- a/client/testdata/testUninstall-post-uninstall-zsh +++ /dev/null @@ -1,7 +0,0 @@ -ghaction-runner-hostname% echo foo -foo -ghaction-runner-hostname% hishtory -zsh: command not found: hishtory -ghaction-runner-hostname% echo bar -bar -ghaction-runner-hostname% \ No newline at end of file diff --git a/client/testdata/testUninstall-post-uninstall-zsh-darwin b/client/testdata/testUninstall-post-uninstall-zsh-darwin new file mode 100644 index 0000000..fc345eb --- /dev/null +++ b/client/testdata/testUninstall-post-uninstall-zsh-darwin @@ -0,0 +1,7 @@ +runner@ghaction-runner-hostname hishtory % echo foo +foo +runner@ghaction-runner-hostname hishtory % hishtory +zsh: command not found: hishtory +runner@ghaction-runner-hostname hishtory % echo bar +bar +runner@ghaction-runner-hostname hishtory % \ No newline at end of file diff --git a/client/testdata/testUninstall-post-uninstall-zsh-linux b/client/testdata/testUninstall-post-uninstall-zsh-linux new file mode 100644 index 0000000..fc345eb --- /dev/null +++ b/client/testdata/testUninstall-post-uninstall-zsh-linux @@ -0,0 +1,7 @@ +runner@ghaction-runner-hostname hishtory % echo foo +foo +runner@ghaction-runner-hostname hishtory % hishtory +zsh: command not found: hishtory +runner@ghaction-runner-hostname hishtory % echo bar +bar +runner@ghaction-runner-hostname hishtory % \ No newline at end of file