From d1cd83bf0bd150c72e86de2f7b34e86f7865286d Mon Sep 17 00:00:00 2001 From: Dominik Ritter Date: Sun, 7 Oct 2018 00:01:45 +0200 Subject: [PATCH 1/2] Fix tests It seems like Travis changed their infrastructure. We need to unset SSH_TTY and SSH_CLIENT to get the tests working again. --- test/segments/context.spec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/segments/context.spec b/test/segments/context.spec index 07300370..4dec526a 100755 --- a/test/segments/context.spec +++ b/test/segments/context.spec @@ -21,6 +21,11 @@ function tearDown() { } function testContextSegmentDoesNotGetRenderedWithDefaultUser() { + # Fix leaked state for travis + unset POWERLEVEL9K_CONTEXT_ALWAYS_SHOW + unset SSH_CLIENT + unset SSH_TTY + local DEFAULT_USER=$(whoami) local POWERLEVEL9K_CUSTOM_WORLD='echo world' local -a POWERLEVEL9K_LEFT_PROMPT_ELEMENTS @@ -99,6 +104,11 @@ function testContextSegmentIsShownIfDefaultUserIsSetWhenForced() { } function testContextSegmentIsShownIfForced() { + # Fix leaked state for travis + unset POWERLEVEL9K_CONTEXT_ALWAYS_SHOW + unset SSH_CLIENT + unset SSH_TTY + local -a POWERLEVEL9K_LEFT_PROMPT_ELEMENTS POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(context) local POWERLEVEL9K_ALWAYS_SHOW_USER=true From d831f12126374b0d1ba2207e24fa9749e795779f Mon Sep 17 00:00:00 2001 From: Dominik Ritter Date: Sun, 7 Oct 2018 07:45:02 +0200 Subject: [PATCH 2/2] Do not throw away users configuration --- test/segments/context.spec | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/test/segments/context.spec b/test/segments/context.spec index 4dec526a..25c355a7 100755 --- a/test/segments/context.spec +++ b/test/segments/context.spec @@ -11,21 +11,34 @@ function setUp() { # Test specific settings OLD_DEFAULT_USER=$DEFAULT_USER unset DEFAULT_USER + + # Fix leaked state for travis + OLD_POWERLEVEL9K_CONTEXT_ALWAYS_SHOW=$POWERLEVEL9K_CONTEXT_ALWAYS_SHOW + unset POWERLEVEL9K_CONTEXT_ALWAYS_SHOW + OLD_SSH_CLIENT=$SSH_CLIENT + unset SSH_CLIENT + OLD_SSH_TTY=$SSH_TTY + unset SSH_TTY } function tearDown() { # Restore old variables [[ -n "$OLD_DEFAULT_USER" ]] && DEFAULT_USER=$OLD_DEFAULT_USER + unset OLD_DEFAULT_USER + + [[ -n "$OLD_POWERLEVEL9K_CONTEXT_ALWAYS_SHOW" ]] && POWERLEVEL9K_CONTEXT_ALWAYS_SHOW=$OLD_POWERLEVEL9K_CONTEXT_ALWAYS_SHOW + unset OLD_POWERLEVEL9K_CONTEXT_ALWAYS_SHOW + + [[ -n "$OLD_SSH_CLIENT" ]] && SSH_CLIENT=$OLD_SSH_CLIENT + unset OLD_SSH_CLIENT + + [[ -n "$OLD_SSH_TTY" ]] && SSH_TTY=$OLD_SSH_TTY + unset OLD_SSH_TTY return 0 } function testContextSegmentDoesNotGetRenderedWithDefaultUser() { - # Fix leaked state for travis - unset POWERLEVEL9K_CONTEXT_ALWAYS_SHOW - unset SSH_CLIENT - unset SSH_TTY - local DEFAULT_USER=$(whoami) local POWERLEVEL9K_CUSTOM_WORLD='echo world' local -a POWERLEVEL9K_LEFT_PROMPT_ELEMENTS @@ -104,11 +117,6 @@ function testContextSegmentIsShownIfDefaultUserIsSetWhenForced() { } function testContextSegmentIsShownIfForced() { - # Fix leaked state for travis - unset POWERLEVEL9K_CONTEXT_ALWAYS_SHOW - unset SSH_CLIENT - unset SSH_TTY - local -a POWERLEVEL9K_LEFT_PROMPT_ELEMENTS POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(context) local POWERLEVEL9K_ALWAYS_SHOW_USER=true