@@ -77,7 +77,7 @@ begin_test "ghe-restore into configured vm"
77
77
export GHE_RESTORE_HOST
78
78
79
79
# run ghe-restore and write output to file for asserting against
80
- ghe-restore -v > " $TRASHDIR /restore-out" 2>&1
80
+ ghe-restore -v -f > " $TRASHDIR /restore-out" 2>&1
81
81
cat " $TRASHDIR /restore-out"
82
82
83
83
# verify connect to right host
@@ -121,7 +121,7 @@ begin_test "ghe-restore -c into unconfigured vm"
121
121
export GHE_RESTORE_HOST
122
122
123
123
# run ghe-restore and write output to file for asserting against
124
- ghe-restore -v -c > " $TRASHDIR /restore-out" 2>&1
124
+ ghe-restore -v -f - c > " $TRASHDIR /restore-out" 2>&1
125
125
cat " $TRASHDIR /restore-out"
126
126
127
127
# verify connect to right host
@@ -165,7 +165,7 @@ begin_test "ghe-restore into unconfigured vm"
165
165
166
166
# run ghe-restore and write output to file for asserting against
167
167
# this should fail due to the appliance being in an unconfigured state
168
- ! ghe-restore -v > " $TRASHDIR /restore-out" 2>&1
168
+ ! ghe-restore -v -f > " $TRASHDIR /restore-out" 2>&1
169
169
170
170
# verify that ghe-restore failed due to the appliance not being configured
171
171
grep -q -e " Error: $GHE_RESTORE_HOST not configured" " $TRASHDIR /restore-out"
@@ -186,7 +186,7 @@ begin_test "ghe-restore with host arg"
186
186
export GHE_RESTORE_HOST
187
187
188
188
# run it
189
- output=" $( ghe-restore localhost) " || false
189
+ output=" $( ghe-restore -f localhost) " || false
190
190
191
191
# verify host arg overrides configured restore host
192
192
echo " $output " | grep -q ' Connect localhost OK'
@@ -220,7 +220,7 @@ begin_test "ghe-restore no host arg or configured restore host"
220
220
unset GHE_RESTORE_HOST
221
221
222
222
# verify running ghe-restore fails
223
- ! ghe-restore
223
+ ! ghe-restore -f
224
224
)
225
225
end_test
226
226
@@ -237,7 +237,7 @@ begin_test "ghe-restore with no pages backup"
237
237
rm -rf " $GHE_DATA_DIR /1/pages"
238
238
239
239
# run it
240
- ghe-restore -v localhost
240
+ ghe-restore -v -f localhost
241
241
)
242
242
end_test
243
243
@@ -252,7 +252,7 @@ begin_test "ghe-restore with tarball strategy"
252
252
253
253
# run it
254
254
echo " tarball" > " $GHE_DATA_DIR /current/strategy"
255
- output=$( ghe-restore -v localhost)
255
+ output=$( ghe-restore -v -f localhost)
256
256
257
257
# verify ghe-import-repositories was run on remote side with fake tarball
258
258
echo " $output " | grep -q ' fake ghe-export-repositories data'
0 commit comments