Skip to content

Commit e74af38

Browse files
committed
try to make the e2e be more stable
1 parent c5be726 commit e74af38

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

e2e/entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ atest extension --output /usr/local/bin --registry ghcr.io mongodb
3232

3333
echo "start to run server"
3434
nohup atest server --tls-grpc --cert-file test.pem --key-file test.key&
35-
cmd="atest run -p test-suite-common.yaml"
35+
cmd="atest run -p test-suite-common.yaml --request-ignore-error"
3636

3737
echo "start to run testing: $cmd"
3838
kind=orm target=mysql:3306 driver=mysql $cmd

e2e/test-suite-common.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ param:
88
caseName: "{{randAlpha 6}}"
99
gRPCSuiteName: "{{randAlpha 6}}"
1010
gRPCCaseName: "{{randAlpha 6}}"
11-
store: "{{randAlpha 3}}"
11+
store: |
12+
{{randAlpha 6}}-{{env "kind"}}
1213
server: |
1314
{{default "http://localhost:8080" (env "SERVER")}}
1415
items:

pkg/runner/http.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,6 @@ func ammendHeaders(headers http.Header, body []byte) {
237237
if val := headers.Get(util.ContentLength); val == "" {
238238
headers.Add(util.ContentLength, strconv.Itoa(len(body)))
239239
fmt.Printf("add content-length: %d\n", len(body))
240-
} else {
241-
fmt.Printf("content-length already exist: %s\n", val)
242240
}
243241
}
244242

pkg/server/store_ext_manager.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,10 @@ func (s *storeExtManager) startPlugin(socketURL, plugin, pluginName string) (err
134134
_ = os.RemoveAll(socketFile) // always deleting the socket file to avoid start failing
135135

136136
s.lock.Lock()
137-
defer s.lock.Unlock()
138137
s.filesNeedToBeRemoved = append(s.filesNeedToBeRemoved, socketFile)
139138
s.extStatusMap[pluginName] = true
139+
s.lock.Unlock()
140+
140141
if err = s.execer.RunCommandWithIO(plugin, "", os.Stdout, os.Stderr, s.processChan, "--socket", socketFile); err != nil {
141142
serverLogger.Info("failed to start ext manager", "socket", socketURL, "error: ", err.Error())
142143
}

0 commit comments

Comments
 (0)