This is an automated email from the ASF dual-hosted git repository.
jin pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-hugegraph-computer.git
commit fe358d365374db0849126dbd904885b73aa10b84
Author: wenyuxuan <wenyuxuan@#baidu.com>
AuthorDate: Sun Apr 27 15:34:15 2025 +0800
fix functional test
---
vermeer/config/default.ini | 30 ++++++++++++++----------------
vermeer/config/master.ini | 30 ++++++++++++++----------------
vermeer/config/supervisor.conf | 29 ++++++++++++++---------------
vermeer/config/worker.ini | 30 ++++++++++++++----------------
vermeer/config/worker01.ini | 29 ++++++++++++++---------------
vermeer/config/worker02.ini | 30 ++++++++++++++----------------
vermeer/config/worker03.ini | 30 ++++++++++++++----------------
vermeer/test/functional/test_function.go | 8 ++++----
8 files changed, 102 insertions(+), 114 deletions(-)
diff --git a/vermeer/config/default.ini b/vermeer/config/default.ini
index 68eff333..1568a437 100644
--- a/vermeer/config/default.ini
+++ b/vermeer/config/default.ini
@@ -1,20 +1,18 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+; Licensed to the Apache Software Foundation (ASF) under one or more
+; contributor license agreements. See the NOTICE file distributed with
+; this work for additional information regarding copyright ownership.
+; The ASF licenses this file to You under the Apache License, Version 2.0
+; (the "License"); you may not use this file except in compliance with
+; the License. You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
[default]
log_level=debug
debug_mode=debug
diff --git a/vermeer/config/master.ini b/vermeer/config/master.ini
index d3b45103..d5897031 100644
--- a/vermeer/config/master.ini
+++ b/vermeer/config/master.ini
@@ -1,20 +1,18 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+; Licensed to the Apache Software Foundation (ASF) under one or more
+; contributor license agreements. See the NOTICE file distributed with
+; this work for additional information regarding copyright ownership.
+; The ASF licenses this file to You under the Apache License, Version 2.0
+; (the "License"); you may not use this file except in compliance with
+; the License. You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
[default]
log_level=info
debug_mode=release
diff --git a/vermeer/config/supervisor.conf b/vermeer/config/supervisor.conf
index 7b466216..a61db9d8 100644
--- a/vermeer/config/supervisor.conf
+++ b/vermeer/config/supervisor.conf
@@ -1,19 +1,18 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+; Licensed to the Apache Software Foundation (ASF) under one or more
+; contributor license agreements. See the NOTICE file distributed with
+; this work for additional information regarding copyright ownership.
+; The ASF licenses this file to You under the Apache License, Version 2.0
+; (the "License"); you may not use this file except in compliance with
+; the License. You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
[inet_http_server]
port=:8999
diff --git a/vermeer/config/worker.ini b/vermeer/config/worker.ini
index 20fd278d..4385e820 100644
--- a/vermeer/config/worker.ini
+++ b/vermeer/config/worker.ini
@@ -1,19 +1,17 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
+; Licensed to the Apache Software Foundation (ASF) under one or more
+; contributor license agreements. See the NOTICE file distributed with
+; this work for additional information regarding copyright ownership.
+; The ASF licenses this file to You under the Apache License, Version 2.0
+; (the "License"); you may not use this file except in compliance with
+; the License. You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
[default]
log_level=info
diff --git a/vermeer/config/worker01.ini b/vermeer/config/worker01.ini
index a0b0ec82..cc5833d7 100644
--- a/vermeer/config/worker01.ini
+++ b/vermeer/config/worker01.ini
@@ -1,19 +1,18 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+; Licensed to the Apache Software Foundation (ASF) under one or more
+; contributor license agreements. See the NOTICE file distributed with
+; this work for additional information regarding copyright ownership.
+; The ASF licenses this file to You under the Apache License, Version 2.0
+; (the "License"); you may not use this file except in compliance with
+; the License. You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
[default]
log_level=info
debug_mode=release
diff --git a/vermeer/config/worker02.ini b/vermeer/config/worker02.ini
index cfa2057a..b9fc7782 100644
--- a/vermeer/config/worker02.ini
+++ b/vermeer/config/worker02.ini
@@ -1,19 +1,17 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
+; Licensed to the Apache Software Foundation (ASF) under one or more
+; contributor license agreements. See the NOTICE file distributed with
+; this work for additional information regarding copyright ownership.
+; The ASF licenses this file to You under the Apache License, Version 2.0
+; (the "License"); you may not use this file except in compliance with
+; the License. You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
[default]
log_level=info
diff --git a/vermeer/config/worker03.ini b/vermeer/config/worker03.ini
index c60c57d3..0c1d6f7d 100644
--- a/vermeer/config/worker03.ini
+++ b/vermeer/config/worker03.ini
@@ -1,20 +1,18 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+; Licensed to the Apache Software Foundation (ASF) under one or more
+; contributor license agreements. See the NOTICE file distributed with
+; this work for additional information regarding copyright ownership.
+; The ASF licenses this file to You under the Apache License, Version 2.0
+; (the "License"); you may not use this file except in compliance with
+; the License. You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
[default]
log_level=info
debug_mode=release
diff --git a/vermeer/test/functional/test_function.go
b/vermeer/test/functional/test_function.go
index d1174be3..9128edba 100644
--- a/vermeer/test/functional/test_function.go
+++ b/vermeer/test/functional/test_function.go
@@ -211,11 +211,11 @@ func TestFunction(t *testing.T, expectResPath string,
masterHttpAddr string, gra
time.Sleep(1 * time.Second)
fmt.Print("killing master\n")
- output, err := exec.Command("./vermeer.sh", "stop", "master").Output()
+ output, err := exec.Command("sh", "vermeer.sh", "stop",
"master").Output()
fmt.Println(string(output))
require.NoError(t, err)
time.Sleep(3 * time.Second)
- _, err = exec.Command("./vermeer.sh", "start", "master").Output()
+ _, err = exec.Command("sh", "vermeer.sh", "start", "master").Output()
require.NoError(t, err)
time.Sleep(1 * time.Second)
isAvailable := false
@@ -265,10 +265,10 @@ func TestFunction(t *testing.T, expectResPath string,
masterHttpAddr string, gra
fmt.Print("kill master recover success\n")
fmt.Print("killing worker\n")
- _, err = exec.Command("./vermeer.sh", "stop", "worker").Output()
+ _, err = exec.Command("sh", "vermeer.sh", "stop", "worker").Output()
require.NoError(t, err)
time.Sleep(5 * time.Second)
- _, err = exec.Command("./vermeer.sh", "start", "worker").Output()
+ _, err = exec.Command("sh", "vermeer.sh", "start", "worker").Output()
require.NoError(t, err)
isAvailable = false
for i := 0; i < 10; i++ {
