Skip to content

Commit 0fe5e63

Browse files
committed
fix unit tests
1 parent a3023b0 commit 0fe5e63

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

cmd/run.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,11 @@ See also https://github.com/LinuxSuRen/api-testing/tree/master/sample`,
135135
const caseFilter = "case-filter"
136136

137137
func (o *runOption) preRunE(cmd *cobra.Command, args []string) (err error) {
138-
o.context = context.WithValue(cmd.Context(), caseFilter, o.caseFilter)
138+
ctx := o.context
139+
if ctx == nil {
140+
ctx = context.Background()
141+
}
142+
o.context = context.WithValue(ctx, caseFilter, o.caseFilter)
139143
writer := cmd.OutOrStdout()
140144

141145
if o.reportFile != "" && !strings.HasPrefix(o.reportFile, "http://") && !strings.HasPrefix(o.reportFile, "https://") {
@@ -349,7 +353,10 @@ func (o *runOption) runSuite(loader testing.Loader, dataContext map[string]inter
349353
suiteRunner.WithOutputWriter(os.Stdout)
350354
suiteRunner.WithWriteLevel(o.level)
351355
suiteRunner.WithSuite(testSuite)
352-
caseFilter := o.context.Value(caseFilter)
356+
var caseFilter interface{}
357+
if o.context != nil {
358+
caseFilter = o.context.Value(caseFilter)
359+
}
353360
runLogger.Info("run test suite", "name", testSuite.Name, "filter", caseFilter)
354361
for _, testCase := range testSuite.Items {
355362
if caseFilter != nil && !strings.Contains(testCase.Name, caseFilter.(string)) {

pkg/server/remote_server_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ func TestRunTestCase(t *testing.T) {
148148
})
149149
assert.NoError(t, err)
150150
assert.Equal(t, sampleBody, result.Body)
151-
assert.Contains(t, result.Output, "request method: GET")
151+
assert.Contains(t, result.Output, "with method GET")
152152
assert.Contains(t, result.Output, "request header")
153153
assert.Contains(t, result.Output, "start to send request to http://foo")
154154
assert.Contains(t, result.Output, "test case \"get\", status code: 200")

0 commit comments

Comments
 (0)