@@ -13,10 +13,7 @@ fn test_normal() {
1313 for ( key, value) in env:: vars ( ) {
1414 println ! ( "{}: {}" , key, value) ;
1515 }
16- if env:: var ( "USER" ) . is_ok ( )
17- && env:: var ( "USER" ) . unwrap ( ) == "runner"
18- && result. stderr . contains ( "failed to get username" )
19- {
16+ if is_ci ( ) && result. stderr . contains ( "failed to get username" ) {
2017 // In the CI, some server are failing to return whoami.
2118 // As seems to be a configuration issue, ignoring it
2219 return ;
@@ -35,10 +32,7 @@ fn test_normal_compare_id() {
3532
3633 println ! ( "result.stdout = {}" , result. stdout) ;
3734 println ! ( "result.stderr = {}" , result. stderr) ;
38- if env:: var ( "USER" ) . is_ok ( )
39- && env:: var ( "USER" ) . unwrap ( ) == "runner"
40- && result. stderr . contains ( "failed to get username" )
41- {
35+ if is_ci ( ) && result. stderr . contains ( "failed to get username" ) {
4236 // In the CI, some server are failing to return whoami.
4337 // As seems to be a configuration issue, ignoring it
4438 return ;
@@ -47,10 +41,7 @@ fn test_normal_compare_id() {
4741 let ts = TestScenario :: new ( "id" ) ;
4842 let id = ts. cmd ( "id" ) . arg ( "-un" ) . run ( ) ;
4943
50- if env:: var ( "USER" ) . is_ok ( )
51- && env:: var ( "USER" ) . unwrap ( ) == "runner"
52- && id. stderr . contains ( "cannot find name for user ID" )
53- {
44+ if is_ci ( ) && id. stderr . contains ( "cannot find name for user ID" ) {
5445 // In the CI, some server are failing to return whoami.
5546 // As seems to be a configuration issue, ignoring it
5647 return ;
0 commit comments