Browse Source

add editorconfig

pull/456/head
Anton Kaliaev 8 years ago
parent
commit
d033cd54b8
No known key found for this signature in database GPG Key ID: 7B6881D965918214
2 changed files with 21 additions and 6 deletions
  1. +15
    -0
      .editorconfig
  2. +6
    -6
      test/integration_test.sh

+ 15
- 0
.editorconfig View File

@ -0,0 +1,15 @@
# top-most EditorConfig file
root = true
# Unix-style newlines with a newline ending every file
[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
[Makefile]
indent_style = tab
[*.sh]
indent_style = tab

+ 6
- 6
test/integration_test.sh View File

@ -15,7 +15,7 @@ go build -o rpcserver main.go
echo "==> (Re)starting the server" echo "==> (Re)starting the server"
PID=$(pgrep rpcserver || echo "") PID=$(pgrep rpcserver || echo "")
if [[ $PID != "" ]]; then if [[ $PID != "" ]]; then
kill -9 "$PID"
kill -9 "$PID"
fi fi
./rpcserver & ./rpcserver &
PID=$! PID=$!
@ -51,13 +51,13 @@ echo "==> request with missing params"
R1=$(curl -s 'http://localhost:8008/hello_world') R1=$(curl -s 'http://localhost:8008/hello_world')
R2='{"jsonrpc":"2.0","id":"","result":{"Result":"hi 0"},"error":""}' R2='{"jsonrpc":"2.0","id":"","result":{"Result":"hi 0"},"error":""}'
if [[ "$R1" != "$R2" ]]; then if [[ "$R1" != "$R2" ]]; then
echo "responses are not identical:"
echo "R1: $R1"
echo "R2: $R2"
echo "responses are not identical:"
echo "R1: $R1"
echo "R2: $R2"
echo "FAIL" echo "FAIL"
exit 1
exit 1
else else
echo "OK"
echo "OK"
fi fi
echo "==> request with unquoted string arg" echo "==> request with unquoted string arg"


Loading…
Cancel
Save