Skip to content

Commit 7e1cb1e

Browse files
derrickstoleederrickstolee
committed
t9210: differentiate origin and cache servers
Now that we are testing the --<verb>-cache-server options in t9210, we need to be more careful about our variable names to ensure those created in t9210-scalar.sh are different from those set in lib-gvfs-helper.sh. For this we: * Rename variables to use ORIGIN_* for those that host Git repo data. * Update server output files to have more specific names. * Avoid using the default test server port when possible, in preference for a positive shift-by-10k. Signed-off-by: Derrick Stolee <stolee@gmail.com>
1 parent 1dbc089 commit 7e1cb1e

3 files changed

Lines changed: 74 additions & 70 deletions

File tree

‎t/lib-gvfs-helper.sh‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ SHARED_CACHE_T2="$(pwd)"/shared_cache_t2
5858
# The server will shut down if/when we delete it. (This is a little
5959
# easier than killing it by PID.)
6060
#
61-
PID_FILE="$(pwd)"/pid-file.pid
62-
SERVER_LOG="$(pwd)"/OUT.server.log
61+
PID_FILE="$(pwd)"/pid-file-gvfs.pid
62+
SERVER_LOG="$(pwd)"/OUT.gvfs.server.log
6363

6464
# Helper functions to compute port, pid-file, and log for a given
6565
# port increment. An increment of 0 (or empty) uses the base values.
@@ -82,19 +82,19 @@ server_pid_file () {
8282
}
8383

8484
server_log_file () {
85-
local instance="${1:-0}"
85+
local instance="${1:-1}"
8686
if test "$instance" -eq 0
8787
then
8888
echo "$SERVER_LOG"
8989
else
90-
echo "$(pwd)/OUT.server-$instance.log"
90+
echo "$(pwd)/OUT.gvfs.server-$instance.log"
9191
fi
9292
}
9393

9494
# Helper to build a cache-server URL for a given port increment.
9595
#
9696
cache_server_url () {
97-
local instance="${1:-0}"
97+
local instance="${1:-1}"
9898
local port="$(server_port "$instance")"
9999
echo "http://127.0.0.1:$port/servertype/cache"
100100
}
@@ -277,7 +277,7 @@ test_expect_success 'setup repos' '
277277
# Increment 0 uses the base port, 1 uses base+1, etc.
278278
#
279279
stop_gvfs_protocol_server () {
280-
local instance="${1:-0}"
280+
local instance="${1:-1}"
281281
local pid_file="$(server_pid_file "$instance")"
282282
local log_file="$(server_log_file "$instance")"
283283

@@ -294,7 +294,7 @@ stop_gvfs_protocol_server () {
294294
# port before the next test start another instance and it attempts to
295295
# bind to it).
296296
#
297-
for k in 0 1 2 3 4
297+
for k in $(test_seq 5)
298298
do
299299
if grep -q "Starting graceful shutdown" "$log_file"
300300
then
@@ -315,7 +315,7 @@ stop_gvfs_protocol_server () {
315315
# This allows running multiple servers simultaneously on different ports.
316316
#
317317
start_gvfs_protocol_server () {
318-
local instance="${1:-0}"
318+
local instance="${1:-1}"
319319
local port="$(server_port "$instance")"
320320
local pid_file="$(server_pid_file "$instance")"
321321
local log_file="$(server_log_file "$instance")"
@@ -334,7 +334,7 @@ start_gvfs_protocol_server () {
334334
#
335335
# Give it a few seconds to get started.
336336
#
337-
for k in 0 1 2 3 4
337+
for k in $(test_seq 5)
338338
do
339339
if test -f "$pid_file"
340340
then
@@ -375,7 +375,7 @@ start_gvfs_protocol_server_with_mayhem () {
375375
#
376376
# Give it a few seconds to get started.
377377
#
378-
for k in 0 1 2 3 4
378+
for k in $(test_seq 5)
379379
do
380380
if test -f "$PID_FILE"
381381
then
@@ -392,7 +392,7 @@ start_gvfs_protocol_server_with_mayhem () {
392392
# Usage: verify_server_was_contacted [<port_increment>]
393393
#
394394
verify_server_was_contacted () {
395-
local instance="${1:-0}"
395+
local instance="${1:-1}"
396396
local log_file="$(server_log_file "$instance")"
397397
grep -q "Connection from" "$log_file"
398398
}
@@ -401,7 +401,7 @@ verify_server_was_contacted () {
401401
# Usage: verify_server_was_not_contacted [<port_increment>]
402402
#
403403
verify_server_was_not_contacted () {
404-
local instance="${1:-0}"
404+
local instance="${1:-1}"
405405
local log_file="$(server_log_file "$instance")"
406406
! grep -q "Connection from" "$log_file"
407407
}
@@ -529,9 +529,9 @@ verify_vfs_packfile_count () {
529529
}
530530

531531
per_test_cleanup () {
532-
# Stop servers with port increments 0, 1, 2, 3 to handle tests
532+
# Stop servers with port increments 1, 2, 3, 4 to handle tests
533533
# that may use multiple servers.
534-
for instance in 0 1 2 3
534+
for instance in 1 2 3 4
535535
do
536536
stop_gvfs_protocol_server "$instance"
537537
done
@@ -540,7 +540,7 @@ per_test_cleanup () {
540540
rm -rf "$SHARED_CACHE_T1"/info/*
541541
rm -rf "$SHARED_CACHE_T1"/pack/*
542542

543-
rm -rf OUT.*
543+
rm -rf OUT.gvfs.*
544544
return 0
545545
}
546546

‎t/t5795-gvfs-helper-verb-cache.sh‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -22,32 +22,32 @@ test_description='gvfs-helper verb-specific cache-server tests'
2222
test_expect_success 'verb-specific cache-server: prefetch uses gvfs.prefetch.cache-server' '
2323
test_when_finished "per_test_cleanup" &&
2424
test_when_finished "git -C \"$REPO_T1\" config --unset gvfs.prefetch.cache-server" &&
25-
start_gvfs_protocol_server 0 &&
2625
start_gvfs_protocol_server 1 &&
26+
start_gvfs_protocol_server 2 &&
2727
2828
# Configure server 0 as default cache-server and server 1 for prefetch.
2929
git -C "$REPO_T1" config gvfs.cache-server "$(cache_server_url 0)" &&
3030
git -C "$REPO_T1" config gvfs.prefetch.cache-server "$(cache_server_url 1)" &&
3131
32-
# Run prefetch - should go to server 1.
32+
# Run prefetch - should go to server 2.
3333
git -C "$REPO_T1" gvfs-helper \
3434
--cache-server=trust \
3535
--remote=origin \
3636
--no-progress \
3737
prefetch >OUT.output 2>OUT.stderr &&
3838
3939
# Verify server 1 was contacted (prefetch-specific).
40-
verify_server_was_contacted 1 &&
40+
verify_server_was_contacted 2 &&
4141
4242
# Verify server 0 was NOT contacted.
43-
verify_server_was_not_contacted 0
43+
verify_server_was_not_contacted 1
4444
'
4545

4646
test_expect_success 'verb-specific cache-server: get does NOT use gvfs.prefetch.cache-server' '
4747
test_when_finished "per_test_cleanup" &&
4848
test_when_finished "git -C \"$REPO_T1\" config --unset gvfs.prefetch.cache-server" &&
49-
start_gvfs_protocol_server 0 &&
5049
start_gvfs_protocol_server 1 &&
50+
start_gvfs_protocol_server 2 &&
5151
5252
# Configure server 0 as default cache-server and server 1 for prefetch.
5353
git -C "$REPO_T1" config gvfs.cache-server "$(cache_server_url 0)" &&
@@ -61,41 +61,41 @@ test_expect_success 'verb-specific cache-server: get does NOT use gvfs.prefetch.
6161
<"$OID_ONE_BLOB_FILE" >OUT.output 2>OUT.stderr &&
6262
6363
# Verify server 0 was contacted (default cache-server).
64-
verify_server_was_contacted 0 &&
64+
verify_server_was_contacted 1 &&
6565
6666
# Verify server 1 was NOT contacted (prefetch-specific).
67-
verify_server_was_not_contacted 1
67+
verify_server_was_not_contacted 2
6868
'
6969

7070
test_expect_success 'verb-specific cache-server: get uses gvfs.get.cache-server' '
7171
test_when_finished "per_test_cleanup" &&
7272
test_when_finished "git -C \"$REPO_T1\" config --unset gvfs.get.cache-server" &&
73-
start_gvfs_protocol_server 0 &&
7473
start_gvfs_protocol_server 1 &&
74+
start_gvfs_protocol_server 2 &&
7575
7676
# Configure server 0 as default cache-server and server 1 for get.
7777
git -C "$REPO_T1" config gvfs.cache-server "$(cache_server_url 0)" &&
7878
git -C "$REPO_T1" config gvfs.get.cache-server "$(cache_server_url 1)" &&
7979
80-
# Run get - should go to server 1.
80+
# Run get - should go to server 2.
8181
git -C "$REPO_T1" gvfs-helper \
8282
--cache-server=trust \
8383
--remote=origin \
8484
get \
8585
<"$OID_ONE_BLOB_FILE" >OUT.output 2>OUT.stderr &&
8686
8787
# Verify server 1 was contacted (get-specific).
88-
verify_server_was_contacted 1 &&
88+
verify_server_was_contacted 2 &&
8989
9090
# Verify server 0 was NOT contacted.
91-
verify_server_was_not_contacted 0
91+
verify_server_was_not_contacted 1
9292
'
9393

9494
test_expect_success 'verb-specific cache-server: prefetch does NOT use gvfs.get.cache-server' '
9595
test_when_finished "per_test_cleanup" &&
9696
test_when_finished "git -C \"$REPO_T1\" config --unset gvfs.get.cache-server" &&
97-
start_gvfs_protocol_server 0 &&
9897
start_gvfs_protocol_server 1 &&
98+
start_gvfs_protocol_server 2 &&
9999
100100
# Configure server 0 as default cache-server and server 1 for get.
101101
git -C "$REPO_T1" config gvfs.cache-server "$(cache_server_url 0)" &&
@@ -109,23 +109,23 @@ test_expect_success 'verb-specific cache-server: prefetch does NOT use gvfs.get.
109109
prefetch >OUT.output 2>OUT.stderr &&
110110
111111
# Verify server 0 was contacted (default cache-server).
112-
verify_server_was_contacted 0 &&
112+
verify_server_was_contacted 1 &&
113113
114114
# Verify server 1 was NOT contacted (get-specific).
115-
verify_server_was_not_contacted 1
115+
verify_server_was_not_contacted 2
116116
'
117117

118118
test_expect_success 'verb-specific cache-server: post uses gvfs.post.cache-server' '
119119
test_when_finished "per_test_cleanup" &&
120120
test_when_finished "git -C \"$REPO_T1\" config --unset gvfs.post.cache-server" &&
121-
start_gvfs_protocol_server 0 &&
122121
start_gvfs_protocol_server 1 &&
122+
start_gvfs_protocol_server 2 &&
123123
124124
# Configure server 0 as default cache-server and server 1 for post.
125125
git -C "$REPO_T1" config gvfs.cache-server "$(cache_server_url 0)" &&
126126
git -C "$REPO_T1" config gvfs.post.cache-server "$(cache_server_url 1)" &&
127127
128-
# Run post - should go to server 1.
128+
# Run post - should go to server 2.
129129
git -C "$REPO_T1" gvfs-helper \
130130
--cache-server=trust \
131131
--remote=origin \
@@ -134,17 +134,17 @@ test_expect_success 'verb-specific cache-server: post uses gvfs.post.cache-serve
134134
<"$OIDS_BLOBS_FILE" >OUT.output 2>OUT.stderr &&
135135
136136
# Verify server 1 was contacted (post-specific).
137-
verify_server_was_contacted 1 &&
137+
verify_server_was_contacted 2 &&
138138
139139
# Verify server 0 was NOT contacted.
140-
verify_server_was_not_contacted 0
140+
verify_server_was_not_contacted 1
141141
'
142142

143143
test_expect_success 'verb-specific cache-server: get does NOT use gvfs.post.cache-server' '
144144
test_when_finished "per_test_cleanup" &&
145145
test_when_finished "git -C \"$REPO_T1\" config --unset gvfs.post.cache-server" &&
146-
start_gvfs_protocol_server 0 &&
147146
start_gvfs_protocol_server 1 &&
147+
start_gvfs_protocol_server 2 &&
148148
149149
# Configure server 0 as default cache-server and server 1 for post.
150150
git -C "$REPO_T1" config gvfs.cache-server "$(cache_server_url 0)" &&
@@ -158,10 +158,10 @@ test_expect_success 'verb-specific cache-server: get does NOT use gvfs.post.cach
158158
<"$OID_ONE_BLOB_FILE" >OUT.output 2>OUT.stderr &&
159159
160160
# Verify server 0 was contacted (default cache-server).
161-
verify_server_was_contacted 0 &&
161+
verify_server_was_contacted 1 &&
162162
163163
# Verify server 1 was NOT contacted (post-specific).
164-
verify_server_was_not_contacted 1
164+
verify_server_was_not_contacted 2
165165
'
166166

167167
test_expect_success 'verb-specific cache-server: all verbs with different servers' '
@@ -170,9 +170,9 @@ test_expect_success 'verb-specific cache-server: all verbs with different server
170170
test_when_finished "git -C \"$REPO_T1\" config --unset gvfs.prefetch.cache-server" &&
171171
test_when_finished "git -C \"$REPO_T1\" config --unset gvfs.get.cache-server" &&
172172
test_when_finished "git -C \"$REPO_T1\" config --unset gvfs.post.cache-server" &&
173-
start_gvfs_protocol_server 0 &&
174173
start_gvfs_protocol_server 1 &&
175174
start_gvfs_protocol_server 2 &&
175+
start_gvfs_protocol_server 2 &&
176176
start_gvfs_protocol_server 3 &&
177177
178178
# Configure each verb to use a different server:
@@ -185,14 +185,14 @@ test_expect_success 'verb-specific cache-server: all verbs with different server
185185
git -C "$REPO_T1" config gvfs.get.cache-server "$(cache_server_url 2)" &&
186186
git -C "$REPO_T1" config gvfs.post.cache-server "$(cache_server_url 3)" &&
187187
188-
# Run prefetch - should go to server 1.
188+
# Run prefetch - should go to server 2.
189189
git -C "$REPO_T1" gvfs-helper \
190190
--cache-server=trust \
191191
--remote=origin \
192192
--no-progress \
193193
prefetch >OUT.output 2>OUT.stderr &&
194-
verify_server_was_contacted 1 &&
195-
verify_server_was_not_contacted 0 &&
194+
verify_server_was_contacted 2 &&
195+
verify_server_was_not_contacted 1 &&
196196
verify_server_was_not_contacted 2 &&
197197
verify_server_was_not_contacted 3 &&
198198

0 commit comments

Comments
 (0)