test: Fix getting username in non-login shells

scop · scop · commit 6ae330f1ab90 · 2018-03-17T10:13:33.000+02:00
$USER is not set in a non-login shell, prefer id -un over it.
diff --git a/test/unit/__expand_tilde_by_ref.exp b/test/unit/__expand_tilde_by_ref.exp
@@ -6,7 +6,7 @@ proc setup {home user} {
     save_env
     assert_bash_exec {echo "$HOME"} {} /@ _home
     set _home [string trim $_home]
-    assert_bash_exec {echo "$USER"} {} /@ _user
+    assert_bash_exec {id -un 2>/dev/null || echo "$USER"} {} /@ _user
     set _user [string trim $_user]
 }
 
diff --git a/test/unit/_expand.exp b/test/unit/_expand.exp
@@ -4,7 +4,7 @@ proc setup {home user} {
     save_env
     assert_bash_exec {echo "$HOME"} {} /@ _home
     set _home [string trim $_home]
-    assert_bash_exec {echo "$USER"} {} /@ _user
+    assert_bash_exec {id -un 2>/dev/null || echo "$USER"} {} /@ _user
     set _user [string trim $_user]
 }
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ proc setup {home user} {`
`6`	`6`	`save_env`
`7`	`7`	`assert_bash_exec {echo "$HOME"} {} /@ _home`
`8`	`8`	`set _home [string trim $_home]`
`9`		`- assert_bash_exec {echo "$USER"} {} /@ _user`
	`9`	`+ assert_bash_exec {id -un 2>/dev/null \|\| echo "$USER"} {} /@ _user`
`10`	`10`	`set _user [string trim $_user]`
`11`	`11`	`}`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ proc setup {home user} {`
`4`	`4`	`save_env`
`5`	`5`	`assert_bash_exec {echo "$HOME"} {} /@ _home`
`6`	`6`	`set _home [string trim $_home]`
`7`		`- assert_bash_exec {echo "$USER"} {} /@ _user`
	`7`	`+ assert_bash_exec {id -un 2>/dev/null \|\| echo "$USER"} {} /@ _user`
`8`	`8`	`set _user [string trim $_user]`
`9`	`9`	`}`
`10`	`10`