Skip to content

Commit 529d589

Browse files
committed
tests: avoid file:// urls in MINGW
1 parent 94b3172 commit 529d589

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

t/t1800-import.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ test_expect_success 'Apply a patch and edit message' '
4848
stg delete ..
4949
'
5050

51-
test_expect_success 'Apply a patch from a URL' '
51+
test_expect_success !MINGW 'Apply a patch from a URL' '
5252
stg import -u "file://$TEST_DIRECTORY/t1800/git-diff" &&
5353
[ $(git cat-file -p $(stg id) \
5454
| grep -c "tree e96b1fba2160890ff600b675d7140d46b022b155") = 1 ] &&
@@ -140,12 +140,18 @@ test_expect_success 'Apply a series from a tarball' '
140140
stg delete ..
141141
'
142142

143-
test_expect_success 'Apply a series from a tarball url' '
143+
test_expect_success !MINGW 'Apply a series from a tarball url' '
144144
stg import --url --series "file://$(pwd)/jabberwocky.tar.bz2" &&
145145
[ $(git cat-file -p $(stg id) \
146146
| grep -c "tree 2c33937252a21f1550c0bf21f1de534b68f69635") = 1 ]
147147
'
148148

149+
test_expect_success MINGW 'Apply a series from a abs tarball path' '
150+
stg import --series "$(pwd)/jabberwocky.tar.bz2" &&
151+
[ $(git cat-file -p $(stg id) \
152+
| grep -c "tree 2c33937252a21f1550c0bf21f1de534b68f69635") = 1 ]
153+
'
154+
149155
test_expect_success 'Import with author options' '
150156
stg show | grep -e "Author: Clark Williams <[email protected]>" &&
151157
stg delete --top --spill &&

t/t1801-import-email.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ test_expect_success 'Apply a patch from an 8bit-encoded e-mail' '
2121
stg delete ..
2222
'
2323

24-
test_expect_success 'Apply a patch from an 8bit-encoded e-mail url' '
24+
test_expect_success !MINGW 'Apply a patch from an 8bit-encoded e-mail url' '
2525
stg import -u -m "file://$TEST_DIRECTORY"/t1801/email-8bit &&
2626
[ $(git cat-file -p $(stg id) \
2727
| grep -c "tree 030be42660323ff2a1958f9ee79589a4f3fbee2f") = 1 ] &&
@@ -118,7 +118,7 @@ test_expect_success 'Apply several patches from an mbox file' '
118118
stg delete ..
119119
'
120120

121-
test_expect_success 'Apply several patches from an mbox url' '
121+
test_expect_success !MINGW 'Apply several patches from an mbox url' '
122122
test_config stgit.import.message-id "yes" &&
123123
stg import -u -M "file://$TEST_DIRECTORY"/t1801/email-mbox &&
124124
[ $(git cat-file -p $(stg id change-1) \

0 commit comments

Comments
 (0)