Skip to content

Commit 6df844a

Browse files
committed
wrap long lines
Use line continuations to keep lines shorter than 80 columns.
1 parent 770dd4b commit 6df844a

File tree

2 files changed

+24
-11
lines changed

2 files changed

+24
-11
lines changed

tools/build_test_env.sh

+6-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ case $PY_VER in
3333
exit 1;;
3434
esac
3535

36-
docker run --name gitlab-test --detach --publish 8080:80 --publish 2222:22 gpocentek/test-python-gitlab:latest >/dev/null 2>&1
36+
docker run --name gitlab-test --detach --publish 8080:80 \
37+
--publish 2222:22 gpocentek/test-python-gitlab:latest >/dev/null 2>&1
3738

3839
LOGIN='root'
3940
PASSWORD='5iveL!fe'
@@ -46,7 +47,8 @@ echo -n "Waiting for gitlab to come online... "
4647
I=0
4748
while :; do
4849
sleep 5
49-
curl -s http://localhost:8080/users/sign_in 2>/dev/null | grep -q "GitLab Community Edition" && break
50+
curl -s http://localhost:8080/users/sign_in 2>/dev/null \
51+
| grep -q "GitLab Community Edition" && break
5052
let I=I+5
5153
[ $I -eq 120 ] && exit 1
5254
done
@@ -57,7 +59,8 @@ $OK
5759
TOKEN=$(curl -s http://localhost:8080/api/v3/session \
5860
-X POST \
5961
--data "login=$LOGIN&password=$PASSWORD" \
60-
| python -c 'import sys, json; print(json.load(sys.stdin)["private_token"])')
62+
| python -c \
63+
'import sys, json; print(json.load(sys.stdin)["private_token"])')
6164

6265
cat > $CONFIG << EOF
6366
[global]

tools/functional_tests.sh

+18-8
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ sleep 20
4646
set -e
4747

4848
echo -n "Testing project creation... "
49-
PROJECT_ID=$($GITLAB project create --name test-project1 | grep ^id: | cut -d' ' -f2)
49+
PROJECT_ID=$($GITLAB project create --name test-project1 \
50+
| grep ^id: | cut -d' ' -f2)
5051
$GITLAB project list | grep -q test-project1
5152
$OK
5253

@@ -55,7 +56,8 @@ $GITLAB project update --id $PROJECT_ID --description "My New Description"
5556
$OK
5657

5758
echo -n "Testing user creation... "
58-
USER_ID=$($GITLAB user create --email fake@email.com --username user1 --name "User One" --password fakepassword | grep ^id: | cut -d' ' -f2)
59+
USER_ID=$($GITLAB user create --email fake@email.com --username user1 \
60+
--name "User One" --password fakepassword | grep ^id: | cut -d' ' -f2)
5961
$OK
6062

6163
echo -n "Testing verbose output... "
@@ -67,27 +69,35 @@ $GITLAB -v user list | grep -qv config-file
6769
$OK
6870

6971
echo -n "Testing adding member to a project... "
70-
$GITLAB project-member create --project-id $PROJECT_ID --user-id $USER_ID --access-level 40 >/dev/null 2>&1
72+
$GITLAB project-member create --project-id $PROJECT_ID \
73+
--user-id $USER_ID --access-level 40 >/dev/null 2>&1
7174
$OK
7275

7376
echo -n "Testing file creation... "
74-
$GITLAB project-file create --project-id $PROJECT_ID --file-path README --branch-name master --content "CONTENT" --commit-message "Initial commit" >/dev/null 2>&1
77+
$GITLAB project-file create --project-id $PROJECT_ID \
78+
--file-path README --branch-name master --content "CONTENT" \
79+
--commit-message "Initial commit" >/dev/null 2>&1
7580
$OK
7681

7782
echo -n "Testing issue creation... "
78-
ISSUE_ID=$($GITLAB project-issue create --project-id $PROJECT_ID --title "my issue" --description "my issue description" | grep ^id: | cut -d' ' -f2)
83+
ISSUE_ID=$($GITLAB project-issue create --project-id $PROJECT_ID \
84+
--title "my issue" --description "my issue description" \
85+
| grep ^id: | cut -d' ' -f2)
7986
$OK
8087

8188
echo -n "Testing note creation... "
82-
$GITLAB project-issue-note create --project-id $PROJECT_ID --issue-id $ISSUE_ID --body "the body" >/dev/null 2>&1
89+
$GITLAB project-issue-note create --project-id $PROJECT_ID \
90+
--issue-id $ISSUE_ID --body "the body" >/dev/null 2>&1
8391
$OK
8492

8593
echo -n "Testing branch creation... "
86-
$GITLAB project-branch create --project-id $PROJECT_ID --branch-name branch1 --ref master >/dev/null 2>&1
94+
$GITLAB project-branch create --project-id $PROJECT_ID \
95+
--branch-name branch1 --ref master >/dev/null 2>&1
8796
$OK
8897

8998
echo -n "Testing branch deletion... "
90-
$GITLAB project-branch delete --project-id $PROJECT_ID --name branch1 >/dev/null 2>&1
99+
$GITLAB project-branch delete --project-id $PROJECT_ID \
100+
--name branch1 >/dev/null 2>&1
91101
$OK
92102

93103
echo -n "Testing project deletion... "

0 commit comments

Comments
 (0)