修复测试用例在 Swoole 4.3 的进程残留问题

Yurunsoft · Jul 30, 2019 · 49fbd49 · 49fbd49
1 parent 4ac5241
commit 49fbd49
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -22,9 +22,16 @@
         }
     },
     "scripts": {
-      "test": "php ./tests/phpunit -c ./tests/phpunit.xml",
-      "install-test": "composer install && composer test",
-      "test-no-dev": "phpunit -c ./tests/phpunit.xml",
-      "install-test-no-dev": "php ./.travis/composer-no-phpunit.php && composer install && composer test-no-dev"
+        "test": "@php ./tests/phpunit -c ./tests/phpunit.xml",
+        "install-test": [
+            "@composer install",
+            "@composer test"
+        ],
+        "test-no-dev": "phpunit -c ./tests/phpunit.xml",
+        "install-test-no-dev": [
+            "@php ./.travis/composer-no-phpunit.php",
+            "@composer install",
+            "@composer test-no-dev"
+        ]
     }
 }
diff --git a/tests/server/WebSocket/stop-server.sh b/tests/server/WebSocket/stop-server.sh
@@ -10,7 +10,7 @@ if [ -f $pidFile ];then
         ret=$(ps --no-heading ${LINE} | wc -l)
         if [[ "$ret" = "1" ]]; then
             echo "PID: ${LINE}"
-            kill -9 ${LINE}
+            kill -15 ${LINE}
         fi
         break
     done