@@ -86,33 +86,33 @@ func TestSetWinsize(t *testing.T) {
86
86
87
87
func TestGetFdInfo (t * testing.T ) {
88
88
tty := newTTYForTest (t )
89
- inFd , isTerminal := GetFdInfo (tty )
89
+ inFd , isTerm := GetFdInfo (tty )
90
90
if inFd != tty .Fd () {
91
91
t .Errorf ("expected: %d, got: %d" , tty .Fd (), inFd )
92
92
}
93
- if ! isTerminal {
94
- t .Error ("expected isTerminal to be true " )
93
+ if ! isTerm {
94
+ t .Error ("expected file-descriptor to be a terminal " )
95
95
}
96
96
tmpFile := newTempFile (t )
97
- inFd , isTerminal = GetFdInfo (tmpFile )
97
+ inFd , isTerm = GetFdInfo (tmpFile )
98
98
if inFd != tmpFile .Fd () {
99
99
t .Errorf ("expected: %d, got: %d" , tty .Fd (), inFd )
100
100
}
101
- if isTerminal {
102
- t .Error ("expected isTerminal to be false " )
101
+ if isTerm {
102
+ t .Error ("expected file-descriptor to not be a terminal " )
103
103
}
104
104
}
105
105
106
106
func TestIsTerminal (t * testing.T ) {
107
107
tty := newTTYForTest (t )
108
- isTerminal := IsTerminal (tty .Fd ())
109
- if ! isTerminal {
110
- t .Fatalf ("expected isTerminal to be true " )
108
+ isTerm := IsTerminal (tty .Fd ())
109
+ if ! isTerm {
110
+ t .Error ("expected file-descriptor to be a terminal " )
111
111
}
112
112
tmpFile := newTempFile (t )
113
- isTerminal = IsTerminal (tmpFile .Fd ())
114
- if isTerminal {
115
- t .Fatalf ("expected isTerminal to be false " )
113
+ isTerm = IsTerminal (tmpFile .Fd ())
114
+ if isTerm {
115
+ t .Error ("expected file-descriptor to not be a terminal " )
116
116
}
117
117
}
118
118
@@ -135,7 +135,11 @@ func TestSaveState(t *testing.T) {
135
135
func TestDisableEcho (t * testing.T ) {
136
136
tty := newTTYForTest (t )
137
137
state , err := SetRawTerminal (tty .Fd ())
138
- defer RestoreTerminal (tty .Fd (), state )
138
+ defer func () {
139
+ if err := RestoreTerminal (tty .Fd (), state ); err != nil {
140
+ t .Error (err )
141
+ }
142
+ }()
139
143
if err != nil {
140
144
t .Error (err )
141
145
}
0 commit comments