]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
tests: use %TESTNUMBER instead of fixed number
authorDaniel Stenberg <daniel@haxx.se>
Fri, 12 Mar 2021 16:38:26 +0000 (17:38 +0100)
committerDaniel Stenberg <daniel@haxx.se>
Fri, 19 Mar 2021 14:57:21 +0000 (15:57 +0100)
This makes the tests easier to copy and relocate to other test numbers
without having to update content.

Closes #6738

1292 files changed:
tests/data/test1
tests/data/test10
tests/data/test100
tests/data/test1000
tests/data/test1001
tests/data/test1002
tests/data/test1003
tests/data/test1004
tests/data/test1005
tests/data/test1006
tests/data/test1007
tests/data/test1008
tests/data/test1009
tests/data/test1010
tests/data/test1011
tests/data/test1012
tests/data/test1013
tests/data/test1014
tests/data/test1015
tests/data/test1016
tests/data/test1017
tests/data/test1018
tests/data/test1019
tests/data/test102
tests/data/test1020
tests/data/test1021
tests/data/test1022
tests/data/test1023
tests/data/test1024
tests/data/test1025
tests/data/test1026
tests/data/test1027
tests/data/test1028
tests/data/test1029
tests/data/test103
tests/data/test1030
tests/data/test1031
tests/data/test1032
tests/data/test1033
tests/data/test1034
tests/data/test1035
tests/data/test1036
tests/data/test1037
tests/data/test1038
tests/data/test1039
tests/data/test104
tests/data/test1040
tests/data/test1041
tests/data/test1042
tests/data/test1043
tests/data/test1044
tests/data/test1045
tests/data/test1046
tests/data/test1049
tests/data/test105
tests/data/test1051
tests/data/test1052
tests/data/test1053
tests/data/test1054
tests/data/test1055
tests/data/test1056
tests/data/test1057
tests/data/test1058
tests/data/test1059
tests/data/test106
tests/data/test1060
tests/data/test1061
tests/data/test1062
tests/data/test1063
tests/data/test1064
tests/data/test1065
tests/data/test1066
tests/data/test1067
tests/data/test1068
tests/data/test1069
tests/data/test107
tests/data/test1070
tests/data/test1071
tests/data/test1072
tests/data/test1073
tests/data/test1074
tests/data/test1075
tests/data/test1076
tests/data/test1077
tests/data/test1078
tests/data/test1079
tests/data/test108
tests/data/test1080
tests/data/test1081
tests/data/test1082
tests/data/test1083
tests/data/test1084
tests/data/test1085
tests/data/test1086
tests/data/test1087
tests/data/test1088
tests/data/test1089
tests/data/test109
tests/data/test1090
tests/data/test1091
tests/data/test1092
tests/data/test1093
tests/data/test1094
tests/data/test1095
tests/data/test1096
tests/data/test1097
tests/data/test1098
tests/data/test1099
tests/data/test11
tests/data/test110
tests/data/test1100
tests/data/test1101
tests/data/test1102
tests/data/test1103
tests/data/test1104
tests/data/test1105
tests/data/test1106
tests/data/test1107
tests/data/test1108
tests/data/test1109
tests/data/test111
tests/data/test1110
tests/data/test1111
tests/data/test1112
tests/data/test1115
tests/data/test1116
tests/data/test1117
tests/data/test1118
tests/data/test112
tests/data/test1120
tests/data/test1121
tests/data/test1122
tests/data/test1123
tests/data/test1124
tests/data/test1125
tests/data/test1126
tests/data/test1127
tests/data/test1128
tests/data/test1129
tests/data/test113
tests/data/test1130
tests/data/test1131
tests/data/test1133
tests/data/test1134
tests/data/test1136
tests/data/test1137
tests/data/test1138
tests/data/test114
tests/data/test1141
tests/data/test1142
tests/data/test1143
tests/data/test1144
tests/data/test1145
tests/data/test1146
tests/data/test1147
tests/data/test1148
tests/data/test1149
tests/data/test115
tests/data/test1150
tests/data/test1151
tests/data/test1152
tests/data/test1153
tests/data/test1154
tests/data/test1155
tests/data/test1156
tests/data/test1157
tests/data/test1158
tests/data/test1159
tests/data/test116
tests/data/test1160
tests/data/test1161
tests/data/test1164
tests/data/test1166
tests/data/test1168
tests/data/test117
tests/data/test1170
tests/data/test1171
tests/data/test1172
tests/data/test1174
tests/data/test1176
tests/data/test1178
tests/data/test1179
tests/data/test118
tests/data/test1180
tests/data/test1181
tests/data/test1182
tests/data/test1183
tests/data/test1188
tests/data/test119
tests/data/test1190
tests/data/test1191
tests/data/test1192
tests/data/test1193
tests/data/test1194
tests/data/test1195
tests/data/test1196
tests/data/test1197
tests/data/test12
tests/data/test120
tests/data/test1200
tests/data/test1201
tests/data/test1202
tests/data/test1203
tests/data/test1204
tests/data/test1205
tests/data/test1206
tests/data/test1207
tests/data/test1208
tests/data/test1209
tests/data/test121
tests/data/test1210
tests/data/test1211
tests/data/test1212
tests/data/test1213
tests/data/test1214
tests/data/test1215
tests/data/test1216
tests/data/test1217
tests/data/test1218
tests/data/test1219
tests/data/test122
tests/data/test1220
tests/data/test1223
tests/data/test1224
tests/data/test1225
tests/data/test1226
tests/data/test1227
tests/data/test1228
tests/data/test1229
tests/data/test123
tests/data/test1230
tests/data/test1231
tests/data/test1232
tests/data/test1233
tests/data/test1234
tests/data/test1235
tests/data/test1237
tests/data/test1238
tests/data/test1239
tests/data/test124
tests/data/test1240
tests/data/test1241
tests/data/test1242
tests/data/test1243
tests/data/test1244
tests/data/test1245
tests/data/test1246
tests/data/test1247
tests/data/test1248
tests/data/test1249
tests/data/test125
tests/data/test1250
tests/data/test1251
tests/data/test1252
tests/data/test1253
tests/data/test1254
tests/data/test1255
tests/data/test1256
tests/data/test1257
tests/data/test1258
tests/data/test1259
tests/data/test126
tests/data/test1260
tests/data/test1261
tests/data/test1262
tests/data/test1263
tests/data/test1264
tests/data/test1265
tests/data/test1266
tests/data/test1267
tests/data/test1268
tests/data/test1269
tests/data/test127
tests/data/test1270
tests/data/test1271
tests/data/test1272
tests/data/test128
tests/data/test1280
tests/data/test1281
tests/data/test1282
tests/data/test1283
tests/data/test1284
tests/data/test1285
tests/data/test1286
tests/data/test1287
tests/data/test1288
tests/data/test129
tests/data/test1290
tests/data/test1291
tests/data/test1292
tests/data/test1293
tests/data/test1294
tests/data/test1295
tests/data/test1296
tests/data/test1297
tests/data/test1298
tests/data/test1299
tests/data/test13
tests/data/test130
tests/data/test1304
tests/data/test1305
tests/data/test1306
tests/data/test1308
tests/data/test131
tests/data/test1310
tests/data/test1311
tests/data/test1312
tests/data/test1313
tests/data/test1314
tests/data/test1315
tests/data/test1316
tests/data/test1317
tests/data/test1318
tests/data/test1319
tests/data/test132
tests/data/test1320
tests/data/test1321
tests/data/test1322
tests/data/test1324
tests/data/test1325
tests/data/test1326
tests/data/test1327
tests/data/test1328
tests/data/test1329
tests/data/test133
tests/data/test1330
tests/data/test1331
tests/data/test1332
tests/data/test1333
tests/data/test1334
tests/data/test1335
tests/data/test1336
tests/data/test1337
tests/data/test1338
tests/data/test1339
tests/data/test134
tests/data/test1340
tests/data/test1341
tests/data/test1342
tests/data/test1343
tests/data/test1344
tests/data/test1345
tests/data/test1346
tests/data/test1347
tests/data/test1348
tests/data/test1349
tests/data/test135
tests/data/test1350
tests/data/test1351
tests/data/test1352
tests/data/test1353
tests/data/test1354
tests/data/test1355
tests/data/test1356
tests/data/test1357
tests/data/test1358
tests/data/test1359
tests/data/test136
tests/data/test1360
tests/data/test1361
tests/data/test1362
tests/data/test1363
tests/data/test1364
tests/data/test1365
tests/data/test1366
tests/data/test1367
tests/data/test1368
tests/data/test1369
tests/data/test137
tests/data/test1370
tests/data/test1371
tests/data/test1372
tests/data/test1373
tests/data/test1374
tests/data/test1375
tests/data/test1376
tests/data/test1377
tests/data/test1378
tests/data/test1379
tests/data/test138
tests/data/test1380
tests/data/test1381
tests/data/test1382
tests/data/test1383
tests/data/test1384
tests/data/test1385
tests/data/test1386
tests/data/test1387
tests/data/test1388
tests/data/test1389
tests/data/test139
tests/data/test1390
tests/data/test1391
tests/data/test1392
tests/data/test1393
tests/data/test14
tests/data/test140
tests/data/test1400
tests/data/test1401
tests/data/test1402
tests/data/test1403
tests/data/test1404
tests/data/test1405
tests/data/test1406
tests/data/test1407
tests/data/test1408
tests/data/test1409
tests/data/test141
tests/data/test1410
tests/data/test1411
tests/data/test1412
tests/data/test1413
tests/data/test1414
tests/data/test1415
tests/data/test1416
tests/data/test1417
tests/data/test1418
tests/data/test1419
tests/data/test142
tests/data/test1420
tests/data/test1421
tests/data/test1422
tests/data/test1423
tests/data/test1424
tests/data/test1425
tests/data/test1426
tests/data/test1427
tests/data/test1428
tests/data/test1429
tests/data/test143
tests/data/test1430
tests/data/test1431
tests/data/test1432
tests/data/test1433
tests/data/test1434
tests/data/test1435
tests/data/test1436
tests/data/test1437
tests/data/test1438
tests/data/test1439
tests/data/test1443
tests/data/test1444
tests/data/test1445
tests/data/test1446
tests/data/test1448
tests/data/test1449
tests/data/test1451
tests/data/test1452
tests/data/test1455
tests/data/test1456
tests/data/test1457
tests/data/test1458
tests/data/test1459
tests/data/test146
tests/data/test1460
tests/data/test1465
tests/data/test147
tests/data/test148
tests/data/test149
tests/data/test15
tests/data/test150
tests/data/test1500
tests/data/test1501
tests/data/test1502
tests/data/test1503
tests/data/test1504
tests/data/test1505
tests/data/test1506
tests/data/test1507
tests/data/test1508
tests/data/test1509
tests/data/test151
tests/data/test1510
tests/data/test1511
tests/data/test1512
tests/data/test1513
tests/data/test1514
tests/data/test1515
tests/data/test1516
tests/data/test1517
tests/data/test1518
tests/data/test1519
tests/data/test152
tests/data/test1520
tests/data/test1521
tests/data/test1522
tests/data/test1523
tests/data/test1524
tests/data/test1525
tests/data/test1526
tests/data/test1527
tests/data/test1528
tests/data/test1529
tests/data/test153
tests/data/test1530
tests/data/test1531
tests/data/test1532
tests/data/test1533
tests/data/test1534
tests/data/test1535
tests/data/test1536
tests/data/test1537
tests/data/test1538
tests/data/test1539
tests/data/test154
tests/data/test1540
tests/data/test155
tests/data/test1550
tests/data/test1551
tests/data/test1552
tests/data/test1553
tests/data/test1554
tests/data/test1555
tests/data/test1556
tests/data/test1557
tests/data/test1558
tests/data/test1559
tests/data/test156
tests/data/test1560
tests/data/test1561
tests/data/test1562
tests/data/test1563
tests/data/test1564
tests/data/test1565
tests/data/test1566
tests/data/test1567
tests/data/test1568
tests/data/test1569
tests/data/test157
tests/data/test1570
tests/data/test158
tests/data/test159
tests/data/test1590
tests/data/test1591
tests/data/test1592
tests/data/test1593
tests/data/test1594
tests/data/test1595
tests/data/test1596
tests/data/test16
tests/data/test160
tests/data/test161
tests/data/test1613
tests/data/test162
tests/data/test163
tests/data/test1630
tests/data/test1631
tests/data/test1632
tests/data/test1633
tests/data/test1634
tests/data/test164
tests/data/test165
tests/data/test1654
tests/data/test166
tests/data/test1660
tests/data/test167
tests/data/test168
tests/data/test169
tests/data/test17
tests/data/test170
tests/data/test1700
tests/data/test1701
tests/data/test1702
tests/data/test1703
tests/data/test171
tests/data/test172
tests/data/test173
tests/data/test174
tests/data/test175
tests/data/test176
tests/data/test177
tests/data/test178
tests/data/test179
tests/data/test18
tests/data/test180
tests/data/test1800
tests/data/test1801
tests/data/test181
tests/data/test182
tests/data/test183
tests/data/test184
tests/data/test185
tests/data/test186
tests/data/test187
tests/data/test188
tests/data/test189
tests/data/test190
tests/data/test1904
tests/data/test1905
tests/data/test1906
tests/data/test1907
tests/data/test1908
tests/data/test1909
tests/data/test191
tests/data/test1910
tests/data/test1911
tests/data/test1912
tests/data/test1913
tests/data/test1915
tests/data/test1916
tests/data/test1917
tests/data/test1918
tests/data/test192
tests/data/test193
tests/data/test1933
tests/data/test1934
tests/data/test1935
tests/data/test1936
tests/data/test194
tests/data/test195
tests/data/test196
tests/data/test197
tests/data/test198
tests/data/test199
tests/data/test2
tests/data/test200
tests/data/test2000
tests/data/test2001
tests/data/test2002
tests/data/test2003
tests/data/test2004
tests/data/test2005
tests/data/test2006
tests/data/test2007
tests/data/test2008
tests/data/test2009
tests/data/test2010
tests/data/test2011
tests/data/test2012
tests/data/test2013
tests/data/test2014
tests/data/test2015
tests/data/test2016
tests/data/test2017
tests/data/test2018
tests/data/test2019
tests/data/test202
tests/data/test2020
tests/data/test2021
tests/data/test2022
tests/data/test2023
tests/data/test2024
tests/data/test2025
tests/data/test2026
tests/data/test2027
tests/data/test2028
tests/data/test2029
tests/data/test203
tests/data/test2030
tests/data/test2031
tests/data/test2032
tests/data/test2034
tests/data/test2035
tests/data/test2037
tests/data/test2038
tests/data/test2039
tests/data/test204
tests/data/test2040
tests/data/test2041
tests/data/test2042
tests/data/test2046
tests/data/test2047
tests/data/test2048
tests/data/test2049
tests/data/test205
tests/data/test2050
tests/data/test2051
tests/data/test2052
tests/data/test2053
tests/data/test2054
tests/data/test2055
tests/data/test2056
tests/data/test2057
tests/data/test2058
tests/data/test2059
tests/data/test206
tests/data/test2060
tests/data/test2061
tests/data/test2062
tests/data/test2063
tests/data/test2064
tests/data/test2065
tests/data/test2066
tests/data/test2067
tests/data/test2068
tests/data/test2069
tests/data/test207
tests/data/test2070
tests/data/test2072
tests/data/test2073
tests/data/test2074
tests/data/test2076
tests/data/test2077
tests/data/test2078
tests/data/test208
tests/data/test2080
tests/data/test209
tests/data/test210
tests/data/test2100
tests/data/test211
tests/data/test212
tests/data/test213
tests/data/test214
tests/data/test215
tests/data/test216
tests/data/test217
tests/data/test218
tests/data/test219
tests/data/test22
tests/data/test220
tests/data/test221
tests/data/test222
tests/data/test223
tests/data/test224
tests/data/test225
tests/data/test226
tests/data/test227
tests/data/test228
tests/data/test229
tests/data/test230
tests/data/test231
tests/data/test232
tests/data/test233
tests/data/test234
tests/data/test235
tests/data/test236
tests/data/test237
tests/data/test238
tests/data/test239
tests/data/test24
tests/data/test240
tests/data/test241
tests/data/test242
tests/data/test243
tests/data/test244
tests/data/test245
tests/data/test246
tests/data/test247
tests/data/test248
tests/data/test249
tests/data/test25
tests/data/test256
tests/data/test257
tests/data/test258
tests/data/test259
tests/data/test26
tests/data/test260
tests/data/test261
tests/data/test262
tests/data/test263
tests/data/test264
tests/data/test265
tests/data/test266
tests/data/test267
tests/data/test268
tests/data/test269
tests/data/test27
tests/data/test270
tests/data/test271
tests/data/test272
tests/data/test273
tests/data/test274
tests/data/test275
tests/data/test276
tests/data/test277
tests/data/test278
tests/data/test279
tests/data/test28
tests/data/test280
tests/data/test281
tests/data/test282
tests/data/test284
tests/data/test285
tests/data/test286
tests/data/test287
tests/data/test288
tests/data/test289
tests/data/test29
tests/data/test290
tests/data/test291
tests/data/test292
tests/data/test293
tests/data/test294
tests/data/test295
tests/data/test296
tests/data/test297
tests/data/test298
tests/data/test299
tests/data/test3
tests/data/test30
tests/data/test300
tests/data/test3000
tests/data/test3001
tests/data/test3002
tests/data/test3003
tests/data/test3004
tests/data/test3005
tests/data/test3006
tests/data/test3007
tests/data/test3008
tests/data/test3009
tests/data/test301
tests/data/test3010
tests/data/test3011
tests/data/test3012
tests/data/test3013
tests/data/test3015
tests/data/test302
tests/data/test303
tests/data/test304
tests/data/test305
tests/data/test306
tests/data/test307
tests/data/test308
tests/data/test309
tests/data/test31
tests/data/test310
tests/data/test311
tests/data/test312
tests/data/test313
tests/data/test314
tests/data/test315
tests/data/test316
tests/data/test317
tests/data/test318
tests/data/test319
tests/data/test32
tests/data/test320
tests/data/test323
tests/data/test324
tests/data/test325
tests/data/test326
tests/data/test327
tests/data/test328
tests/data/test329
tests/data/test33
tests/data/test330
tests/data/test331
tests/data/test332
tests/data/test333
tests/data/test334
tests/data/test335
tests/data/test336
tests/data/test337
tests/data/test338
tests/data/test339
tests/data/test34
tests/data/test340
tests/data/test341
tests/data/test342
tests/data/test343
tests/data/test344
tests/data/test345
tests/data/test346
tests/data/test347
tests/data/test348
tests/data/test349
tests/data/test35
tests/data/test354
tests/data/test355
tests/data/test356
tests/data/test357
tests/data/test358
tests/data/test359
tests/data/test36
tests/data/test360
tests/data/test361
tests/data/test362
tests/data/test37
tests/data/test38
tests/data/test39
tests/data/test393
tests/data/test394
tests/data/test395
tests/data/test396
tests/data/test397
tests/data/test4
tests/data/test40
tests/data/test401
tests/data/test402
tests/data/test405
tests/data/test407
tests/data/test408
tests/data/test409
tests/data/test41
tests/data/test410
tests/data/test42
tests/data/test43
tests/data/test430
tests/data/test431
tests/data/test432
tests/data/test433
tests/data/test434
tests/data/test44
tests/data/test45
tests/data/test46
tests/data/test47
tests/data/test48
tests/data/test49
tests/data/test490
tests/data/test491
tests/data/test492
tests/data/test493
tests/data/test5
tests/data/test50
tests/data/test500
tests/data/test501
tests/data/test502
tests/data/test503
tests/data/test504
tests/data/test505
tests/data/test506
tests/data/test507
tests/data/test508
tests/data/test509
tests/data/test51
tests/data/test510
tests/data/test511
tests/data/test512
tests/data/test513
tests/data/test514
tests/data/test515
tests/data/test516
tests/data/test517
tests/data/test518
tests/data/test519
tests/data/test52
tests/data/test521
tests/data/test522
tests/data/test523
tests/data/test524
tests/data/test525
tests/data/test526
tests/data/test527
tests/data/test528
tests/data/test529
tests/data/test53
tests/data/test531
tests/data/test532
tests/data/test533
tests/data/test534
tests/data/test535
tests/data/test537
tests/data/test538
tests/data/test539
tests/data/test54
tests/data/test540
tests/data/test541
tests/data/test542
tests/data/test543
tests/data/test544
tests/data/test545
tests/data/test546
tests/data/test547
tests/data/test548
tests/data/test549
tests/data/test55
tests/data/test550
tests/data/test551
tests/data/test552
tests/data/test553
tests/data/test554
tests/data/test555
tests/data/test556
tests/data/test557
tests/data/test558
tests/data/test559
tests/data/test56
tests/data/test560
tests/data/test561
tests/data/test562
tests/data/test563
tests/data/test564
tests/data/test565
tests/data/test566
tests/data/test567
tests/data/test568
tests/data/test569
tests/data/test57
tests/data/test570
tests/data/test571
tests/data/test572
tests/data/test573
tests/data/test574
tests/data/test575
tests/data/test576
tests/data/test577
tests/data/test578
tests/data/test579
tests/data/test58
tests/data/test580
tests/data/test581
tests/data/test582
tests/data/test583
tests/data/test584
tests/data/test585
tests/data/test586
tests/data/test587
tests/data/test588
tests/data/test589
tests/data/test59
tests/data/test590
tests/data/test591
tests/data/test592
tests/data/test593
tests/data/test594
tests/data/test595
tests/data/test596
tests/data/test597
tests/data/test598
tests/data/test599
tests/data/test6
tests/data/test60
tests/data/test600
tests/data/test601
tests/data/test602
tests/data/test603
tests/data/test608
tests/data/test609
tests/data/test61
tests/data/test610
tests/data/test611
tests/data/test612
tests/data/test613
tests/data/test614
tests/data/test615
tests/data/test616
tests/data/test617
tests/data/test618
tests/data/test619
tests/data/test62
tests/data/test620
tests/data/test621
tests/data/test622
tests/data/test623
tests/data/test624
tests/data/test625
tests/data/test626
tests/data/test627
tests/data/test63
tests/data/test633
tests/data/test634
tests/data/test635
tests/data/test636
tests/data/test637
tests/data/test638
tests/data/test639
tests/data/test64
tests/data/test640
tests/data/test641
tests/data/test642
tests/data/test643
tests/data/test644
tests/data/test645
tests/data/test646
tests/data/test647
tests/data/test648
tests/data/test649
tests/data/test65
tests/data/test650
tests/data/test651
tests/data/test652
tests/data/test653
tests/data/test654
tests/data/test655
tests/data/test658
tests/data/test659
tests/data/test66
tests/data/test660
tests/data/test661
tests/data/test662
tests/data/test663
tests/data/test664
tests/data/test665
tests/data/test666
tests/data/test667
tests/data/test668
tests/data/test669
tests/data/test67
tests/data/test670
tests/data/test671
tests/data/test672
tests/data/test673
tests/data/test674
tests/data/test675
tests/data/test68
tests/data/test69
tests/data/test7
tests/data/test70
tests/data/test700
tests/data/test701
tests/data/test704
tests/data/test705
tests/data/test708
tests/data/test709
tests/data/test71
tests/data/test710
tests/data/test711
tests/data/test712
tests/data/test713
tests/data/test714
tests/data/test715
tests/data/test716
tests/data/test717
tests/data/test72
tests/data/test73
tests/data/test74
tests/data/test76
tests/data/test77
tests/data/test78
tests/data/test79
tests/data/test8
tests/data/test80
tests/data/test800
tests/data/test801
tests/data/test802
tests/data/test803
tests/data/test804
tests/data/test805
tests/data/test806
tests/data/test807
tests/data/test808
tests/data/test809
tests/data/test81
tests/data/test810
tests/data/test811
tests/data/test812
tests/data/test813
tests/data/test814
tests/data/test815
tests/data/test816
tests/data/test817
tests/data/test819
tests/data/test82
tests/data/test820
tests/data/test821
tests/data/test822
tests/data/test823
tests/data/test824
tests/data/test825
tests/data/test826
tests/data/test827
tests/data/test828
tests/data/test829
tests/data/test83
tests/data/test830
tests/data/test831
tests/data/test832
tests/data/test833
tests/data/test834
tests/data/test835
tests/data/test836
tests/data/test837
tests/data/test838
tests/data/test839
tests/data/test84
tests/data/test840
tests/data/test841
tests/data/test842
tests/data/test843
tests/data/test844
tests/data/test845
tests/data/test846
tests/data/test847
tests/data/test848
tests/data/test849
tests/data/test85
tests/data/test850
tests/data/test851
tests/data/test852
tests/data/test855
tests/data/test856
tests/data/test857
tests/data/test858
tests/data/test86
tests/data/test862
tests/data/test864
tests/data/test865
tests/data/test866
tests/data/test867
tests/data/test868
tests/data/test869
tests/data/test87
tests/data/test870
tests/data/test871
tests/data/test872
tests/data/test873
tests/data/test874
tests/data/test875
tests/data/test876
tests/data/test877
tests/data/test878
tests/data/test879
tests/data/test88
tests/data/test880
tests/data/test881
tests/data/test882
tests/data/test883
tests/data/test884
tests/data/test885
tests/data/test886
tests/data/test887
tests/data/test888
tests/data/test889
tests/data/test89
tests/data/test890
tests/data/test891
tests/data/test892
tests/data/test893
tests/data/test894
tests/data/test895
tests/data/test9
tests/data/test90
tests/data/test900
tests/data/test901
tests/data/test902
tests/data/test903
tests/data/test904
tests/data/test905
tests/data/test906
tests/data/test907
tests/data/test908
tests/data/test909
tests/data/test91
tests/data/test910
tests/data/test911
tests/data/test912
tests/data/test913
tests/data/test914
tests/data/test915
tests/data/test916
tests/data/test917
tests/data/test918
tests/data/test919
tests/data/test92
tests/data/test920
tests/data/test921
tests/data/test922
tests/data/test923
tests/data/test924
tests/data/test925
tests/data/test926
tests/data/test927
tests/data/test928
tests/data/test929
tests/data/test93
tests/data/test930
tests/data/test931
tests/data/test932
tests/data/test933
tests/data/test934
tests/data/test935
tests/data/test936
tests/data/test937
tests/data/test938
tests/data/test939
tests/data/test94
tests/data/test940
tests/data/test941
tests/data/test942
tests/data/test943
tests/data/test944
tests/data/test945
tests/data/test946
tests/data/test947
tests/data/test948
tests/data/test949
tests/data/test95
tests/data/test950
tests/data/test951
tests/data/test952
tests/data/test953
tests/data/test954
tests/data/test955
tests/data/test956
tests/data/test957
tests/data/test958
tests/data/test959
tests/data/test960
tests/data/test961
tests/data/test962
tests/data/test963
tests/data/test964
tests/data/test965
tests/data/test966
tests/data/test967
tests/data/test968
tests/data/test969
tests/data/test97
tests/data/test970
tests/data/test98
tests/data/test99

index eba794a02f274f820d33ee8e12da9cc783c14330..f39a08b198f7c421fd9a95f311c8f87e1baa0e9a 100644 (file)
@@ -35,7 +35,7 @@ http
 HTTP GET
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -43,7 +43,7 @@ http://%HOSTIP:%HTTPPORT/1
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index ed89bb95d44ebb681401d683e86ebcd39c216bbd..5b5534b674a98ee829fae7cfdabcbea5aa945db2 100644 (file)
@@ -26,9 +26,9 @@ http
 simple HTTP PUT from file
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/10 -T log/test10.txt
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T log/test%TESTNUMBER.txt
 </command>
-<file name="log/test10.txt">
+<file name="log/test%TESTNUMBER.txt">
 Weird
      file
          to
@@ -44,7 +44,7 @@ the
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /we/want/10 HTTP/1.1\r
+PUT /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 72f9c85620f72152749b2c6f652c0219aa917d66..e680a7b4a51a2cd6b2f380f46434521dfc7e2708 100644 (file)
@@ -36,7 +36,7 @@ ftp
 FTP dir list PASV
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/test-100/
+ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/
 </command>
 </client>
 
@@ -47,7 +47,7 @@ ftp://%HOSTIP:%FTPPORT/test-100/
 USER anonymous\r
 PASS ftp@example.com\r
 PWD\r
-CWD test-100\r
+CWD test-%TESTNUMBER\r
 EPSV\r
 TYPE A\r
 LIST\r
index e6f8eef4139a148f65875564ca0bb77cc65438e8..37f210ed8c380882a44f676c419a6a265c2492d6 100644 (file)
@@ -24,7 +24,7 @@ ftp
 FTP dir list PASV with -I
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1000/ -I
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ -I
 </command>
 </client>
 
@@ -35,7 +35,7 @@ ftp://%HOSTIP:%FTPPORT/1000/ -I
 USER anonymous\r
 PASS ftp@example.com\r
 PWD\r
-CWD 1000\r
+CWD %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 6edaade79d45f0ee1ce3bf35fb7b97f029735c70..59d2ff8698ab8aaa9269c86ca752af08d0af7553 100644 (file)
@@ -72,9 +72,9 @@ proxy
 HTTP POST --digest with PUT and resumed upload and modified method
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1001 -u auser:apasswd --digest -T log/1001 -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -T log/%TESTNUMBER -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET
 </command>
-<file name="log/1001">
+<file name="log/%TESTNUMBER">
 test
 </file>
 </client>
@@ -82,7 +82,7 @@ test
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/1001 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Content-Range: bytes 2-4/5\r
 User-Agent: curl/%VERSION\r
@@ -90,9 +90,9 @@ Accept: */*
 Proxy-Connection: Keep-Alive\r
 Content-Length: 0\r
 \r
-GET http://%HOSTIP:%HTTPPORT/1001 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1001", response="6af4d89c952f4dd4cc215a6878dc499d"\r
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="6af4d89c952f4dd4cc215a6878dc499d"\r
 Content-Range: bytes 2-4/5\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 7ec7501f795e61dd55b7b6f285cb7bdf7e6269c5..d33f35b9c50f341d1fddbcbbc6c888576e20744e 100644 (file)
@@ -71,9 +71,9 @@ proxy
 HTTP PUT with Digest auth, resumed upload and modified method, twice
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1002.upload1 -T log/1002 http://%HOSTIP:%HTTPPORT/1002.upload2 -T log/1002 -u auser:apasswd --digest -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 -T log/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload2 -T log/%TESTNUMBER -u auser:apasswd --digest -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET
 </command>
-<file name="log/1002">
+<file name="log/%TESTNUMBER">
 test
 </file>
 </client>
@@ -81,7 +81,7 @@ test
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/1002.upload1 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Content-Range: bytes 2-4/5\r
 User-Agent: curl/%VERSION\r
@@ -89,9 +89,9 @@ Accept: */*
 Proxy-Connection: Keep-Alive\r
 Content-Length: 0\r
 \r
-GET http://%HOSTIP:%HTTPPORT/1002.upload1 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1002.upload1", response="198aa9b6acb4b0c71d02a197a5e41f54"\r
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER.upload1", response="198aa9b6acb4b0c71d02a197a5e41f54"\r
 Content-Range: bytes 2-4/5\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -100,7 +100,7 @@ Content-Length: 3
 Expect: 100-continue\r
 \r
 st
-GET http://%HOSTIP:%HTTPPORT/1002.upload2 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload2 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Content-Range: bytes 2-4/5\r
 User-Agent: curl/%VERSION\r
@@ -108,9 +108,9 @@ Accept: */*
 Proxy-Connection: Keep-Alive\r
 Content-Length: 0\r
 \r
-GET http://%HOSTIP:%HTTPPORT/1002.upload2 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload2 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1002.upload2", response="d711f0d2042786d930de635ba0d1a1d0"\r
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER.upload2", response="d711f0d2042786d930de635ba0d1a1d0"\r
 Content-Range: bytes 2-4/5\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 08e377a79e76979606519dad197a24d0a93bf530..9adc996a928a121aaa3d212bf116771775c1dc9c 100644 (file)
@@ -27,7 +27,7 @@ ftp
 FTP with excessively large server command response line
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/1003
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>
 
@@ -40,8 +40,8 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE 1003\r
-RETR 1003\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 4a2b1593933801d24ae8531a5b09aa2b0d471866..cb2b6d69cfc18ec9d79298a712abe35191c6c262 100644 (file)
@@ -36,7 +36,7 @@ http
 HTTP GET with empty proxy
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1004 --proxy ""
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy ""
 </command>
 </client>
 
@@ -44,7 +44,7 @@ http://%HOSTIP:%HTTPPORT/1004 --proxy ""
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1004 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 5c0c6764351b0b117c6411fba35b3f35ab37c541..59d98cc6590aea7e11c2aa1bca20325a4da2f656 100644 (file)
@@ -27,7 +27,7 @@ ftp
 FTP with excessively large number of server command response lines
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/1005
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>
 
@@ -40,8 +40,8 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE 1005\r
-RETR 1005\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index b37f807b719c9716f554a9be9d043667b7a0680f..08f7247c1713645a8b56be7643b0c5400c00481b 100644 (file)
@@ -28,7 +28,7 @@ ftp
 FTP with excessively large number of server command response lines (boundary condition)
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/1006
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>
 
@@ -41,8 +41,8 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE 1006\r
-RETR 1006\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index db2717ae338008581efbf2421d85ec813d8d5c61..e3c12b8d1f5965563d93ff17b8a64bd00e1b9070 100644 (file)
@@ -17,9 +17,9 @@ tftp
 TFTP send with invalid permission on server
  </name>
  <command>
--T log/test1007.txt tftp://%HOSTIP:%TFTPPORT//invalid-file
+-T log/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//invalid-file
 </command>
-<file name="log/test1007.txt">
+<file name="log/test%TESTNUMBER.txt">
 This data will not be sent
 </file>
 </client>
index 7dab6e9d5d52f195e2feaded075149ff2eaa40cb..321e98a81ebe867d7ac6ca60a18aac7c00d8efb9 100644 (file)
@@ -101,7 +101,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://test.remote.example.com.1008:%HTTPPORT/path/10080002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-ntlm --proxytunnel
+http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-ntlm --proxytunnel
 </command>
 <precheck>
 chkhostname curlhost
@@ -111,20 +111,20 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-CONNECT test.remote.example.com.1008:%HTTPPORT HTTP/1.1\r
-Host: test.remote.example.com.1008:%HTTPPORT\r
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
-CONNECT test.remote.example.com.1008:%HTTPPORT HTTP/1.1\r
-Host: test.remote.example.com.1008:%HTTPPORT\r
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET /path/10080002 HTTP/1.1\r
-Host: test.remote.example.com.1008:%HTTPPORT\r
+GET /path/%TESTNUMBER0002 HTTP/1.1\r
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index e1929beb27d501f10fc5be9f8cbc4056b5289ca1..223fcdbd079beabd5228dbd2fee8232b7931502d 100644 (file)
@@ -28,7 +28,7 @@ tftp
 TFTP retrieve with --local-port
  </name>
  <command>
-tftp://%HOSTIP:%TFTPPORT//1009 --local-port 44444-45444
+tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --local-port 44444-45444
 </command>
 </client>
 
@@ -41,7 +41,7 @@ mode: octet
 tsize: 0
 blksize: 512
 timeout: 6
-filename: /1009
+filename: /%TESTNUMBER
 </protocol>
 </verify>
 </testcase>
index ef073f5e5a008568f983c3920e001776120329af..9314ca66ee16f5ef62fc0bf2b3a5555d05d81d4d 100644 (file)
@@ -36,7 +36,7 @@ ftp
 FTP dir list nocwd
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT//list/this/path/1010/ ftp://%HOSTIP:%FTPPORT//list/this/path/1010/ --ftp-method nocwd
+ftp://%HOSTIP:%FTPPORT//list/this/path/%TESTNUMBER/ ftp://%HOSTIP:%FTPPORT//list/this/path/%TESTNUMBER/ --ftp-method nocwd
 </command>
 </client>
 
@@ -49,9 +49,9 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE A\r
-LIST /list/this/path/1010\r
+LIST /list/this/path/%TESTNUMBER\r
 EPSV\r
-LIST /list/this/path/1010\r
+LIST /list/this/path/%TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 7af9e0d8eb39bb61f6f34aca7f4f11e623d18af6..1ff01ca6b8f6cf47245ce8ced807d47973bcd8ae 100644 (file)
@@ -11,7 +11,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 301 OK\r
-Location: moo.html&testcase=/10110002\r
+Location: moo.html&testcase=/%TESTNUMBER0002\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Content-Length: 0\r
 \r
@@ -26,7 +26,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 301 OK\r
-Location: moo.html&testcase=/10110002\r
+Location: moo.html&testcase=/%TESTNUMBER0002\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Content-Length: 0\r
 \r
@@ -49,7 +49,7 @@ http
 HTTP POST with 301 redirect
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/blah/1011 -L -d "moo"
+http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo"
 </command>
 </client>
 
@@ -57,14 +57,14 @@ http://%HOSTIP:%HTTPPORT/blah/1011 -L -d "moo"
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST /blah/1011 HTTP/1.1\r
+POST /blah/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 3\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-mooGET /blah/moo.html&testcase=/10110002 HTTP/1.1\r
+mooGET /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 64a6f47dfb2c1dad368d9cb126adbdfd7d9156f9..af17bb81843bb368f706a60bb5a0813991b08cce 100644 (file)
@@ -11,7 +11,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 301 OK swsclose\r
-Location: moo.html&testcase=/10120002\r
+Location: moo.html&testcase=/%TESTNUMBER0002\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Connection: close\r
 \r
@@ -26,7 +26,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 301 OK swsclose\r
-Location: moo.html&testcase=/10120002\r
+Location: moo.html&testcase=/%TESTNUMBER0002\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Connection: close\r
 \r
@@ -49,7 +49,7 @@ http
 HTTP POST with 301 redirect and --post301
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/blah/1012 -L -d "moo" --post301
+http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo" --post301
 </command>
 </client>
 
@@ -57,14 +57,14 @@ http://%HOSTIP:%HTTPPORT/blah/1012 -L -d "moo" --post301
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /blah/1012 HTTP/1.1\r
+POST /blah/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 3\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-mooPOST /blah/moo.html&testcase=/10120002 HTTP/1.1\r
+mooPOST /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 9a1e6d4e3cea76b959a256c294911fde3f146276..17a3371f10f46b13859327218171eb5a56da8b33 100644 (file)
@@ -23,7 +23,7 @@ Compare curl --version with curl-config --protocols
 --version
 </command>
 <postcheck>
-%SRCDIR/libtest/test1013.pl ../curl-config log/stdout1013 protocols
+%SRCDIR/libtest/test%TESTNUMBER.pl ../curl-config log/stdout%TESTNUMBER protocols
 </postcheck>
 </client>
 
index 5116aad7c54d6a002617400a4922751fd66f856f..875fa776208261e82086aefa1affbce9de13dc32 100644 (file)
@@ -23,7 +23,7 @@ Compare curl --version with curl-config --features
 --version
 </command>
 <postcheck>
-%SRCDIR/libtest/test1013.pl ../curl-config log/stdout1014 features
+%SRCDIR/libtest/test1013.pl ../curl-config log/stdout%TESTNUMBER features
 </postcheck>
 </client>
 
index c568b867832fcadac5a5b665e6bcf49a09e854cf..fc6ffc344453328e2e964d8247b88142caf8fd2a 100644 (file)
@@ -28,9 +28,9 @@ http
 --data-urlencode
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1015 --data-urlencode "my name is moo[]" --data-urlencode "y e s=s_i_r" --data-urlencode "v_alue@log/1015.txt" --data-urlencode @log/1015.txt 
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --data-urlencode "my name is moo[]" --data-urlencode "y e s=s_i_r" --data-urlencode "v_alue@log/%TESTNUMBER.txt" --data-urlencode @log/%TESTNUMBER.txt 
 </command>
-<file name="log/1015.txt">
+<file name="log/%TESTNUMBER.txt">
 content to _?!#$'|<>
 </file>
 </client>
@@ -39,7 +39,7 @@ content to _?!#$'|<>
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /1015 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 01bf100f3ce09bc574e8a6f17962490fcfafcc19..340dd969b4cc7231f9200cccddb4421ff11458fd 100644 (file)
@@ -23,9 +23,9 @@ file
 X-Y range on a file:// URL to stdout
  </name>
 <command option="no-include">
--r 1-4 file://localhost%FILE_PWD/log/test1016.txt 
+-r 1-4 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt 
 </command>
-<file name="log/test1016.txt">
+<file name="log/test%TESTNUMBER.txt">
 1234567890
 </file>
 </client>
index 9790d776d7a9c34a086b5e15558352cb188f45bb..034c87a7f7b921345fa0ad1e3ce0ecb2cc568220 100644 (file)
@@ -24,9 +24,9 @@ file
 0-Y range on a file:// URL to stdout
  </name>
 <command option="no-include">
--r 0-3 file://localhost%FILE_PWD/log/test1017.txt 
+-r 0-3 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt 
 </command>
-<file name="log/test1017.txt">
+<file name="log/test%TESTNUMBER.txt">
 1234567890
 </file>
 </client>
index ddf1f2595d31616646bf1ea2516347f6684b549f..25d8cb18072cd60e7229eb80824a498b49ddd57d 100644 (file)
@@ -23,9 +23,9 @@ file
 X-X range on a file:// URL to stdout
  </name>
 <command option="no-include">
--r 4-4 file://localhost%FILE_PWD/log/test1018.txt 
+-r 4-4 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt 
 </command>
-<file name="log/test1018.txt">
+<file name="log/test%TESTNUMBER.txt">
 1234567890
 </file>
 </client>
index 2a92ae5cf7e72c7bc36a23acfe194bd4e08b4580..02732b4836d66e9e4ae07ed42aa2f30688084d05 100644 (file)
@@ -24,9 +24,9 @@ file
 X- range on a file:// URL to stdout
  </name>
 <command option="no-include">
--r 7- file://localhost%FILE_PWD/log/test1019.txt 
+-r 7- file://localhost%FILE_PWD/log/test%TESTNUMBER.txt 
 </command>
-<file name="log/test1019.txt">
+<file name="log/test%TESTNUMBER.txt">
 1234567890
 1234567890
 </file>
index 141bc0f353600bee20f53b0dd2ae4fcd8568da1c..19be9356472083f6c327520e7344fe7b56040538 100644 (file)
@@ -30,7 +30,7 @@ ftp
 FTP RETR PASV
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/102
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 
 </client>
@@ -44,8 +44,8 @@ PWD
 EPSV\r
 PASV\r
 TYPE I\r
-SIZE 102\r
-RETR 102\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 0d88532f715759de8979b8c9d49eb9aaaf17cf0a..91c9b638962f1155fea4b6557841ad385d7ca371 100644 (file)
@@ -24,9 +24,9 @@ file
 -Y range on a file:// URL to stdout
  </name>
 <command option="no-include">
--r -9 file://localhost%FILE_PWD/log/test1020.txt 
+-r -9 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt 
 </command>
-<file name="log/test1020.txt">
+<file name="log/test%TESTNUMBER.txt">
 1234567890
 1234567890
 </file>
index 7e32efe0975fe78d83f630377367766ff4637f56..c4a90a6d9286afd2d2909d6e205ffde60f9b39f6 100644 (file)
@@ -106,7 +106,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://test.remote.example.com.1021:%HTTPPORT/path/10210002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-anyauth --proxytunnel
+http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-anyauth --proxytunnel
 </command>
 <precheck>
 chkhostname curlhost
@@ -116,25 +116,25 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-CONNECT test.remote.example.com.1021:%HTTPPORT HTTP/1.1\r
-Host: test.remote.example.com.1021:%HTTPPORT\r
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
-CONNECT test.remote.example.com.1021:%HTTPPORT HTTP/1.1\r
-Host: test.remote.example.com.1021:%HTTPPORT\r
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
-CONNECT test.remote.example.com.1021:%HTTPPORT HTTP/1.1\r
-Host: test.remote.example.com.1021:%HTTPPORT\r
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET /path/10210002 HTTP/1.1\r
-Host: test.remote.example.com.1021:%HTTPPORT\r
+GET /path/%TESTNUMBER0002 HTTP/1.1\r
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index 6a8b0125895f1f695f182b151460c30f8dba925e..e55b51ffe75a45a7e20c36704c7b6da3f423b727 100644 (file)
@@ -23,7 +23,7 @@ Compare curl --version with curl-config --version
 --version
 </command>
 <postcheck>
-%SRCDIR/libtest/test1022.pl ../curl-config log/stdout1022 version
+%SRCDIR/libtest/test%TESTNUMBER.pl ../curl-config log/stdout%TESTNUMBER version
 </postcheck>
 </client>
 
index 9c916a0851ca65dd0c8c02fe6544ab3f54cf5252..18071c6daec4cbf4242d1ec251212b226a9f0159 100644 (file)
@@ -23,7 +23,7 @@ Compare curl --version with curl-config --vernum
 --version
 </command>
 <postcheck>
-%SRCDIR/libtest/test1022.pl ../curl-config log/stdout1023 vernum
+%SRCDIR/libtest/test1022.pl ../curl-config log/stdout%TESTNUMBER vernum
 </postcheck>
 </client>
 
index a9c95abe4e1ecf369be2babb56edcf776ccecf74..5fba9d325a39a14cd7e3c6f43d071ccaccf7bfa5 100644 (file)
@@ -14,7 +14,7 @@ cookies
 HTTP/1.1 301 This is a weirdo text message\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
-Location: ../data/10240002.txt\r
+Location: ../data/%TESTNUMBER0002.txt\r
 Set-Cookie: firstcookie=want; path=/want/\r
 Content-Length: 69\r
 \r
@@ -25,7 +25,7 @@ This server reply is for testing a Location: following with cookies
 HTTP/1.1 301 This is a weirdo text message\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
-Location: ../want/10240003.txt\r
+Location: ../want/%TESTNUMBER0003.txt\r
 Set-Cookie: nextcookie=data; path=/data/\r
 Content-Length: 69\r
 \r
@@ -45,14 +45,14 @@ If this is received, the location following worked
 HTTP/1.1 301 This is a weirdo text message\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
-Location: ../data/10240002.txt\r
+Location: ../data/%TESTNUMBER0002.txt\r
 Set-Cookie: firstcookie=want; path=/want/\r
 Content-Length: 69\r
 \r
 HTTP/1.1 301 This is a weirdo text message\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
-Location: ../want/10240003.txt\r
+Location: ../want/%TESTNUMBER0003.txt\r
 Set-Cookie: nextcookie=data; path=/data/\r
 Content-Length: 69\r
 \r
@@ -75,24 +75,24 @@ http
 HTTP Location: following with cookies
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/1024 -L -c log/jar1024
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -c log/jar%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/1024 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /data/10240002.txt HTTP/1.1\r
+GET /data/%TESTNUMBER0002.txt HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /want/10240003.txt HTTP/1.1\r
+GET /want/%TESTNUMBER0003.txt HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 20d99fcb2359a1733e5fdba99bc33f0a9aea0f39..5f96e11237cd10dae59a787e02a40d26978ec728 100644 (file)
@@ -14,7 +14,7 @@ cookies
 HTTP/1.1 301 This is a weirdo text message\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
-Location: ../data/10250002.txt\r
+Location: ../data/%TESTNUMBER0002.txt\r
 Set-Cookie: firstcookie=want; path=/want/\r
 Content-Length: 69\r
 \r
@@ -25,7 +25,7 @@ This server reply is for testing a Location: following with cookies
 HTTP/1.1 301 This is a weirdo text message\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
-Location: ../want/10250003.txt\r
+Location: ../want/%TESTNUMBER0003.txt\r
 Set-Cookie: nextcookie=data; path=/data/\r
 Content-Length: 69\r
 \r
@@ -45,14 +45,14 @@ If this is received, the location following worked
 HTTP/1.1 301 This is a weirdo text message\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
-Location: ../data/10250002.txt\r
+Location: ../data/%TESTNUMBER0002.txt\r
 Set-Cookie: firstcookie=want; path=/want/\r
 Content-Length: 69\r
 \r
 HTTP/1.1 301 This is a weirdo text message\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
-Location: ../want/10250003.txt\r
+Location: ../want/%TESTNUMBER0003.txt\r
 Set-Cookie: nextcookie=data; path=/data/\r
 Content-Length: 69\r
 \r
@@ -75,26 +75,26 @@ http
 HTTP Location: following with command-line and server cookies
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/1025 -L -c log/jar1025 -b forcedcookie=yes
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -c log/jar%TESTNUMBER -b forcedcookie=yes
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/1025 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Cookie: forcedcookie=yes\r
 \r
-GET /data/10250002.txt HTTP/1.1\r
+GET /data/%TESTNUMBER0002.txt HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Cookie: forcedcookie=yes\r
 \r
-GET /want/10250003.txt HTTP/1.1\r
+GET /want/%TESTNUMBER0003.txt HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 6bda7a43fd1853c2ab061ab456ace90473c641b5..a702a1d6d0c6d2c2a570f5a6f506d541eba6b6fb 100644 (file)
@@ -28,7 +28,7 @@ curl --manual
 # Search for these two sentinel lines in the manual output; if they are found,
 # then chances are good the entire manual is there.
 <postcheck>
-perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(curl\s*-\s*transfer\sa\s*URL)|(CONTRIBUTORS)/, <IN>); exit ($lines != 2); # Let this file pass an XML syntax check: </IN>' log/stdout1026
+perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(curl\s*-\s*transfer\sa\s*URL)|(CONTRIBUTORS)/, <IN>); exit ($lines != 2); # Let this file pass an XML syntax check: </IN>' log/stdout%TESTNUMBER
 </postcheck>
 </client>
 
index 9c3d6e3eaf1e3199d42753a4e5fef3d6be59272d..7574203e2b66c607788b6efb46de72049cb58e52 100644 (file)
@@ -25,7 +25,7 @@ curl --help
 # Search for these two sentinel lines in the help output; if they are found,
 # then chances are good the entire help is there.
 <postcheck>
-perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(Usage: curl )|(--version\s*Show version)/, <IN>); exit ($lines != 2); # Let this file pass an XML syntax check: </IN>' log/stdout1027
+perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(Usage: curl )|(--version\s*Show version)/, <IN>); exit ($lines != 2); # Let this file pass an XML syntax check: </IN>' log/stdout%TESTNUMBER
 </postcheck>
 </client>
 
index 02d0e1d06d1536b439e98003fa0163678e606271..cff3028157a53a155b3694e29d266a305c3808d4 100644 (file)
@@ -19,7 +19,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose\r
 Content-Type: text/html\r
 Funny-head: yesyes\r
-Location: ftp://%HOSTIP:%FTPPORT/10280002\r
+Location: ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002\r
 Content-Length: 0\r
 Connection: close\r
 \r
@@ -45,7 +45,7 @@ ftp
 HTTP Location: redirect to FTP URL
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/10280001 -L
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -L
 </command>
 </client>
 
@@ -53,7 +53,7 @@ http://%HOSTIP:%HTTPPORT/10280001 -L
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /10280001 HTTP/1.1\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -63,8 +63,8 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 10280002\r
-RETR 10280002\r
+SIZE %TESTNUMBER0002\r
+RETR %TESTNUMBER0002\r
 QUIT\r
 </protocol>
 <stdout>
@@ -73,7 +73,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose\r
 Content-Type: text/html\r
 Funny-head: yesyes\r
-Location: ftp://%HOSTIP:%FTPPORT/10280002\r
+Location: ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002\r
 Content-Length: 0\r
 Connection: close\r
 \r
index b1f5982e488529c561e690754cef2ed76a41edc9..f39ac6ed47fe5033bf9d42b8db5a49259b6cedc4 100644 (file)
@@ -13,7 +13,7 @@ followlocation
 <reply>
 <data nocheck="yes">
 HTTP/1.1 301 This is a weirdo text message swsclose\r
-Location: data/10290002.txt?coolsite=yes\r
+Location: data/%TESTNUMBER0002.txt?coolsite=yes\r
 Content-Length: 62\r
 Connection: close\r
 \r
@@ -30,14 +30,14 @@ http
 HTTP Location: and 'redirect_url' check
  </name>
 <command>
-http://%HOSTIP:%HTTPPORT/we/want/our/1029 -w '%{redirect_url} %{url} %{exitcode} %{errormsg}\n'
+http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url} %{url} %{exitcode} %{errormsg}\n'
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/our/1029 HTTP/1.1\r
+GET /we/want/our/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -45,12 +45,12 @@ Accept: */*
 </protocol>
 <stdout>
 HTTP/1.1 301 This is a weirdo text message swsclose\r
-Location: data/10290002.txt?coolsite=yes\r
+Location: data/%TESTNUMBER0002.txt?coolsite=yes\r
 Content-Length: 62\r
 Connection: close\r
 \r
 This server reply is for testing a simple Location: following
-http://%HOSTIP:%HTTPPORT/we/want/our/data/10290002.txt?coolsite=yes http://%HOSTIP:%HTTPPORT/we/want/our/1029 0 
+http://%HOSTIP:%HTTPPORT/we/want/our/data/%TESTNUMBER0002.txt?coolsite=yes http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER 0 
 </stdout>
 </verify>
 </testcase>
index 15712f5da11220436931cacd542eec8cb57cc2e6..308c15491f3b6f4dfe2be87a06a79557d7ab5149 100644 (file)
@@ -27,7 +27,7 @@ ftp
 FTP RETR PORT with CWD
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/a/path/103 -P -
+ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER -P -
 </command>
 </client>
 
@@ -46,8 +46,8 @@ CWD a
 CWD path\r
 PORT 127,0,0,1,0,0\r
 TYPE I\r
-SIZE 103\r
-RETR 103\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 735c08b7ab881eafd7c832b66446aa5c39875a2c..bd4e18f1a12cb0c2e9a556890572039c4ebee61e 100644 (file)
@@ -67,9 +67,9 @@ crypto
 HTTP PUT with --anyauth authorization (picking Digest)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1030 -T log/put1030 -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --anyauth
 </command>
-<file name="log/put1030">
+<file name="log/put%TESTNUMBER">
 This is data we upload with PUT
 a second line
 line three
@@ -80,7 +80,7 @@ four is the number of lines
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /1030 HTTP/1.1\r
+PUT /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -91,9 +91,9 @@ This is data we upload with PUT
 a second line
 line three
 four is the number of lines
-PUT /1030 HTTP/1.1\r
+PUT /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/1030", response="01cb59db1ddaac246b072d5f5f0716d9"\r
+Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/%TESTNUMBER", response="01cb59db1ddaac246b072d5f5f0716d9"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 85\r
index c139b356c5f25b0ebdd3fce58383a3b2dda88667..c6e479588f985c1e6e51f54e8cb30002139a8ac3 100644 (file)
@@ -12,7 +12,7 @@ followlocation
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: ?coolsite=yes/10310002.txt
+Location: ?coolsite=yes/%TESTNUMBER0002.txt
 Connection: close
 
 This server reply is for testing a simple Location: following
@@ -31,7 +31,7 @@ If this is received, the location following worked
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: ?coolsite=yes/10310002.txt
+Location: ?coolsite=yes/%TESTNUMBER0002.txt
 Connection: close
 
 HTTP/1.1 200 Followed here fine swsclose
@@ -53,19 +53,19 @@ http
 HTTP Location: following to a query string
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/this/1031 -L
+http://%HOSTIP:%HTTPPORT/want/this/%TESTNUMBER -L
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/this/1031 HTTP/1.1\r
+GET /want/this/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /want/this/1031?coolsite=yes/10310002.txt HTTP/1.1\r
+GET /want/this/%TESTNUMBER?coolsite=yes/%TESTNUMBER0002.txt HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index a3d8be706ec822360b54ea40d7c350f7c18265f2..8af07dc78c3062235756ea5992a265b81fb4eb2d 100644 (file)
@@ -35,7 +35,7 @@ http
 HTTP HEAD with --range
  </name>
  <command>
---range 1-3 --head http://%HOSTIP:%HTTPPORT/1032
+--range 1-3 --head http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -43,7 +43,7 @@ HTTP HEAD with --range
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-HEAD /1032 HTTP/1.1\r
+HEAD /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=1-3\r
 User-Agent: curl/%VERSION\r
index 34676ea7fe9829056eafa142c36bf2857481aa5d..7d9ff0364b96b4467560f4ae6a91c2d60b6f37d1 100644 (file)
@@ -40,7 +40,7 @@ http
 HTTP GET with 102 response!
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1033
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -48,7 +48,7 @@ http://%HOSTIP:%HTTPPORT/1033
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1033 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 89083a294c0341fc759afb50fe590e8f363d2853..565a1b7285b8158d18bc82c1b542b6da5fe03607 100644 (file)
@@ -40,7 +40,7 @@ HTTP over proxy with malformatted IDN host name
 # This host name contains an invalid UTF-8 byte sequence that can't be
 # converted into an IDN name
 <stdin>
-url = "http://invalid-utf8-â\90.local/page/1034"
+url = "http://invalid-utf8-â\90.local/page/%TESTNUMBER"
 </stdin>
  <command>
 -K - -x %HOSTIP:%NOLISTENPORT
index b67eab281b86c010ec33d8d928c04c9055de8cef..a2b98cc943c200fe9ed358ba9ad917775865d297 100644 (file)
@@ -35,7 +35,7 @@ perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(lan
 HTTP over proxy with too long IDN host name
  </name>
  <command>
-http://too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local/page/1035 -x %HOSTIP:%NOLISTENPORT
+http://too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local/page/%TESTNUMBER -x %HOSTIP:%NOLISTENPORT
 </command>
 </client>
 
index b8ebc4fc0eb20d64a3abb873841c189fb73b26a0..4ab61a27837d41b40725df60c21f9dee9d37df26 100644 (file)
@@ -31,9 +31,9 @@ ftp
 FTP download resume from end of file
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1036 -C -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C -
 </command>
-<file name="log/curl1036.out">
+<file name="log/curl%TESTNUMBER.out">
 This is the start!!
 </file>
 </client>
@@ -47,12 +47,12 @@ PWD
 EPSV\r
 PASV\r
 TYPE I\r
-SIZE 1036\r
+SIZE %TESTNUMBER\r
 REST 20\r
-RETR 1036\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
-<file name="log/curl1036.out">
+<file name="log/curl%TESTNUMBER.out">
 This is the start!!
 expected to be a file without the first part
 but we emulate that
index d9cdc0a666ae8d1e134f5a5ed31d11b576424fce..d9cacb2339ca53ddc38deaf2967f065a1e797f9d 100644 (file)
@@ -31,9 +31,9 @@ ftp
 FTP download resume from end of empty file
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1037 -C -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C -
 </command>
-<file name="log/curl1037.out">
+<file name="log/curl%TESTNUMBER.out">
 </file>
 </client>
 
@@ -46,8 +46,8 @@ PWD
 EPSV\r
 PASV\r
 TYPE I\r
-SIZE 1037\r
-RETR 1037\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 9572d78e05e2e8ceb40e29059645c1a3282d647f..acac84a29b769070038991300c95b19e2c3e2a38 100644 (file)
@@ -23,9 +23,9 @@ ftp
 FTP PASV upload resume from end of file
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1038 -T log/upload1038 -C -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER -C -
 </command>
-<file name="log/upload1038">
+<file name="log/upload%TESTNUMBER">
 this is the *****cr@p******** that we're gonna upload
 
 worx?
@@ -40,8 +40,8 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 1038\r
-APPE 1038\r
+SIZE %TESTNUMBER\r
+APPE %TESTNUMBER\r
 QUIT\r
 </protocol>
 <upload>
index 654d836d2619fac2c218857f947687fe59850484..53d7cb5cb4cf36e9454e1cb3dc6e313e3ce2ea0d 100644 (file)
@@ -23,9 +23,9 @@ ftp
 FTP PASV upload resume from end of empty file
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1039 -T log/upload1039 -C -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER -C -
 </command>
-<file name="log/upload1039">
+<file name="log/upload%TESTNUMBER">
 this is the *****cr@p******** that we're gonna upload
 
 worx?
@@ -40,8 +40,8 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 1039\r
-STOR 1039\r
+SIZE %TESTNUMBER\r
+STOR %TESTNUMBER\r
 QUIT\r
 </protocol>
 <upload>
index 82df98aee9c0ca4a25d26f9e1e7eb03c5b215306..8b44911dec60a573b8080cbdca96950479806e09 100644 (file)
@@ -21,7 +21,7 @@ ftp
 FTP --head to get file size only
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/a/path/104 --head
+ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER --head
 </command>
 </client>
 
@@ -33,9 +33,9 @@ PASS ftp@example.com
 PWD\r
 CWD a\r
 CWD path\r
-MDTM 104\r
+MDTM %TESTNUMBER\r
 TYPE I\r
-SIZE 104\r
+SIZE %TESTNUMBER\r
 REST 0\r
 QUIT\r
 </protocol>
index d480bb4484acf669813a8ac207bf676178c5fd9c..8899c5b06194fdd614577e38b568f34e2b1ec453 100644 (file)
@@ -47,9 +47,9 @@ http
 HTTP GET with resume from end of entirely-downloaded file
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1040 -C -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C -
 </command>
-<file name="log/curl1040.out">
+<file name="log/curl%TESTNUMBER.out">
 012345678
 012345678
 012345678
@@ -66,7 +66,7 @@ http://%HOSTIP:%HTTPPORT/1040 -C -
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1040 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=100-\r
 User-Agent: curl/%VERSION\r
index 646b36fb39770fc110bb20c075134dca39a5a21a..5580b9589a827eadd625d5755f9457eae43a6b86 100644 (file)
@@ -31,7 +31,7 @@ http
  <name>
 HTTP PUT with resume from end of already-uploaded file
  </name>
-<file name="log/test1041.txt">
+<file name="log/test%TESTNUMBER.txt">
 012345678
 012345678
 012345678
@@ -44,7 +44,7 @@ HTTP PUT with resume from end of already-uploaded file
 012345678
 </file>
  <command>
-http://%HOSTIP:%HTTPPORT/1041 -Tlog/test1041.txt -C -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -Tlog/test%TESTNUMBER.txt -C -
 </command>
 </client>
 
@@ -53,7 +53,7 @@ http://%HOSTIP:%HTTPPORT/1041 -Tlog/test1041.txt -C -
 # curl doesn't do a HEAD request on the remote file so it has no idea whether
 # it can skip part of the file or not.  Instead, it sends the entire file.
 <protocol>
-PUT /1041 HTTP/1.1\r
+PUT /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Content-Range: bytes 0-99/100\r
 User-Agent: curl/%VERSION\r
index d374d2ab5e59eedf45d1531b5362bb8bf562fb48..4a33ae826d5d51485f6d0e7eeb6f27a138788fe6 100644 (file)
@@ -59,9 +59,9 @@ http
 HTTP GET beyond end of entirely-downloaded file, no server resume
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1042 -C 200
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 200
 </command>
-<file name="log/curl1042.out">
+<file name="log/curl%TESTNUMBER.out">
 012345678
 012345678
 012345678
@@ -81,7 +81,7 @@ http://%HOSTIP:%HTTPPORT/1042 -C 200
 33
 </errorcode>
 <protocol>
-GET /1042 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=200-\r
 User-Agent: curl/%VERSION\r
index e200b61ea37c601ab0f38af6aaf36404f10426ca..c728b9688832c1b06317f7a4e5a29ad4a710e95a 100644 (file)
@@ -58,9 +58,9 @@ http
 HTTP GET with resume from end of file
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1043 -C -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C -
 </command>
-<file name="log/curl1043.out">
+<file name="log/curl%TESTNUMBER.out">
 012345678
 012345678
 012345678
@@ -71,7 +71,7 @@ http://%HOSTIP:%HTTPPORT/1043 -C -
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1043 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=40-\r
 User-Agent: curl/%VERSION\r
index a95f5681d7dfb712d543ef375638bb2b059192b5..c5f3a29251a24fb4c5da49e7dedd72c36b468897 100644 (file)
@@ -32,7 +32,7 @@ ftp
 FTP download large file info with -I
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/blalbla/1044 -I
+ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -I
 </command>
 </client>
 
@@ -43,9 +43,9 @@ USER anonymous
 PASS ftp@example.com\r
 PWD\r
 CWD blalbla\r
-MDTM 1044\r
+MDTM %TESTNUMBER\r
 TYPE I\r
-SIZE 1044\r
+SIZE %TESTNUMBER\r
 REST 0\r
 QUIT\r
 </protocol>
index 9de169babdcd86bdb18d2a7a26cdec5b2f2e6617..c2c7df7f681bd5f8858552619cddb36318e410b5 100644 (file)
@@ -32,7 +32,7 @@ http
 HTTP GET with numeric localhost --interface
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1045 --interface %CLIENTIP
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --interface %CLIENTIP
 </command>
 </client>
 
@@ -40,7 +40,7 @@ http://%HOSTIP:%HTTPPORT/1045 --interface %CLIENTIP
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1045 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 0f04b8a33433c551f53145e97be2a4a9dea9ab71..f781098934c9b8e82fbe31b0c932080959647445 100644 (file)
@@ -36,7 +36,7 @@ http-ipv6
 HTTP-IPv6 GET with numeric localhost --interface
  </name>
  <command>
--g "http://%HOST6IP:%HTTP6PORT/1046" --interface ::1
+-g "http://%HOST6IP:%HTTP6PORT/%TESTNUMBER" --interface ::1
 </command>
 # --interface doesn't accept an address surrounded by [] so %CLIENT6IP is out
 <precheck>
@@ -48,7 +48,7 @@ perl -e "print 'Test requires default test client host address' if ( '%CLIENT6IP
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1046 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOST6IP:%HTTP6PORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index de18bee3b4cb415a286456fba45b6c58bab75aaa..713b4bb19f84a808888500aba6fc5a7e91ae6adf 100644 (file)
@@ -28,7 +28,7 @@ tftp
 TFTP retrieve with localhost --interface
  </name>
  <command>
-tftp://%HOSTIP:%TFTPPORT//1049 --interface %CLIENTIP
+tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --interface %CLIENTIP
 </command>
 </client>
 
@@ -41,7 +41,7 @@ mode: octet
 tsize: 0
 blksize: 512
 timeout: 6
-filename: /1049
+filename: /%TESTNUMBER
 </protocol>
 </verify>
 </testcase>
index 14679d17ba3593b24c812056634e72c73e6379e7..74922d5598681b2efae7631d1ca3c9d24598f7c4 100644 (file)
@@ -31,7 +31,7 @@ ftp
 FTP user+password in URL and ASCII transfer
  </name>
  <command>
-ftp://userdude:passfellow@%HOSTIP:%FTPPORT/105 --use-ascii
+ftp://userdude:passfellow@%HOSTIP:%FTPPORT/%TESTNUMBER --use-ascii
 </command>
 </client>
 
@@ -44,7 +44,7 @@ PWD
 EPSV\r
 PASV\r
 TYPE A\r
-RETR 105\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 7a8eae1bd56ca3173ef653cfff66f364a18cd17a..5a1cf34c6ffb05573f0723ecaa7e19ddf314bcba 100644 (file)
@@ -13,7 +13,7 @@ followlocation
 HTTP/1.1 301 Redirect swsclose\r
 Date: Thu, 29 Jul 2008 14:49:00 GMT\r
 Server: test-server/fake\r
-Location: data/10510002.txt?coolsite=yes\r
+Location: data/%TESTNUMBER0002.txt?coolsite=yes\r
 Content-Length: 0\r
 Connection: close\r
 \r
@@ -32,7 +32,7 @@ If this is received, the location following worked
 HTTP/1.1 301 Redirect swsclose\r
 Date: Thu, 29 Jul 2008 14:49:00 GMT\r
 Server: test-server/fake\r
-Location: data/10510002.txt?coolsite=yes\r
+Location: data/%TESTNUMBER0002.txt?coolsite=yes\r
 Content-Length: 0\r
 Connection: close\r
 \r
@@ -56,9 +56,9 @@ http
 HTTP PUT with Location: following
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/1051 -L -T log/test1051.txt
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -T log/test%TESTNUMBER.txt
 </command>
-<file name="log/test1051.txt">
+<file name="log/test%TESTNUMBER.txt">
 Weird
      file
          to
@@ -80,7 +80,7 @@ the
 # server says 301 and 100 _after_ the entire PUT body has been sent.
 
 <protocol>
-PUT /want/1051 HTTP/1.1\r
+PUT /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -96,7 +96,7 @@ for
 the
    PUT
       feature
-PUT /want/data/10510002.txt?coolsite=yes HTTP/1.1\r
+PUT /want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index e0c2f32a630b103212df75e7c85236213a735afc..8f8ee61bc3d2ed31087dd552c6f3cfe4a072a5b0 100644 (file)
@@ -13,7 +13,7 @@ followlocation
 HTTP/1.0 301 Redirect swsclose\r
 Date: Thu, 29 Jul 2008 14:49:00 GMT\r
 Server: test-server/fake\r
-Location: data/10520002.txt?coolsite=yes\r
+Location: data/%TESTNUMBER0002.txt?coolsite=yes\r
 Content-Length: 0\r
 Connection: close\r
 \r
@@ -30,7 +30,7 @@ If this is received, the location following worked
 HTTP/1.0 301 Redirect swsclose\r
 Date: Thu, 29 Jul 2008 14:49:00 GMT\r
 Server: test-server/fake\r
-Location: data/10520002.txt?coolsite=yes\r
+Location: data/%TESTNUMBER0002.txt?coolsite=yes\r
 Content-Length: 0\r
 Connection: close\r
 \r
@@ -52,9 +52,9 @@ http
 HTTP 1.0 PUT with Location: following
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/1052 -0 -L -T log/test1052.txt
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -0 -L -T log/test%TESTNUMBER.txt
 </command>
-<file name="log/test1052.txt">
+<file name="log/test%TESTNUMBER.txt">
 Weird
      file
          to
@@ -75,7 +75,7 @@ the
 # including the full request-body before it responds. So in this test the
 # server says 301 and 200 _after_ the entire PUT body has been sent.
 <protocol>
-PUT /want/1052 HTTP/1.0\r
+PUT /want/%TESTNUMBER HTTP/1.0\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -90,7 +90,7 @@ for
 the
    PUT
       feature
-PUT /want/data/10520002.txt?coolsite=yes HTTP/1.0\r
+PUT /want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.0\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index c32eb08ce2990d4bf473d0c8bed986bcb2fcc98a..bd5de2568476b05f8f76d1537954de6d2c9816f1 100644 (file)
@@ -15,7 +15,7 @@ followlocation
 HTTP/1.1 307 Redirect swsclose\r
 Date: Thu, 29 Jul 2008 14:49:00 GMT\r
 Server: test-server/fake\r
-Location: data/10530002.txt?coolsite=yes\r
+Location: data/%TESTNUMBER0002.txt?coolsite=yes\r
 Content-Length: 0\r
 Connection: close\r
 \r
@@ -34,7 +34,7 @@ blablabla
 HTTP/1.1 307 Redirect swsclose\r
 Date: Thu, 29 Jul 2008 14:49:00 GMT\r
 Server: test-server/fake\r
-Location: data/10530002.txt?coolsite=yes\r
+Location: data/%TESTNUMBER0002.txt?coolsite=yes\r
 Content-Length: 0\r
 Connection: close\r
 \r
@@ -58,10 +58,10 @@ http
 HTTP RFC1867-type formposting from file with Location: following
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/1053 -L -F name=daniel -F tool=curl -F file=@log/test1053.txt
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -L -F name=daniel -F tool=curl -F file=@log/test%TESTNUMBER.txt
 </command>
 # We create this file before the command is invoked!
-<file name="log/test1053.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo-
 This is a moo-
 bar
@@ -74,7 +74,7 @@ bar
 ^(Content-Type: multipart/form-data;|------------).*
 </strip>
 <protocol>
-POST /we/want/1053 HTTP/1.1\r
+POST /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -90,7 +90,7 @@ Content-Disposition: form-data; name="tool"
 \r
 curl\r
 ------------------------------9ef8d6205763\r
-Content-Disposition: form-data; name="file"; filename="test1053.txt"\r
+Content-Disposition: form-data; name="file"; filename="test%TESTNUMBER.txt"\r
 Content-Type: text/plain\r
 \r
 foo-
@@ -98,7 +98,7 @@ This is a moo-
 bar
 \r
 ------------------------------9ef8d6205763--\r
-POST /we/want/data/10530002.txt?coolsite=yes HTTP/1.1\r
+POST /we/want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -114,7 +114,7 @@ Content-Disposition: form-data; name="tool"
 \r
 curl\r
 ------------------------------9ef8d6205763\r
-Content-Disposition: form-data; name="file"; filename="test1053.txt"\r
+Content-Disposition: form-data; name="file"; filename="test%TESTNUMBER.txt"\r
 Content-Type: text/plain\r
 \r
 foo-
index ac6671f6efefdc7672966dc0ca3ce61b27dcb5cb..d8b1d452c0a744208079825fe720fb2f062a9db7 100644 (file)
@@ -12,7 +12,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 301 OK swsclose\r
-Location: moo/testcase/10540002\r
+Location: moo/testcase/%TESTNUMBER0002\r
 Date: Thu, 31 Jul 2008 14:49:00 GMT\r
 Connection: close\r
 \r
@@ -26,7 +26,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 301 OK swsclose\r
-Location: moo/testcase/10540002\r
+Location: moo/testcase/%TESTNUMBER0002\r
 Date: Thu, 31 Jul 2008 14:49:00 GMT\r
 Connection: close\r
 \r
@@ -47,11 +47,11 @@ http
  <name>
 HTTP POST from file with 301 redirect and --post301
  </name>
-<file name="log/test1054.txt">
+<file name="log/test%TESTNUMBER.txt">
 field=data
 </file>
  <command>
-http://%HOSTIP:%HTTPPORT/blah/1054 -L -d @log/test1054.txt --post301
+http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d @log/test%TESTNUMBER.txt --post301
 </command>
 </client>
 
@@ -59,14 +59,14 @@ http://%HOSTIP:%HTTPPORT/blah/1054 -L -d @log/test1054.txt --post301
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /blah/1054 HTTP/1.1\r
+POST /blah/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 10\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-field=dataPOST /blah/moo/testcase/10540002 HTTP/1.1\r
+field=dataPOST /blah/moo/testcase/%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 243d5070a479af0e7059c338d40bc95f0bbd1603..f6f37531f81eab42bc5abe30853a4f261796bc87 100644 (file)
@@ -18,7 +18,7 @@ HTTP/1.1 307 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake swsclose\r
 Content-Type: text/html\r
-Location: ftp://%HOSTIP:%FTPPORT/1055\r
+Location: ftp://%HOSTIP:%FTPPORT/%TESTNUMBER\r
 Content-Length: 0\r
 Connection: close\r
 \r
@@ -36,9 +36,9 @@ ftp
 HTTP PUT Location: redirect to FTP URL
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1055 -L -T log/test1055.txt
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -L -T log/test%TESTNUMBER.txt
 </command>
-<file name="log/test1055.txt">
+<file name="log/test%TESTNUMBER.txt">
 Weird
      file
          to
@@ -55,7 +55,7 @@ the
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /1055 HTTP/1.1\r
+PUT /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -76,7 +76,7 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-STOR 1055\r
+STOR %TESTNUMBER\r
 QUIT\r
 </protocol>
 <upload>
index 7ccdb219975a1f40a92dc2d491e7a238e6807add..2bf70ccfeba2bec36bb37b57dc289d0290c720a4 100644 (file)
@@ -13,7 +13,7 @@ IPv6
 <reply>
 <data>
 HTTP/1.1 302 OK swsclose\r
-Location: http://[::1%259999]:%HTTP6PORT/moo/10560002\r
+Location: http://[::1%259999]:%HTTP6PORT/moo/%TESTNUMBER0002\r
 Date: Thu, 31 Jul 2008 14:49:00 GMT\r
 Connection: close\r
 \r
@@ -27,7 +27,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 302 OK swsclose\r
-Location: http://[::1%259999]:%HTTP6PORT/moo/10560002\r
+Location: http://[::1%259999]:%HTTP6PORT/moo/%TESTNUMBER0002\r
 Date: Thu, 31 Jul 2008 14:49:00 GMT\r
 Connection: close\r
 \r
@@ -53,7 +53,7 @@ http-ipv6
 HTTP follow redirect from IPv4 to IPv6 with scope
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/are/all/twits/1056 -L
+http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 </command>
 </client>
 
@@ -61,12 +61,12 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/1056 -L
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/are/all/twits/1056 HTTP/1.1\r
+GET /we/are/all/twits/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /moo/10560002 HTTP/1.1\r
+GET /moo/%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOST6IP:%HTTP6PORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index b4ef20c8da3d8369f38a234a31a2a4e54fd491f8..ce3fc0b61f9a43e09346e9f9f472ffef5e641415 100644 (file)
@@ -30,7 +30,7 @@ ftp
 FTP retrieve a byte-range relative to end of file
  </name>
  <command>
--r -12 ftp://%HOSTIP:%FTPPORT/1057
+-r -12 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -42,9 +42,9 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 1057\r
+SIZE %TESTNUMBER\r
 REST 52\r
-RETR 1057\r
+RETR %TESTNUMBER\r
 ABOR\r
 QUIT\r
 </protocol>
index d177b5fd78c827c94c494b66eb458e9cf9538081..ee6c300c10c1fb32d46dce989b8948c2e6dbe3d0 100644 (file)
@@ -33,14 +33,14 @@ http
 HTTP range relative to end of file
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/1058 -r -101
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -r -101
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/1058 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=-101\r
 User-Agent: curl/%VERSION\r
index b3aacbed6f41b44d5ba37e20a727173991bba6fc..95d4b95cde7aeed9cecf623176fba8b048f0a8c6 100644 (file)
@@ -35,7 +35,7 @@ http
 HTTP CONNECT with proxytunnel to unsupported FTP URL
  </name>
  <command>
-ftp://test-number:1059/wanted/page -p -x %HOSTIP:%HTTPPORT
+ftp://test-number:%TESTNUMBER/wanted/page -p -x %HOSTIP:%HTTPPORT
 </command>
 </client>
 
@@ -47,8 +47,8 @@ ftp://test-number:1059/wanted/page -p -x %HOSTIP:%HTTPPORT
 56
 </errorcode>
 <protocol>
-CONNECT test-number:1059 HTTP/1.1\r
-Host: test-number:1059\r
+CONNECT test-number:%TESTNUMBER HTTP/1.1\r
+Host: test-number:%TESTNUMBER\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
index b7676f7a07bc1c2247f02f24845952734e664ddc..981e9dfa9dd7d5aef589e89e29c5af12c770f86e 100644 (file)
@@ -29,7 +29,7 @@ ftp
 FTP GET with type=A style ASCII URL using %20 codes
  </name>
  <command>
-"ftp://%HOSTIP:%FTPPORT//path%20with%20%20spaces//and%20things2/106;type=A"
+"ftp://%HOSTIP:%FTPPORT//path%20with%20%20spaces//and%20things2/%TESTNUMBER;type=A"
 </command>
 </client>
 
@@ -44,7 +44,7 @@ CWD path with  spaces
 CWD and things2\r
 EPSV\r
 TYPE A\r
-RETR 106\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index c3a76a7f84e24b6c9651ba4ec8b92414369333d6..7eab061e65b3fbba2df8b3a88d1be666d8dd60c9 100644 (file)
@@ -875,26 +875,26 @@ proxy
 HTTP proxy CONNECT auth Digest, large headers and data
  </name>
  <command>
-http://test.remote.haxx.se.1060:8990/path/10600002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
+http://test.remote.haxx.se.%TESTNUMBER:8990/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-CONNECT test.remote.haxx.se.1060:8990 HTTP/1.1\r
-Host: test.remote.haxx.se.1060:8990\r
+CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1\r
+Host: test.remote.haxx.se.%TESTNUMBER:8990\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
-CONNECT test.remote.haxx.se.1060:8990 HTTP/1.1\r
-Host: test.remote.haxx.se.1060:8990\r
-Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.1060:8990", response="e1fbed39c26f4efe284adc0e576ff638"\r
+CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1\r
+Host: test.remote.haxx.se.%TESTNUMBER:8990\r
+Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.%TESTNUMBER:8990", response="e1fbed39c26f4efe284adc0e576ff638"\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET /path/10600002 HTTP/1.1\r
-Host: test.remote.haxx.se.1060:8990\r
+GET /path/%TESTNUMBER0002 HTTP/1.1\r
+Host: test.remote.haxx.se.%TESTNUMBER:8990\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index 39b23b35b25e90c039d55fef7098f58b375f8aef..c7fcedbc9f58a457b8af3697bdfe9e4d94ac17f4 100644 (file)
@@ -880,26 +880,26 @@ proxy
 HTTP proxy CONNECT auth Digest, large headers and chunked data
  </name>
  <command>
-http://test.remote.haxx.se.1061:8990/path/10610002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
+http://test.remote.haxx.se.%TESTNUMBER:8990/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-CONNECT test.remote.haxx.se.1061:8990 HTTP/1.1\r
-Host: test.remote.haxx.se.1061:8990\r
+CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1\r
+Host: test.remote.haxx.se.%TESTNUMBER:8990\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
-CONNECT test.remote.haxx.se.1061:8990 HTTP/1.1\r
-Host: test.remote.haxx.se.1061:8990\r
-Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.1061:8990", response="4e23449fa93224834299e7282a70472c"\r
+CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1\r
+Host: test.remote.haxx.se.%TESTNUMBER:8990\r
+Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.%TESTNUMBER:8990", response="4e23449fa93224834299e7282a70472c"\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET /path/10610002 HTTP/1.1\r
-Host: test.remote.haxx.se.1061:8990\r
+GET /path/%TESTNUMBER0002 HTTP/1.1\r
+Host: test.remote.haxx.se.%TESTNUMBER:8990\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index d96686e05caecefdeb160d6e8406502446211316..df72e6622318ed9aa86d381f012056f937cc6524 100644 (file)
@@ -28,7 +28,7 @@ ftp
 FTP with excessively long server command response lines, boundary condition
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/1062
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>
 
@@ -41,8 +41,8 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE 1062\r
-RETR 1062\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index de2085d3ec053055ad715ca3febd56b789c0f7f5..ca1ba14a8dd0dcdd99cb6691819ec5d78bd6050d 100644 (file)
@@ -28,9 +28,9 @@ Invalid large X- range on a file://
 # This range value is 2**32+7, which will be truncated to the valid value 7
 # if the large file support is not working correctly
  <command>
--r 4294967303- file://localhost%FILE_PWD/log/test1063.txt 
+-r 4294967303- file://localhost%FILE_PWD/log/test%TESTNUMBER.txt 
 </command>
-<file name="log/test1063.txt">
+<file name="log/test%TESTNUMBER.txt">
 1234567890
 1234567890
 </file>
index 3d2f4d2cbf6c1d6dec42bdddb921ede99f0bf0c7..81014845ff466faa44c791ef82eef88beb9dde25 100644 (file)
@@ -35,9 +35,9 @@ http
 HTTP PUT twice
  </name>
  <command>
--H "Expect:" -T log/1064 http://%HOSTIP:%HTTPPORT/1064.upload1 -T log/1064 http://%HOSTIP:%HTTPPORT/10640002.upload2
+-H "Expect:" -T log/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 -T log/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002.upload2
 </command>
-<file name="log/1064">
+<file name="log/%TESTNUMBER">
 test
 </file>
 </client>
@@ -45,14 +45,14 @@ test
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /1064.upload1 HTTP/1.1\r
+PUT /%TESTNUMBER.upload1 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 5\r
 \r
 test
-PUT /10640002.upload2 HTTP/1.1\r
+PUT /%TESTNUMBER0002.upload2 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 1d27ffb4b79dabcebcba9f117212777e4c1553bc..8bef0e1e03fa00317a62453b36b0c78d42d09986 100644 (file)
@@ -36,9 +36,9 @@ http
 HTTP PUT with one file but two URLs
  </name>
  <command>
--H "Expect:" -T log/1065 http://%HOSTIP:%HTTPPORT/1065.upload1 http://%HOSTIP:%HTTPPORT/10650002.url2
+-H "Expect:" -T log/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002.url2
 </command>
-<file name="log/1065">
+<file name="log/%TESTNUMBER">
 test
 </file>
 </client>
@@ -46,14 +46,14 @@ test
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /1065.upload1 HTTP/1.1\r
+PUT /%TESTNUMBER.upload1 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 5\r
 \r
 test
-GET /10650002.url2 HTTP/1.1\r
+GET /%TESTNUMBER0002.url2 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 8175af1727ac97fb183b489bf040e8090dffe70b..1fbd7dc08ce8c3a64c57414c2b40c2e832b5c393 100644 (file)
@@ -35,19 +35,19 @@ http
 HTTP --dump-header - with two URLs
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/1066 http://%HOSTIP:%HTTPPORT/want/10660001 --dump-header -
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER0001 --dump-header -
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/1066 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /want/10660001 HTTP/1.1\r
+GET /want/%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 5790f6b869b8e34917ade961da21096583578947..e5023f58f1f854fd3e9db584352e3698257ce226 100644 (file)
@@ -12,7 +12,7 @@ followlocation
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: data/10670002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Connection: close
 
 This server reply is for testing a simple Location: following
@@ -31,7 +31,7 @@ If this is received, the location following worked
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: data/10670002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Connection: close
 
 HTTP/1.1 200 Followed here fine swsclose
@@ -53,28 +53,28 @@ http
 HTTP Location: following with auto-referer
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/1067 --silent --location --referer "firstone.html;auto" --write-out "%{stderr}|%{referer}|"
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER --silent --location --referer "firstone.html;auto" --write-out "%{stderr}|%{referer}|"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/1067 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Referer: firstone.html\r
 \r
-GET /want/data/10670002.txt?coolsite=yes HTTP/1.1\r
+GET /want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
-Referer: http://%HOSTIP:%HTTPPORT/want/1067\r
+Referer: http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER\r
 \r
 </protocol>
 <stderr nonewline="yes">
-|http://%HOSTIP:%HTTPPORT/want/1067|
+|http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER|
 </stderr>
 </verify>
 </testcase>
index 702d307a5c31b865e24ea061f1a9bbb83b0e278b..bf3ae4ee011760d80a11038142af71c282bf10ed 100644 (file)
@@ -29,7 +29,7 @@ http
 HTTP PUT from stdin
 </name>
  <command>
-http://%HOSTIP:%HTTPPORT/bzz/1068 -T -
+http://%HOSTIP:%HTTPPORT/bzz/%TESTNUMBER -T -
 </command>
 <stdin>
 more than one byte
@@ -39,7 +39,7 @@ more than one byte
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /bzz/1068 HTTP/1.1\r
+PUT /bzz/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index c47c357d7cd8fc2e3e25e66ed87af24e82ee982a..2eb665922143493b41c966ee6090cea95f413990 100644 (file)
@@ -20,7 +20,7 @@ http
 HTTP 1.0 PUT from stdin with no content length
 </name>
  <command>
-http://%HOSTIP:%HTTPPORT/bzz/1069 -T - -0
+http://%HOSTIP:%HTTPPORT/bzz/%TESTNUMBER -T - -0
 </command>
 <stdin>
 this data can't be sent
index 25b6452003527f8e60d55b2b9fd36dec52020afb..911de45bdd242f661ac8f3d69aaca21caa229515 100644 (file)
@@ -15,7 +15,7 @@ ftp
  <name>
 FTP PASV upload file
  </name>
-<file name="log/test107.txt">
+<file name="log/test%TESTNUMBER.txt">
 data
     to
       see
@@ -24,7 +24,7 @@ works
   so does it?
 </file>
  <command>
-ftp://%HOSTIP:%FTPPORT/107 -T log/test107.txt
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/test%TESTNUMBER.txt
 </command>
 </client>
 
@@ -44,7 +44,7 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-STOR 107\r
+STOR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 6056e5d936d0d595ccfbdd3f983adf888e99ec3d..3e4d37a52ecab7bd9e164263a4683e2fec1c3f7b 100644 (file)
@@ -32,9 +32,9 @@ http
 HTTP POST with server closing connection before (all) data is received
  </name>
  <command>
- -d @log/input1070 http://%HOSTIP:%HTTPPORT/1070 -H "Expect: 100-continue"
+ -d @log/input%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H "Expect: 100-continue"
 </command>
-<file name="log/input1070">
+<file name="log/input%TESTNUMBER">
 This creates the named file with this content before the test case is run,
 which is useful if the test case needs a file to act on. We create this file
 rather large (larger than your typical TCP packet) so that not all of it can nor
@@ -49,7 +49,7 @@ OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /1070 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index d89b74bd0a8a844f3a275447808cb7d73e34f11d..6c6947227ece6c7ee9987eb66e3e480c1dae23c8 100644 (file)
@@ -73,9 +73,9 @@ crypto
 Downgraded HTTP PUT to HTTP 1.0 with authorization
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1071 -T log/put1071 -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --anyauth
 </command>
-<file name="log/put1071">
+<file name="log/put%TESTNUMBER">
 This is data we upload with PUT
 a second line
 line three
@@ -86,7 +86,7 @@ four is the number of lines
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /1071 HTTP/1.1\r
+PUT /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -97,9 +97,9 @@ This is data we upload with PUT
 a second line
 line three
 four is the number of lines
-PUT /1071 HTTP/1.0\r
+PUT /%TESTNUMBER HTTP/1.0\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/1071", response="df4cef6b52a30e65d472dd848d2055a1"\r
+Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/%TESTNUMBER", response="df4cef6b52a30e65d472dd848d2055a1"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 85\r
index 128f0944c6119f1532575d34b271e8928358bf31..f9fb730445919c7ddc73121f30343ece6eba604f 100644 (file)
@@ -40,7 +40,7 @@ crypto
 HTTP chunked PUT to HTTP 1.0 server with authorization
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1072 -T - -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T - -u testuser:testpass --anyauth
 </command>
 <stdin>
 This is data we upload with PUT
@@ -56,7 +56,7 @@ which is impossible in HTTP/1.0
 25
 </errorcode>
 <protocol>
-PUT /1072 HTTP/1.1\r
+PUT /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 80f5ec0dca4315fbabd01ce161d4baca0571d4f1..775c0879868270384569bf79a53d265b78cfeafc 100644 (file)
@@ -18,7 +18,7 @@ chunked Transfer-Encoding
 HTTP/1.0 301 Redirect swsclose\r
 Server: testcurl\r
 Content-Type: text/plain\r
-Location: /newlocation/10730002\r
+Location: /newlocation/%TESTNUMBER0002\r
 Content-Length: 0\r
 Connection: close\r
 \r
@@ -34,7 +34,7 @@ http
 HTTP chunked PUT to HTTP 1.0 server with redirect
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1073 -T - -L
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T - -L
 </command>
 <stdin>
 This is data we upload with PUT
@@ -50,7 +50,7 @@ which is impossible in HTTP/1.0
 25
 </errorcode>
 <protocol>
-PUT /1073 HTTP/1.1\r
+PUT /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index e195574959bfb7506daa2a7c584d555412776c2a..55a956ec9bd329fca33b39c0ac3d823aa7f65fe3 100644 (file)
@@ -39,7 +39,7 @@ http
 HTTP downgrade to HTTP/1.0 on second request
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/1074 http://%HOSTIP:%HTTPPORT/wantmore/10740001
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/wantmore/%TESTNUMBER0001
 </command>
 </client>
 
@@ -60,12 +60,12 @@ surprise2
 </stdout>
 
 <protocol>
-GET /want/1074 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /wantmore/10740001 HTTP/1.0\r
+GET /wantmore/%TESTNUMBER0001 HTTP/1.0\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index f0f255ab6c5ffd53f683d0791561eb0e5556ae9a..2d111f284153e9c9a74df20f210ae672729a8aef 100644 (file)
@@ -52,9 +52,9 @@ http
 HTTP PUT with --anyauth authorization (picking Basic)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1075 -T log/put1075 -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --anyauth
 </command>
-<file name="log/put1075">
+<file name="log/put%TESTNUMBER">
 This is data we upload with PUT
 a second line
 line three
@@ -65,7 +65,7 @@ four is the number of lines
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /1075 HTTP/1.1\r
+PUT /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -76,7 +76,7 @@ This is data we upload with PUT
 a second line
 line three
 four is the number of lines
-PUT /1075 HTTP/1.1\r
+PUT /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=\r
 User-Agent: curl/%VERSION\r
index 7e51ad43d7f57f395e4b10d95460503d32fbd10d..017a7d11e547b72becb7262a10d7891a3c50563c 100644 (file)
@@ -11,7 +11,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 302 OK swsclose
-Location: moo.html&testcase=/10760002
+Location: moo.html&testcase=/%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
 
@@ -26,7 +26,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 302 OK swsclose
-Location: moo.html&testcase=/10760002
+Location: moo.html&testcase=/%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
 
@@ -49,7 +49,7 @@ http
 HTTP POST with 302 redirect and --post302
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/blah/1076 -L -d "moo" --post302
+http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo" --post302
 </command>
 </client>
 
@@ -57,14 +57,14 @@ http://%HOSTIP:%HTTPPORT/blah/1076 -L -d "moo" --post302
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /blah/1076 HTTP/1.1\r
+POST /blah/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 3\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-mooPOST /blah/moo.html&testcase=/10760002 HTTP/1.1\r
+mooPOST /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index fe5e4267e2c93939402b5f11b3c39c023d596fa0..28af6e9787be803596fec4236a849f0f4f3b6404 100644 (file)
@@ -50,7 +50,7 @@ proxy
 FTP over HTTP proxy with downgrade to HTTP 1.0
  </name>
  <command>
--x %HOSTIP:%HTTPPORT ftp://%HOSTIP:%HTTPPORT/we/want/that/page/1077 ftp://%HOSTIP:%HTTPPORT/we/want/that/page/10770002
+-x %HOSTIP:%HTTPPORT ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER0002
 </command>
 </client>
 
@@ -58,13 +58,13 @@ FTP over HTTP proxy with downgrade to HTTP 1.0
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/1077 HTTP/1.1\r
+GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/10770002 HTTP/1.0\r
+GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER0002 HTTP/1.0\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 35254239e9b3e054772fa778f98985ac5e536b44..6f303d0bc4f7da438a790162ffdd9e4772685110 100644 (file)
@@ -43,7 +43,7 @@ http-proxy
 HTTP 1.0 CONNECT with proxytunnel and downgrade GET to HTTP/1.0
  </name>
  <command>
---proxy1.0 %HOSTIP:%PROXYPORT -p http://%HOSTIP.1078:%HTTPPORT/we/want/that/page/1078 http://%HOSTIP.1078:%HTTPPORT/we/want/that/page/1078
+--proxy1.0 %HOSTIP:%PROXYPORT -p http://%HOSTIP.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER http://%HOSTIP.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER
 </command>
 <features>
 proxy
@@ -54,20 +54,20 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT %HOSTIP.1078:%HTTPPORT HTTP/1.0\r
-Host: %HOSTIP.1078:%HTTPPORT\r
+CONNECT %HOSTIP.%TESTNUMBER:%HTTPPORT HTTP/1.0\r
+Host: %HOSTIP.%TESTNUMBER:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>
-GET /we/want/that/page/1078 HTTP/1.1\r
-Host: %HOSTIP.1078:%HTTPPORT\r
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1\r
+Host: %HOSTIP.%TESTNUMBER:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /we/want/that/page/1078 HTTP/1.0\r
-Host: %HOSTIP.1078:%HTTPPORT\r
+GET /we/want/that/page/%TESTNUMBER HTTP/1.0\r
+Host: %HOSTIP.%TESTNUMBER:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index 460439d5349bfdf01000b7c24981f8c9ba489a15..361c4bd0d6a001243865815d6d8e44d9e9bcd594 100644 (file)
@@ -49,7 +49,7 @@ crypto
 HTTP retry after closed connection and empty response
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1079 -u testuser:testpass --digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 </command>
 </client>
 
@@ -59,14 +59,14 @@ http://%HOSTIP:%HTTPPORT/1079 -u testuser:testpass --digest
 52
 </errorcode>
 <protocol>
-GET /1079 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /1079 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/1079", response="e340c7cdca0950462070f46ee139e9f7"\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="e340c7cdca0950462070f46ee139e9f7"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index eb2ea63c137222ad8491ccaf5e76adbf988f7971..6f6e3c83c671c083e423f7bce03ce45a3976a6c5 100644 (file)
@@ -21,9 +21,9 @@ ftp
 FTP PORT upload with CWD
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/CWD/STOR/RETR/108 -T log/upload108 -P -
+ftp://%HOSTIP:%FTPPORT/CWD/STOR/RETR/%TESTNUMBER -T log/upload%TESTNUMBER -P -
 </command>
-<file name="log/upload108">
+<file name="log/upload%TESTNUMBER">
 Moooooooooooo
  upload this
 </file>
@@ -45,7 +45,7 @@ CWD STOR
 CWD RETR\r
 PORT 127,0,0,1,5,109\r
 TYPE I\r
-STOR 108\r
+STOR %TESTNUMBER\r
 QUIT\r
 </protocol>
 <upload>
index 9fa48576d49bb27197bbce4bd0bfc9e8c8f1f997..bc7249a93010fe62d3c13db51aec0b6cae7dfcd9 100644 (file)
@@ -13,7 +13,7 @@ followlocation
 <reply>
 <data nocheck="yes">
 HTTP/1.1 301 This is a weirdo text message swsclose\r
-Location: data/10800002.txt?coolsite=yes\r
+Location: data/%TESTNUMBER0002.txt?coolsite=yes\r
 Content-Length: 62\r
 Connection: close\r
 \r
@@ -30,19 +30,19 @@ http
 HTTP Location: on two URLs 'redirect_url' check
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/our/1080 http://%HOSTIP:%HTTPPORT/we/want/our/1080 -w '%{redirect_url}\n'
+http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url}\n'
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/our/1080 HTTP/1.1\r
+GET /we/want/our/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /we/want/our/1080 HTTP/1.1\r
+GET /we/want/our/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -50,19 +50,19 @@ Accept: */*
 </protocol>
 <stdout>
 HTTP/1.1 301 This is a weirdo text message swsclose\r
-Location: data/10800002.txt?coolsite=yes\r
+Location: data/%TESTNUMBER0002.txt?coolsite=yes\r
 Content-Length: 62\r
 Connection: close\r
 \r
 This server reply is for testing a simple Location: following
-http://%HOSTIP:%HTTPPORT/we/want/our/data/10800002.txt?coolsite=yes
+http://%HOSTIP:%HTTPPORT/we/want/our/data/%TESTNUMBER0002.txt?coolsite=yes
 HTTP/1.1 301 This is a weirdo text message swsclose\r
-Location: data/10800002.txt?coolsite=yes\r
+Location: data/%TESTNUMBER0002.txt?coolsite=yes\r
 Content-Length: 62\r
 Connection: close\r
 \r
 This server reply is for testing a simple Location: following
-http://%HOSTIP:%HTTPPORT/we/want/our/data/10800002.txt?coolsite=yes
+http://%HOSTIP:%HTTPPORT/we/want/our/data/%TESTNUMBER0002.txt?coolsite=yes
 </stdout>
 </verify>
 </testcase>
index 0aaf751a65fef757ec71068b067c8dea8a9f3e13..9f5a192e7e2242117c8b1c3380da26f4ad37f08b 100644 (file)
@@ -13,7 +13,7 @@ followlocation
 <reply>
 <data nocheck="yes">
 HTTP/1.1 301 This is a weirdo text message swsclose\r
-Location: data/10810099.txt?coolsite=yes\r
+Location: data/%TESTNUMBER0099.txt?coolsite=yes\r
 Content-Length: 62\r
 Connection: close\r
 \r
@@ -38,19 +38,19 @@ http
 HTTP no Location: on second URL 'redirect_url' check
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/our/1081 http://%HOSTIP:%HTTPPORT/we/want/our/10810002 -w '%{redirect_url}\n'
+http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER0002 -w '%{redirect_url}\n'
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/our/1081 HTTP/1.1\r
+GET /we/want/our/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /we/want/our/10810002 HTTP/1.1\r
+GET /we/want/our/%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -58,12 +58,12 @@ Accept: */*
 </protocol>
 <stdout>
 HTTP/1.1 301 This is a weirdo text message swsclose\r
-Location: data/10810099.txt?coolsite=yes\r
+Location: data/%TESTNUMBER0099.txt?coolsite=yes\r
 Content-Length: 62\r
 Connection: close\r
 \r
 This server reply is for testing a simple Location: following
-http://%HOSTIP:%HTTPPORT/we/want/our/data/10810099.txt?coolsite=yes
+http://%HOSTIP:%HTTPPORT/we/want/our/data/%TESTNUMBER0099.txt?coolsite=yes
 HTTP/1.1 200 Followed here fine swsclose\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
index 6791a6b10b1e4a81c4f67447619d83203c5943dd..3ee436bf0eb1911c3c3fadf8b3a7a2178efed27a 100644 (file)
@@ -32,7 +32,7 @@ http
 HTTP GET with localhost --interface
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1082 -4 --interface localhost
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -4 --interface localhost
 </command>
 <precheck>
 perl -e "print 'Test requires default test client host address' if ( '%CLIENTIP' ne '127.0.0.1' );"
@@ -43,7 +43,7 @@ perl -e "print 'Test requires default test client host address' if ( '%CLIENTIP'
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1082 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 89beea0fc39cce4c9a110d640ee89293026b6df0..d7713b1cf22e87e90d1d7b288664d9889186f8df 100644 (file)
@@ -36,7 +36,7 @@ http-ipv6
 HTTP-IPv6 GET with ip6-localhost --interface
  </name>
  <command>
--g "http://%HOST6IP:%HTTP6PORT/1083" --interface ip6-localhost
+-g "http://%HOST6IP:%HTTP6PORT/%TESTNUMBER" --interface ip6-localhost
 </command>
 <precheck>
 perl -e "if ('%CLIENT6IP' ne '[::1]') {print 'Test requires default test client host address';} else {exec './server/resolve --ipv6 ip6-localhost'; print 'Cannot run precheck resolve';}"
@@ -47,7 +47,7 @@ perl -e "if ('%CLIENT6IP' ne '[::1]') {print 'Test requires default test client
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1083 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOST6IP:%HTTP6PORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index db6ab5e94073bea79658fa24651a358be88fbab4..7a6292b88a2340c4e5a9f924d2e2387e410020bf 100644 (file)
@@ -27,7 +27,7 @@ none
 HTTP GET with invalid --interface
  </name>
  <command>
-http://%HOSTIP:%NOLISTENPORT/1084 --interface non-existing-host.haxx.se.
+http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER --interface non-existing-host.haxx.se.
 </command>
 </client>
 
index ac1f0629c691a83bab5d552cadc2b14f4be804d5..582fdb085fad07426cad242aef57c38f0a629cc2 100644 (file)
@@ -29,7 +29,7 @@ none
 HTTP-IPv6 GET with invalid --interface
  </name>
  <command>
--g "http://%HOST6IP:%NOLISTENPORT/1085" --interface non-existing-host.haxx.se.
+-g "http://%HOST6IP:%NOLISTENPORT/%TESTNUMBER" --interface non-existing-host.haxx.se.
 </command>
 # Ensure the IPv6 stack is operational before running this test (other tests
 # use the startup of the IPv6 test server as a substitute check for this).
index 354b2e09acb6fbab3e5dc8aa6f1ca542362be19d..f081ebddb4374e07dd4036243dd6ce2b1157d902 100644 (file)
@@ -87,7 +87,7 @@ ftp
 FTP download with strict timeout and slow data transfer
  </name>
  <command timeout="1">
-ftp://%HOSTIP:%FTPPORT/1086 -m 7
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -m 7
 </command>
 </client>
 
@@ -103,8 +103,8 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 1086\r
-RETR 1086\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 </protocol>
 </verify>
 </testcase>
index 5e91fb2a57eeae51011b38b899b9ad72213b31f7..b084c9b6498ce4fae3f4ca06fb6e3b80abd29fe5 100644 (file)
@@ -26,7 +26,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose\r
 Content-Type: text/plain\r
 Funny-head: yesyes\r
-Location: http://goto.second.host.now/10871002\r
+Location: http://goto.second.host.now/%TESTNUMBER1002\r
 Content-Length: 0\r
 Connection: close\r
 \r
@@ -53,7 +53,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose\r
 Content-Type: text/plain\r
 Funny-head: yesyes\r
-Location: http://goto.second.host.now/10871002\r
+Location: http://goto.second.host.now/%TESTNUMBER1002\r
 Content-Length: 0\r
 Connection: close\r
 \r
@@ -78,7 +78,7 @@ http
 HTTP, proxy with --anyauth and Location: to new host
  </name>
  <command>
-http://first.host.it.is/we/want/that/page/10871000 -x %HOSTIP:%HTTPPORT --user iam:myself --location --anyauth
+http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 -x %HOSTIP:%HTTPPORT --user iam:myself --location --anyauth
 </command>
 <features>
 proxy
@@ -89,20 +89,20 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://first.host.it.is/we/want/that/page/10871000 HTTP/1.1\r
+GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1\r
 Host: first.host.it.is\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://first.host.it.is/we/want/that/page/10871000 HTTP/1.1\r
+GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1\r
 Host: first.host.it.is\r
 Authorization: Basic aWFtOm15c2VsZg==\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://goto.second.host.now/10871002 HTTP/1.1\r
+GET http://goto.second.host.now/%TESTNUMBER1002 HTTP/1.1\r
 Host: goto.second.host.now\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 0a1a6656a570826d85de65288dbba64c15817dcc..9f12f25ab2a507a320a47cc309914e5ad79c7e11 100644 (file)
@@ -27,7 +27,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose\r
 Content-Type: text/plain\r
 Funny-head: yesyes\r
-Location: http://goto.second.host.now/10881002\r
+Location: http://goto.second.host.now/%TESTNUMBER1002\r
 Content-Length: 0\r
 Connection: close\r
 \r
@@ -54,7 +54,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose\r
 Content-Type: text/plain\r
 Funny-head: yesyes\r
-Location: http://goto.second.host.now/10881002\r
+Location: http://goto.second.host.now/%TESTNUMBER1002\r
 Content-Length: 0\r
 Connection: close\r
 \r
@@ -79,7 +79,7 @@ http
 HTTP, proxy with --anyauth and Location: to new host using location-trusted
  </name>
  <command>
-http://first.host.it.is/we/want/that/page/10881000 -x %HOSTIP:%HTTPPORT --user iam:myself --location-trusted --anyauth
+http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 -x %HOSTIP:%HTTPPORT --user iam:myself --location-trusted --anyauth
 </command>
 <features>
 proxy
@@ -90,20 +90,20 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://first.host.it.is/we/want/that/page/10881000 HTTP/1.1\r
+GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1\r
 Host: first.host.it.is\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://first.host.it.is/we/want/that/page/10881000 HTTP/1.1\r
+GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1\r
 Host: first.host.it.is\r
 Authorization: Basic aWFtOm15c2VsZg==\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://goto.second.host.now/10881002 HTTP/1.1\r
+GET http://goto.second.host.now/%TESTNUMBER1002 HTTP/1.1\r
 Host: goto.second.host.now\r
 Authorization: Basic aWFtOm15c2VsZg==\r
 User-Agent: curl/%VERSION\r
index 56415a7da242350291f63a9997decb74a7df152e..c8c5307aa3cd1a916c1432c21603dea221aafb26 100644 (file)
@@ -17,7 +17,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 8\r
 Connection: close\r
 Content-Type: text/plain\r
-Location: ./10890001\r
+Location: ./%TESTNUMBER0001\r
 \r
 monster
 </data>
@@ -43,7 +43,7 @@ http
 HTTP GET --write-out with redirected fetch
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1089 -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L
 </command>
 </client>
 
@@ -51,12 +51,12 @@ http://%HOSTIP:%HTTPPORT/1089 -w "%{num_connects}\n%{num_redirects}\n%{size_down
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1089 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /10890001 HTTP/1.1\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -69,7 +69,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 8\r
 Connection: close\r
 Content-Type: text/plain\r
-Location: ./10890001\r
+Location: ./%TESTNUMBER0001\r
 \r
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
@@ -81,7 +81,7 @@ bigger monster
 2
 1
 15
-http://%HOSTIP:%HTTPPORT/10890001
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001
 text/plain; charset=us-ascii
 200
 </stdout>
index c027885b1f8e903e4ce56284d133a7f3b4766561..739e90b1cd302f4018fbdba0d7ddb960ffeb6109 100644 (file)
@@ -21,9 +21,9 @@ ftp
 FTP PASV upload append
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/109 -T log/upload109 --append
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER --append
 </command>
-<file name="log/upload109">
+<file name="log/upload%TESTNUMBER">
 Moooooooooooo
  upload this
 </file>
@@ -37,7 +37,7 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-APPE 109\r
+APPE %TESTNUMBER\r
 QUIT\r
 </protocol>
 <upload>
index f30538d24f9d6bc0faa4e7d68996ae383d1d7fba..0551519fb4e4219548ff0d70d9b29332d6ff67f1 100644 (file)
@@ -18,7 +18,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 8\r
 Connection: close\r
 Content-Type: text/plain\r
-Location: ./10900001\r
+Location: ./%TESTNUMBER0001\r
 \r
 monster
 </data>
@@ -50,7 +50,7 @@ http
 HTTP GET --write-out with redirected fetch and chunked reply
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1090 -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L
 </command>
 </client>
 
@@ -58,12 +58,12 @@ http://%HOSTIP:%HTTPPORT/1090 -w "%{num_connects}\n%{num_redirects}\n%{size_down
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1090 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /10900001 HTTP/1.1\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -76,7 +76,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 8\r
 Connection: close\r
 Content-Type: text/plain\r
-Location: ./10900001\r
+Location: ./%TESTNUMBER0001\r
 \r
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
@@ -88,7 +88,7 @@ bigger monster
 2
 1
 15
-http://%HOSTIP:%HTTPPORT/10900001
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001
 text/plain; charset=us-ascii
 200
 </stdout>
index 24669334bf1602633b15b584f46d604256ecb2e3..788f2dc27ac6c5f8b5616745dd0b2ece75f40357 100644 (file)
@@ -24,7 +24,7 @@ ftp
 FTP URL with type=i
  </name>
  <command>
-"ftp://%HOSTIP:%FTPPORT/%2ftmp/moo/1091;type=i" --use-ascii
+"ftp://%HOSTIP:%FTPPORT/%2ftmp/moo/%TESTNUMBER;type=i" --use-ascii
 </command>
 </client>
 
@@ -39,8 +39,8 @@ CWD tmp
 CWD moo\r
 EPSV\r
 TYPE I\r
-SIZE 1091\r
-RETR 1091\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index b0cdc0d69c167917e3d6a81e7418bed9c515a256..1c3c4696fb25c602902ca4e19cff65abe959e0bb 100644 (file)
@@ -36,7 +36,7 @@ proxy
 FTP with type=i over HTTP proxy
  </name>
  <command>
-"ftp://%HOSTIP:%HTTPPORT/we/want/that/page/1092;type=i" --use-ascii -x %HOSTIP:%HTTPPORT
+"ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER;type=i" --use-ascii -x %HOSTIP:%HTTPPORT
 </command>
 </client>
 
@@ -44,7 +44,7 @@ FTP with type=i over HTTP proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/1092;type=i HTTP/1.1\r
+GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER;type=i HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index da2d83cd4bf2e6b0b376a416bb73b7218e3a4b7a..5e1484d16bb082413e4cbe6b6450ae8371d38ae8 100644 (file)
@@ -28,7 +28,7 @@ tftp
 TFTP retrieve with mode=i
  </name>
  <command>
-"tftp://%HOSTIP:%TFTPPORT//1093;mode=i" --use-ascii
+"tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER;mode=i" --use-ascii
 </command>
 </client>
 
@@ -41,7 +41,7 @@ mode: octet
 tsize: 0
 blksize: 512
 timeout: 6
-filename: /1093
+filename: /%TESTNUMBER
 </protocol>
 </verify>
 </testcase>
index c7b09caae97a9b10e851945d090d06b68af466ac..3ed53f281bbc7cbff5a76dbeecfd67ef0bd25e67 100644 (file)
@@ -34,7 +34,7 @@ tftp
 TFTP retrieve with mode=netascii
  </name>
  <command>
-"tftp://%HOSTIP:%TFTPPORT//1094;mode=netascii"
+"tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER;mode=netascii"
 </command>
 </client>
 
@@ -47,7 +47,7 @@ mode: netascii
 tsize: 0
 blksize: 512
 timeout: 6
-filename: /1094
+filename: /%TESTNUMBER
 </protocol>
 </verify>
 </testcase>
index 3e562b0379dcfe9376b0ba96f2e394bb20090fba..efb8413b267da2c759a2c0d8bb7ed4d0aefb1c51 100644 (file)
@@ -59,21 +59,21 @@ crypto
 HTTP with Digest and realm with quoted quotes
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1095 -u testuser:testpass --digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1095 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /1095 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="test \"this\" realm!!", nonce="1053604145", uri="/1095", response="a1c7931ece9e8617bae2715045e4f49f"\r
+Authorization: Digest username="testuser", realm="test \"this\" realm!!", nonce="1053604145", uri="/%TESTNUMBER", response="a1c7931ece9e8617bae2715045e4f49f"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index a6c32c3a16610072db7ef3dcb0becdfa96551b97..2eb9d1f9f702bdba652660f2e411037a5147b2bb 100644 (file)
@@ -24,7 +24,7 @@ ftp
 Two FTP downloads, with failed RETR but re-used control connection
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/dir/1096 ftp://%HOSTIP:%FTPPORT/dir/1096
+ftp://%HOSTIP:%FTPPORT/dir/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/dir/%TESTNUMBER
 </command>
 </client>
 
@@ -40,11 +40,11 @@ PWD
 CWD dir\r
 EPSV\r
 TYPE I\r
-SIZE 1096\r
-RETR 1096\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 EPSV\r
-SIZE 1096\r
-RETR 1096\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 218d57bbecd7964283b93b0037f9d3d5e4186142..5a73e89b437713c7b6d974b75b2c4a4d7f80f8e5 100644 (file)
@@ -53,21 +53,21 @@ proxy
 HTTP POST using CONNECT with --proxy-ntlm but no auth is required
  </name>
  <command>
-http://test.a.galaxy.far.far.away.1097:%HTTPPORT/1097 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm -d "dummy=value" -p
+http://test.a.galaxy.far.far.away.%TESTNUMBER:%HTTPPORT/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm -d "dummy=value" -p
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-CONNECT test.a.galaxy.far.far.away.1097:%HTTPPORT HTTP/1.1\r
-Host: test.a.galaxy.far.far.away.1097:%HTTPPORT\r
+CONNECT test.a.galaxy.far.far.away.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
+Host: test.a.galaxy.far.far.away.%TESTNUMBER:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
-POST /1097 HTTP/1.1\r
-Host: test.a.galaxy.far.far.away.1097:%HTTPPORT\r
+POST /%TESTNUMBER HTTP/1.1\r
+Host: test.a.galaxy.far.far.away.%TESTNUMBER:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 11\r
index 4dfeea8ea05528d10e37a718f8d643bc32fcdb28..8e31c32b66f89c4986138f8932a3843273f59e52 100644 (file)
@@ -36,7 +36,7 @@ FTP RETR twice over proxy confirming persistent connection
  </name>
 
  <command>
-ftp://ftp-site/moo/1098 ftp://ftp-site/moo/1098 --proxy http://%HOSTIP:%HTTPPORT
+ftp://ftp-site/moo/%TESTNUMBER ftp://ftp-site/moo/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT
 </command>
 </client>
 
@@ -44,13 +44,13 @@ ftp://ftp-site/moo/1098 ftp://ftp-site/moo/1098 --proxy http://%HOSTIP:%HTTPPORT
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET ftp://ftp-site/moo/1098 HTTP/1.1\r
+GET ftp://ftp-site/moo/%TESTNUMBER HTTP/1.1\r
 Host: ftp-site:21\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET ftp://ftp-site/moo/1098 HTTP/1.1\r
+GET ftp://ftp-site/moo/%TESTNUMBER HTTP/1.1\r
 Host: ftp-site:21\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 4a33189ec5de495b66d2191a2790ef1dc9b134fd..f2fa2f28b19e490b7058122460c24a3608960f6f 100644 (file)
@@ -9,7 +9,7 @@ FAILURE
 
 <reply>
 <data nocheck="yes">
-data for 1099
+data for %TESTNUMBER
 </data>
 </reply>
 
@@ -23,7 +23,7 @@ tftp
 TFTP get first a non-existing file then an existing
  </name>
  <command>
-tftp://%HOSTIP:%TFTPPORT/an/invalid-file tftp://%HOSTIP:%TFTPPORT//1099
+tftp://%HOSTIP:%TFTPPORT/an/invalid-file tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER
 </command>
 </client>
 
@@ -42,10 +42,10 @@ mode: octet
 tsize: 0
 blksize: 512
 timeout: 6
-filename: /1099
+filename: /%TESTNUMBER
 </protocol>
 <stdout>
-data for 1099
+data for %TESTNUMBER
 </stdout>
 </verify>
 </testcase>
index 0ae1de420f8fb2f3ea27e21fc014b13d9bab75e2..89844ea1468ac9567832af80729a7b6b0208322f 100644 (file)
@@ -12,7 +12,7 @@ followlocation
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: data/110002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Connection: close
 
 This server reply is for testing a simple Location: following
@@ -31,7 +31,7 @@ If this is received, the location following worked
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: data/110002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Connection: close
 
 HTTP/1.1 200 Followed here fine swsclose
@@ -53,19 +53,19 @@ http
 simple HTTP Location: following
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/11 -L
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/11 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /want/data/110002.txt?coolsite=yes HTTP/1.1\r
+GET /want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index b63ba8a2dbc67310dcc502335e1e0b8924a6c15d..6c892ed2a58e7411dbdfcdd521387395e81e0556 100644 (file)
@@ -30,7 +30,7 @@ ftp
 FTP download resume with set limit
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/110 -C 20
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C 20
 </command>
 </client>
 
@@ -43,9 +43,9 @@ PWD
 EPSV\r
 PASV\r
 TYPE I\r
-SIZE 110\r
+SIZE %TESTNUMBER\r
 REST 20\r
-RETR 110\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 5bb807200dd2459239bf10361c9131e2a0fb3085..78c005cf61621ac64c1d468896eba16bd87c5840 100644 (file)
@@ -32,7 +32,7 @@ This is not the real page either!
 HTTP/1.1 302 Thanks for this, but we want to redir you!\r
 Server: Microsoft-IIS/5.0\r
 Content-Type: text/html; charset=iso-8859-1\r
-Location: /1100\r
+Location: /%TESTNUMBER\r
 Content-Length: 34\r
 \r
 This is not the real page either!
@@ -48,7 +48,7 @@ WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4Ab
 HTTP/1.1 302 Thanks for this, but we want to redir you!\r
 Server: Microsoft-IIS/5.0\r
 Content-Type: text/html; charset=iso-8859-1\r
-Location: /1100\r
+Location: /%TESTNUMBER\r
 Content-Length: 34\r
 \r
 HTTP/1.1 200 Thanks for this! swsclose\r
@@ -80,7 +80,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/1100 -u testuser:testpass --ntlm -L -d "stuff to send away" 
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm -L -d "stuff to send away" 
 </command>
 <precheck>
 chkhostname curlhost
@@ -89,7 +89,7 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-POST /1100 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/%VERSION\r
@@ -97,7 +97,7 @@ Accept: */*
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-POST /1100 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
 User-Agent: curl/%VERSION\r
@@ -105,7 +105,7 @@ Accept: */*
 Content-Length: 18\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-stuff to send awayGET /1100 HTTP/1.1\r
+stuff to send awayGET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 145e38ef5095a1a8d2324dc5c5e9a030af37932e..f7e504f910e9b753453a3b4b0f0367938e3bc837 100644 (file)
@@ -34,14 +34,14 @@ no_proxy=%HOSTIP
 http_proxy=http://non-existing-host.haxx.se:3128/
 </setenv>
  <command>
-http://user:secret@%HOSTIP:%HTTPPORT/gimme/1101
+http://user:secret@%HOSTIP:%HTTPPORT/gimme/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /gimme/1101 HTTP/1.1\r
+GET /gimme/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dXNlcjpzZWNyZXQ=\r
 User-Agent: curl/%VERSION\r
index addc7b572f0524db1a83a98a3a03bcfa17150c73..c2fd03438fb3c1f440449d43eba4fe670e1a8119 100644 (file)
@@ -28,7 +28,7 @@ ftp
 FTP OS/400 server name format check
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1102
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -43,8 +43,8 @@ SITE NAMEFMT 1
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 1102\r
-RETR 1102\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 4d45056d5167f11478375dade34638df1b985258..4624c9d21695326447efc28d8681a5207bb4405b 100644 (file)
@@ -27,7 +27,7 @@ ftp
 FTP non-OS/400 server
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1103
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -40,8 +40,8 @@ PWD
 SYST\r
 EPSV\r
 TYPE I\r
-SIZE 1103\r
-RETR 1103\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 33d8542e46f290d5777dfe369ef4f157a61b3253..27c43009ec8d974ca7a574182265fe975bd31eaa 100644 (file)
@@ -13,7 +13,7 @@ cookies
 <data>
 HTTP/1.1 301 Moved
 Date: Tue, 09 Nov 2010 14:49:00 GMT
-Location: /want/data/11040002
+Location: /want/data/%TESTNUMBER0002
 Server: test-server/fake
 Set-Cookie: test=true; domain=127.0.0.1; path=/; expires=Thu Jan  1 00:00:00 GMT 1970;
 Set-Cookie: test2=true; domain=127.0.0.1; path=/; expires=Fri Feb 13 11:56:27 GMT 2037;
@@ -34,7 +34,7 @@ If this is received, the location following worked
 <datacheck>
 HTTP/1.1 301 Moved
 Date: Tue, 09 Nov 2010 14:49:00 GMT
-Location: /want/data/11040002
+Location: /want/data/%TESTNUMBER0002
 Server: test-server/fake
 Set-Cookie: test=true; domain=127.0.0.1; path=/; expires=Thu Jan  1 00:00:00 GMT 1970;
 Set-Cookie: test2=true; domain=127.0.0.1; path=/; expires=Fri Feb 13 11:56:27 GMT 2037;
@@ -59,7 +59,7 @@ http
 HTTP cookie expiry date at Jan 1 00:00:00 GMT 1970
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/1104 -L -x %HOSTIP:%HTTPPORT -c log/cookies1104.jar
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -x %HOSTIP:%HTTPPORT -c log/cookies%TESTNUMBER.jar
 </command>
 <features>
 proxy
@@ -69,13 +69,13 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/want/1104 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://%HOSTIP:%HTTPPORT/want/data/11040002 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/want/data/%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 771ef3a78dccbb7e798082b020bebcfcca9948fe..a06a0517378fa2bd2bf9b04ba519d2cf1bc05921 100644 (file)
@@ -32,7 +32,7 @@ http
 HTTP with cookie parser and header recording
  </name>
  <command>
-"http://%HOSTIP:%HTTPPORT/we/want/1105?parm1=this*that/other/thing&parm2=foobar/1105" -c log/cookie1105.txt -d "userid=myname&password=mypassword"
+"http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER?parm1=this*that/other/thing&parm2=foobar/%TESTNUMBER" -c log/cookie%TESTNUMBER.txt -d "userid=myname&password=mypassword"
 </command>
 <precheck>
 perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0.0.1' );"
@@ -42,7 +42,7 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /we/want/1105?parm1=this*that/other/thing&parm2=foobar/1105 HTTP/1.1\r
+POST /we/want/%TESTNUMBER?parm1=this*that/other/thing&parm2=foobar/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -51,7 +51,7 @@ Content-Type: application/x-www-form-urlencoded
 \r
 userid=myname&password=mypassword
 </protocol>
-<file name="log/cookie1105.txt" mode="text">
+<file name="log/cookie%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
index 14adae45fb141981e6a9097c16d1f3fac7c3b1fa..f6e589302a7173c7e75b156e389992dd2756dada 100644 (file)
@@ -37,7 +37,7 @@ FTP URL and with ftp_proxy environment variable set
 ftp_proxy=http://%HOSTIP:%HTTPPORT/
 </setenv>
  <command>
-ftp://%HOSTIP:23456/1106
+ftp://%HOSTIP:23456/%TESTNUMBER
 </command>
 
 </client>
@@ -45,7 +45,7 @@ ftp://%HOSTIP:23456/1106
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET ftp://%HOSTIP:23456/1106 HTTP/1.1\r
+GET ftp://%HOSTIP:23456/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:23456\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 6adc6360ce4d1c6f068017b9aad8bf2216045fdc..4946e893767964a084b873fe9ef804d9d59455eb 100644 (file)
@@ -31,7 +31,7 @@ ftp
 FTP RETR PASV with PRET
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1107 --ftp-pret
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-pret
 </command>
 
 </client>
@@ -42,11 +42,11 @@ ftp://%HOSTIP:%FTPPORT/1107 --ftp-pret
 USER anonymous\r
 PASS ftp@example.com\r
 PWD\r
-PRET RETR 1107\r
+PRET RETR %TESTNUMBER\r
 EPSV\r
 TYPE I\r
-SIZE 1107\r
-RETR 1107\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index f83eb9570b62eaeae678343bc55372c9729dcdf1..3667b118b40b59abf5ee7a1fd779cc8baabc0163 100644 (file)
@@ -24,7 +24,7 @@ ftp
 FTP RETR PASV with PRET not supported
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1108 --ftp-pret
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-pret
 </command>
 
 </client>
@@ -35,7 +35,7 @@ ftp://%HOSTIP:%FTPPORT/1108 --ftp-pret
 USER anonymous\r
 PASS ftp@example.com\r
 PWD\r
-PRET RETR 1108\r
+PRET RETR %TESTNUMBER\r
 </protocol>
 # we expect that the server doesn't understand PRET
 <errorcode>
index e504ce9da1c3a2549aa9537dd93d9718dc3e5868..eb209a5d6a9e841d0d4bce9a64305fd487c1b623 100644 (file)
@@ -26,7 +26,7 @@ http
 HTTP GET with URL that contains fragment after the path
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1109#test
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER#test
 </command>
 </client>
 
@@ -34,7 +34,7 @@ http://%HOSTIP:%HTTPPORT/1109#test
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1109 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index bcaa55425db409eb4b0f9782e7866785bfa90c67..25df3aee509f15a7d600a0b7a832622f73afef34 100644 (file)
@@ -23,7 +23,7 @@ ftp
 FTP download resume beyond file size
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/111 -C 2000
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C 2000
 </command>
 </client>
 
@@ -38,7 +38,7 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 111\r
+SIZE %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 50bd4d20cfe9b17720ad70b80c2020d9f8f11e9e..a363fef9cad36e12624f7ff05a7dde9e9f0ff069 100644 (file)
@@ -27,7 +27,7 @@ http
 HTTP GET with URL that contains a fragment after the query part
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1110?q=foobar#fragment
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER?q=foobar#fragment
 </command>
 </client>
 
@@ -35,7 +35,7 @@ http://%HOSTIP:%HTTPPORT/1110?q=foobar#fragment
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1110?q=foobar HTTP/1.1\r
+GET /%TESTNUMBER?q=foobar HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 1ba21bffd055e0280bff21e61bcd655f3217bbfb..1e9203a45c43ee229cf865ef7adc8b2aa47f4163 100644 (file)
@@ -27,7 +27,7 @@ http
 HTTP GET with URL whose fragment contains a # (which is illegal)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1111?q=foobar#fragment#fragment2
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER?q=foobar#fragment#fragment2
 </command>
 </client>
 
@@ -35,7 +35,7 @@ http://%HOSTIP:%HTTPPORT/1111?q=foobar#fragment#fragment2
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1111?q=foobar HTTP/1.1\r
+GET /%TESTNUMBER?q=foobar HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 849f671c8a5bc903171341e954b88b30cbbd0786..b918c731015e1f7ecacd553d1a6298a564c9befb 100644 (file)
@@ -89,7 +89,7 @@ ftps
 FTPS download with strict timeout and slow data transfer
  </name>
  <command timeout="1">
--k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/1112 -m 16
+-k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/%TESTNUMBER -m 16
 </command>
 </client>
 
@@ -107,8 +107,8 @@ PROT C
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 1112\r
-RETR 1112\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 </protocol>
 </verify>
 </testcase>
index 0b1f034ee6bae1acc03d59e2c31e341bcef9b0bc..315fce3fc8be009dc2b697c1bf5e8dd245a8308b 100644 (file)
@@ -33,14 +33,14 @@ http
 HTTP GET with unexpected 1xx response
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1115
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1115 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index ce5305d79c678a7eb3fa2ec2a3bfe40b1a302488..2542b41f5e165c8527a31b2f5870249ef70f4726 100644 (file)
@@ -49,7 +49,7 @@ http
 HTTP GET with chunked trailer without Trailer:
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1116 -D log/heads1116
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D log/heads%TESTNUMBER
 </command>
 </client>
 
@@ -57,13 +57,13 @@ http://%HOSTIP:%HTTPPORT/1116 -D log/heads1116
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1116 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file name="log/heads1116">
+<file name="log/heads%TESTNUMBER">
 HTTP/1.1 200 funky chunky!\r
 Server: fakeit/0.9 fakeitbad/1.0\r
 Transfer-Encoding: chunked\r
index 6bd323f07bdf9cbd0f07a7833a7d86f61fdca8c1..50466aa32263caf097feee97aadf2c03152788ba 100644 (file)
@@ -44,7 +44,7 @@ http
 HTTP with invalid range then another URL
  </name>
  <command>
--r 10-22 http://%HOSTIP:%HTTPPORT/want/1117 http://%HOSTIP:%HTTPPORT/wantmore/11170001
+-r 10-22 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/wantmore/%TESTNUMBER0001
 </command>
 </client>
 
@@ -69,13 +69,13 @@ partial body
 </stdout>
 
 <protocol>
-GET /want/1117 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=10-22\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /wantmore/11170001 HTTP/1.1\r
+GET /wantmore/%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=10-22\r
 User-Agent: curl/%VERSION\r
index 052adb163397a56f223a4e77e1cb17f0eb6504bc..9024e0864b74801f805d507d7325d7ee944da043 100644 (file)
@@ -35,7 +35,7 @@ http
 URL without slash and @-letter in query
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT?email=name@example.com/1118
+http://%HOSTIP:%HTTPPORT?email=name@example.com/%TESTNUMBER
 </command>
 </client>
 
@@ -43,7 +43,7 @@ http://%HOSTIP:%HTTPPORT?email=name@example.com/1118
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /?email=name@example.com/1118 HTTP/1.1\r
+GET /?email=name@example.com/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index eb3400c575854f3157b69b8b3a94891a44efa51f..6d23c4457333340a22cf1ea769da1e2533654867 100644 (file)
@@ -20,9 +20,9 @@ ftp
 FTP PASV upload resume
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/112 -T log/upload112 -C 40
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER -C 40
 </command>
-<file name="log/upload112">
+<file name="log/upload%TESTNUMBER">
 this is the *****crap******** that we're gonna upload
 
 worx?
@@ -37,7 +37,7 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-APPE 112\r
+APPE %TESTNUMBER\r
 QUIT\r
 </protocol>
 <upload>
index 4ea20425863779e5fb96d6dc5a6f21dc4c17d5d3..c7cd27568964ad325dfa82081adccfbd0a4c3e80 100644 (file)
@@ -23,7 +23,7 @@ ftp
 FTP with 421 timeout response
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/a/path/1120
+ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER
 </command>
 </client>
 
index 839c553645882dcdb2fb8364a89456a78b10138b..823a52e7ab757f5416a6c74f65cc8e57b4ee2406 100644 (file)
@@ -27,7 +27,7 @@ http
 HTTP multiple provided Host: headers
  </name>
  <command>
--H "Host: host1" -H "Host: host2" -H "Host: host3" http://%HOSTIP:%HTTPPORT/1121
+-H "Host: host1" -H "Host: host2" -H "Host: host3" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -35,7 +35,7 @@ HTTP multiple provided Host: headers
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1121 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: host1\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index d5b51a2cf4540a03f4ebce85161d7af50e90fb70..8f2fd870a95a431428d25ebf6705d58c603f6baf 100644 (file)
@@ -48,7 +48,7 @@ http
 HTTP GET gzip transfer-encoded content
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1122 --tr-encoding
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding
 </command>
 </client>
 
@@ -56,7 +56,7 @@ http://%HOSTIP:%HTTPPORT/1122 --tr-encoding
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1122 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 841a326adda343d8588c38b9ffee7c0b267e4d88..5ee840094be8dad8b851c048fdccfc69aec3aa61 100644 (file)
@@ -179,7 +179,7 @@ http
 HTTP GET deflate transfer-encoded content
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1123 --tr-encoding
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding
 </command>
 </client>
 
@@ -187,7 +187,7 @@ http://%HOSTIP:%HTTPPORT/1123 --tr-encoding
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1123 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 61c5cfb6c4ae675b81d493e55f6f407a66ce8b75..fc3c9cf69671d05cde66685b142b682adde0ab64 100644 (file)
@@ -47,7 +47,7 @@ http
 HTTP GET gzip+chunked transfer-encoded content
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1124 --tr-encoding
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding
 </command>
 </client>
 
@@ -55,7 +55,7 @@ http://%HOSTIP:%HTTPPORT/1124 --tr-encoding
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1124 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 51e3db78324edb974685eab1a3f6e2f635963f40..1bb306bbe2b49c318ff20bb3d8344dd89819c44f 100644 (file)
@@ -48,7 +48,7 @@ http
 HTTP GET transfer-encoding with custom Connection:
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1125 --tr-encoding -H "Connection: close"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding -H "Connection: close"
 </command>
 </client>
 
@@ -56,7 +56,7 @@ http://%HOSTIP:%HTTPPORT/1125 --tr-encoding -H "Connection: close"
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1125 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index ad8e6e08c1996cb81d43b601d2d6cd296b8af561..d45f40dad9bf9bd19c0e891ee74616d47e9dfc8d 100644 (file)
@@ -31,7 +31,7 @@ http
 HTTP 200 If-Modified-Since with newer document
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1126 -z "dec 12 12:00:00 1999 GMT"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT"
 </command>
 </client>
 
@@ -39,7 +39,7 @@ http://%HOSTIP:%HTTPPORT/1126 -z "dec 12 12:00:00 1999 GMT"
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1126 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 71bdfa168211e4b1223a055c643f8e19845a7f1f..968f80bf14651ac9c70a51eebf5fe3cfebe433bb 100644 (file)
@@ -40,7 +40,7 @@ http
 HTTP 200 If-Modified-Since with older document
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1127 -z "dec 12 12:00:00 1999 GMT"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT"
 </command>
 </client>
 
@@ -48,7 +48,7 @@ http://%HOSTIP:%HTTPPORT/1127 -z "dec 12 12:00:00 1999 GMT"
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1127 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index d8a6557237314cb922481c9ae8a9cf3f35e8e4fe..193ee40dab7e86dc968d6efd591dd87855e2cfaa 100644 (file)
@@ -41,7 +41,7 @@ http
 HTTP 200 If-Modified-Since with old+new documents
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1128 http://%HOSTIP:%HTTPPORT/11280001 -z "dec 12 12:00:00 1999 GMT"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -z "dec 12 12:00:00 1999 GMT"
 </command>
 </client>
 
@@ -49,13 +49,13 @@ http://%HOSTIP:%HTTPPORT/1128 http://%HOSTIP:%HTTPPORT/11280001 -z "dec 12 12:00
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1128 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT\r
 \r
-GET /11280001 HTTP/1.1\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index ec69e1e0f2a0a65d1cc5629d424eb3ab62c611a0..df4a9b0f9a4cd3141708105aa8162c0d227e165e 100644 (file)
@@ -41,7 +41,7 @@ skip: 1053700
 # Client-side
 <client>
 # 1053700 x 'x'
-<file name="log/file1129">
+<file name="log/file%TESTNUMBER">
 %repeat[1053700 x x]%
 </file>
 <server>
@@ -51,7 +51,7 @@ http
 HTTP POST expect 100-continue with a 404
  </name>
  <command option="no-output">
--d @log/file1129 http://%HOSTIP:%HTTPPORT/1129 http://%HOSTIP:%HTTPPORT/11290001
+-d @log/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001
 </command>
 </client>
 
@@ -75,7 +75,7 @@ Content-Type: text/html
 -foo-
 </stdout>
 <protocol>
-POST /1129 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -83,7 +83,7 @@ Content-Length: 1053700
 Content-Type: application/x-www-form-urlencoded\r
 Expect: 100-continue\r
 \r
-POST /11290001 HTTP/1.1\r
+POST /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 0046297cf0c102bb747953b8d64226c11d9f29e1..8264a6f2dda8448be5dbc9875b40aa1cd90bc41c 100644 (file)
@@ -21,7 +21,7 @@ ftp
 FTP download, failed login: USER not valid
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/113
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
index 0af591aaab89c5c82493904b44cd43d473062e7a..50ebeddc89bbd8cd8f4edcfe2c9b916b27661623 100644 (file)
@@ -41,7 +41,7 @@ skip: 100
 # Client-side
 <client>
 # 100 x 'x'
-<file name="log/file1130">
+<file name="log/file%TESTNUMBER">
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 </file>
 <server>
@@ -51,7 +51,7 @@ http
 HTTP POST forced expect 100-continue with a 404
  </name>
  <command option="no-output">
--d @log/file1130 http://%HOSTIP:%HTTPPORT/1130 http://%HOSTIP:%HTTPPORT/11300001 -H "Expect: 100-continue"
+-d @log/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -H "Expect: 100-continue"
 </command>
 </client>
 
@@ -75,7 +75,7 @@ Content-Type: text/html
 -foo-
 </stdout>
 <protocol>
-POST /1130 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -83,7 +83,7 @@ Expect: 100-continue
 Content-Length: 100\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-POST /11300001 HTTP/1.1\r
+POST /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 920dfe1b7ea3eb86c548148287b361c024a15238..8ead289c565abc2e60da1205dc0b1a60d8156e7a 100644 (file)
@@ -41,7 +41,7 @@ skip: 100
 # Client-side
 <client>
 # 100 x 'x'
-<file name="log/file1131">
+<file name="log/file%TESTNUMBER">
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 </file>
 <server>
@@ -51,7 +51,7 @@ http
 HTTP PUT expect 100-continue with a 400
  </name>
  <command option="no-output">
--T log/file1131 http://%HOSTIP:%HTTPPORT/1131 -T log/file1131 http://%HOSTIP:%HTTPPORT/11310001
+-T log/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001
 </command>
 </client>
 
@@ -75,14 +75,14 @@ Content-Type: text/html
 FAILURE2
 </stdout>
 <protocol>
-PUT /1131 HTTP/1.1\r
+PUT /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 100\r
 Expect: 100-continue\r
 \r
-PUT /11310001 HTTP/1.1\r
+PUT /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 6a088c0844d54f8cb5bb5d2d83468cc45d692f80..cd15f549fe45230163191f892a2bfd9a184876bf 100644 (file)
@@ -26,10 +26,10 @@ http
 HTTP RFC1867-type formposting with filename/data contains ',', ';', '"'
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/1133 -F "file=@\"log/test1133,and;.txt\";type=mo/foo;filename=\"faker,and;.txt\"" -F 'file2=@"log/test1133,and;.txt"' -F 'file3=@"log/test1133,and;.txt";type=m/f,"log/test1133,and;.txt"' -F a="{\"field1\":\"value1\",\"field2\":\"value2\"}" -F 'b=" \\value1;type=\"whatever\" "; type=text/foo; charset=utf-8 ; filename=param_b'
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "file=@\"log/test%TESTNUMBER,and;.txt\";type=mo/foo;filename=\"faker,and;.txt\"" -F 'file2=@"log/test%TESTNUMBER,and;.txt"' -F 'file3=@"log/test%TESTNUMBER,and;.txt";type=m/f,"log/test%TESTNUMBER,and;.txt"' -F a="{\"field1\":\"value1\",\"field2\":\"value2\"}" -F 'b=" \\value1;type=\"whatever\" "; type=text/foo; charset=utf-8 ; filename=param_b'
 </command>
 # We create this file before the command is invoked!
-<file name="log/test1133,and;.txt">
+<file name="log/test%TESTNUMBER,and;.txt">
 foo bar
 This is a bar foo
 bar
@@ -43,7 +43,7 @@ foo
 ^(Content-Type: multipart/form-data;|Content-Type: multipart/mixed; boundary=|-------).*
 </strip>
 <protocol>
-POST /we/want/1133 HTTP/1.1\r
+POST /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -60,7 +60,7 @@ bar
 foo
 \r
 ------------------------------24e78000bd32\r
-Content-Disposition: form-data; name="file2"; filename="test1133,and;.txt"\r
+Content-Disposition: form-data; name="file2"; filename="test%TESTNUMBER,and;.txt"\r
 Content-Type: text/plain\r
 \r
 foo bar
@@ -72,7 +72,7 @@ foo
 Content-Disposition: form-data; name="file3"\r
 Content-Type: multipart/mixed; boundary=----------------------------7f0e85a48b0b\r
 \r
-Content-Disposition: attachment; filename="test1133,and;.txt"\r
+Content-Disposition: attachment; filename="test%TESTNUMBER,and;.txt"\r
 Content-Type: m/f\r
 \r
 foo bar
@@ -80,7 +80,7 @@ This is a bar foo
 bar
 foo
 \r
-Content-Disposition: attachment; filename="test1133,and;.txt"\r
+Content-Disposition: attachment; filename="test%TESTNUMBER,and;.txt"\r
 Content-Type: text/plain\r
 \r
 foo bar
index 5e7c4602eeeda05e7e93dfd5e9bf2d56a4c9ee5f..01ceba1f65b84761139fe396c80e787393655f5b 100644 (file)
@@ -38,7 +38,7 @@ http
 HTTP connection re-use with different credentials
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1134 -u user1:password1 --next http://%HOSTIP:%HTTPPORT/11340001 -u 2user:password2
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u user1:password1 --next http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -u 2user:password2
 </command>
 </client>
 
@@ -46,13 +46,13 @@ http://%HOSTIP:%HTTPPORT/1134 -u user1:password1 --next http://%HOSTIP:%HTTPPORT
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1134 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dXNlcjE6cGFzc3dvcmQx\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /11340001 HTTP/1.1\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic MnVzZXI6cGFzc3dvcmQy\r
 User-Agent: curl/%VERSION\r
index 1dfa8d349a62fffb801005db90f0a1718ca6010d..1ce53362274a4d7bcbb7ffb4ac56259079689189 100644 (file)
@@ -45,14 +45,14 @@ Check cookies against PSL
 TZ=GMT
 </setenv>
 <command>
-http://www.example.ck/1136 http://www.ck/1136 http://z-1.compute-1.amazonaws.com/1136 -b none -c log/jar1136.txt -x %HOSTIP:%HTTPPORT
+http://www.example.ck/%TESTNUMBER http://www.ck/%TESTNUMBER http://z-1.compute-1.amazonaws.com/%TESTNUMBER -b none -c log/jar%TESTNUMBER.txt -x %HOSTIP:%HTTPPORT
 </command>
 
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/jar1136.txt" mode="text">
+<file name="log/jar%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
index a2bfcbac115b2c69be9ccf0ec701ed5415f73bff..aa37325a77adb6546efec8e69fec34939068ce6b 100644 (file)
@@ -31,7 +31,7 @@ ftp
 FTP RETR --ignore-content-length
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1137 --ignore-content-length
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ignore-content-length
 </command>
 
 </client>
@@ -45,7 +45,7 @@ PWD
 EPSV\r
 PASV\r
 TYPE I\r
-RETR 1137\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 729536be07d617c87840b37874c52cd300fcf146..6c5f00d0d835e53a63a032b2de92a2b9c01ce17e 100644 (file)
@@ -11,7 +11,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 302 OK swsclose\r
-Location: ../moo.html/?name=آغاز-سم-زدایی-از-بازار-پول&testcase=/11380002    \r
+Location: ../moo.html/?name=آغاز-سم-زدایی-از-بازار-پول&testcase=/%TESTNUMBER0002    \r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Connection: close\r
 \r
@@ -26,7 +26,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 302 OK swsclose\r
-Location: ../moo.html/?name=آغاز-سم-زدایی-از-بازار-پول&testcase=/11380002    \r
+Location: ../moo.html/?name=آغاز-سم-زدایی-از-بازار-پول&testcase=/%TESTNUMBER0002    \r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Connection: close\r
 \r
@@ -49,7 +49,7 @@ http
 HTTP redirect with UTF-8 characters
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/are/all/twits/1138 -L
+http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 </command>
 </client>
 
@@ -57,12 +57,12 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/1138 -L
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/are/all/twits/1138 HTTP/1.1\r
+GET /we/are/all/twits/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /we/are/all/moo.html/?name=%d8%a2%d8%ba%d8%a7%d8%b2-%d8%b3%d9%85-%d8%b2%d8%af%d8%a7%db%8c%db%8c-%d8%a7%d8%b2-%d8%a8%d8%a7%d8%b2%d8%a7%d8%b1-%d9%be%d9%88%d9%84&testcase=/11380002 HTTP/1.1\r
+GET /we/are/all/moo.html/?name=%d8%a2%d8%ba%d8%a7%d8%b2-%d8%b3%d9%85-%d8%b2%d8%af%d8%a7%db%8c%db%8c-%d8%a7%d8%b2-%d8%a8%d8%a7%d8%b2%d8%a7%d8%b1-%d9%be%d9%88%d9%84&testcase=/%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 6611aedeb6f1247586a3b74f7feac0548a4e6a20..8d8cc86b1907fd5ba588d6af016ef2a5fb18e2e0 100644 (file)
@@ -21,7 +21,7 @@ ftp
 FTP download, failed login: PASS not valid
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/114
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
index 063d3b28426248184a888f407101cb3f5584c6f8..97faec45c406e16836e36974f5a15c52d29cf33c 100644 (file)
@@ -12,7 +12,7 @@ followlocation
 <data>
 HTTP/1.1 302 This is a weirdo text message
 Connection: close
-Location: http:///foo.example.com/want/11410001
+Location: http:///foo.example.com/want/%TESTNUMBER0001
 
 This server reply is for testing
 </data>
@@ -26,7 +26,7 @@ hej
 <datacheck>
 HTTP/1.1 302 This is a weirdo text message
 Connection: close
-Location: http:///foo.example.com/want/11410001
+Location: http:///foo.example.com/want/%TESTNUMBER0001
 
 HTTP/1.1 200 hello
 Connection: close
@@ -45,7 +45,7 @@ http
 HTTP redirect to http:/// (three slashes!)
  </name>
  <command>
-%HOSTIP:%HTTPPORT/want/1141 -L -x http://%HOSTIP:%HTTPPORT
+%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -x http://%HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -55,13 +55,13 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/want/1141 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://foo.example.com/want/11410001 HTTP/1.1\r
+GET http://foo.example.com/want/%TESTNUMBER0001 HTTP/1.1\r
 Host: foo.example.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 3577ac46856dd9ebf047b7c4367145cd72f36562..b8dc33e475a1ace81c433fc0c31497f49bb9febb 100644 (file)
@@ -12,7 +12,7 @@ followlocation
 <data>
 HTTP/1.1 302 This is a weirdo text message
 Connection: close
-Location: http:////foo.example.com/want/11420001
+Location: http:////foo.example.com/want/%TESTNUMBER0001
 
 This server reply is for testing
 </data>
@@ -26,7 +26,7 @@ hej
 <datacheck>
 HTTP/1.1 302 This is a weirdo text message
 Connection: close
-Location: http:////foo.example.com/want/11420001
+Location: http:////foo.example.com/want/%TESTNUMBER0001
 
 </datacheck>
 </reply>
@@ -40,7 +40,7 @@ http
 HTTP redirect to http://// (four slashes!)
  </name>
  <command>
-%HOSTIP:%HTTPPORT/want/1142 -L -x http://%HOSTIP:%HTTPPORT
+%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -x http://%HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -50,7 +50,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/want/1142 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 8239c444ff762e0229f74c17af9be41e549f889e..a3b97402ee562adbe033f04b2830dad7fd112ba4 100644 (file)
@@ -26,7 +26,7 @@ http
 HTTP URL with http:/ (one slash!)
  </name>
  <command>
-http:/%HOSTIP:%HTTPPORT/want/1143
+http:/%HOSTIP:%HTTPPORT/want/%TESTNUMBER
 </command>
 <setenv>
 # Needed for MSYS2 to not treat the argument as a POSIX path list
@@ -38,7 +38,7 @@ MSYS2_ARG_CONV_EXCL=http:/
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/1143 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 5883555690f5f08d810011b7d2ab3e56b9bdd645..1fc852b223ee649765b4255c705c056708034778 100644 (file)
@@ -47,7 +47,7 @@ http
 HTTP HEAD, receive no headers only body
  </name>
  <command>
--I http://%HOSTIP:%HTTPPORT/1144 --http0.9
+-I http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http0.9
 </command>
 </client>
 
@@ -55,7 +55,7 @@ HTTP HEAD, receive no headers only body
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-HEAD /1144 HTTP/1.1\r
+HEAD /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 287bebfcc46337ab8f708551f312ebf4adbe7358..ce855524f0cbf0f049e451ab76539c14637e6785 100644 (file)
@@ -19,9 +19,9 @@ file:// bad host
 # This command should not succeed since we only accept
 # file:/// file://localhost/ file://127.0.0.1/
 <command>
-file://bad-host%PWD/log/test1145.txt
+file://bad-host%PWD/log/test%TESTNUMBER.txt
 </command>
-<file name="log/test1145.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo
    bar
 bar
index 636748ee5ce2f395f1aa56f42bfc357009ee1ab2..0278ab89547f09c9ea51e5e1c268cfc17c4df4f3 100644 (file)
@@ -25,9 +25,9 @@ file
 --proto-default file
 </name>
 <command option="no-include">
---proto-default file %PWD/log/test1146.txt
+--proto-default file %PWD/log/test%TESTNUMBER.txt
 </command>
-<file name="log/test1146.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo
    bar
 bar
index 831197487ac8c59f3a4a68439732d8d2f52cd49f..ea1ae00e42b6832e98c4e2c2355ef14ebef90861 100644 (file)
@@ -35,7 +35,7 @@ http
  <name>
 Get -H headers from a file
  </name>
-<file name="log/heads1147.txt">
+<file name="log/heads%TESTNUMBER.txt">
 One: 1
 Two: 2
 no-colon
@@ -44,7 +44,7 @@ no-colon
 User-Agent:
 </file>
  <command>
-http://%HOSTIP:%HTTPPORT/1147 -H @log/heads1147.txt
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H @log/heads%TESTNUMBER.txt
 </command>
 </client>
 
@@ -52,7 +52,7 @@ http://%HOSTIP:%HTTPPORT/1147 -H @log/heads1147.txt
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1147 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 One: 1\r
index 14c688528a33fe7f52c80669384223687ce084e2..658cfcab84ced0a501eb4276ca389266ea21f112 100644 (file)
@@ -35,7 +35,7 @@ http
 progress-bar
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1148 -# --stderr log/stderrlog1148
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -# --stderr log/stderrlog%TESTNUMBER
 </command>
 <setenv>
 LC_ALL=
@@ -46,7 +46,7 @@ LC_NUMERIC=en_US.UTF-8
 #
 <verify>
 <protocol>
-GET /1148 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -56,7 +56,7 @@ Accept: */*
 # Check that the progress finished at 100% and has the right bar width.
 # Note the dot in 100.0% is regex to match any character since different
 # locales use different separators.
-<file name="log/stderrlog1148" mode="text">
+<file name="log/stderrlog%TESTNUMBER" mode="text">
 correct
 </file>
 <stripfile>
index f0c297dc117b782033a05ca5146c07da6f5c5fa8..ac4d1c10f945c9faa03ebd92da05c1bf2e02ef9d 100644 (file)
@@ -37,7 +37,7 @@ ftp
 FTP dir list multicwd then again nocwd
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/list/this/path/1149/ --ftp-method multicwd --next ftp://%HOSTIP:%FTPPORT/list/this/path/1149/ --ftp-method nocwd
+ftp://%HOSTIP:%FTPPORT/list/this/path/%TESTNUMBER/ --ftp-method multicwd --next ftp://%HOSTIP:%FTPPORT/list/this/path/%TESTNUMBER/ --ftp-method nocwd
 </command>
 </client>
 
@@ -51,13 +51,13 @@ PWD
 CWD list\r
 CWD this\r
 CWD path\r
-CWD 1149\r
+CWD %TESTNUMBER\r
 EPSV\r
 TYPE A\r
 LIST\r
 CWD /\r
 EPSV\r
-LIST list/this/path/1149\r
+LIST list/this/path/%TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index f37a7e9fddae6baceb706a09079535e5c96be960..869027884d4afc3e6a571f208ebd57cb93ae1341 100644 (file)
@@ -23,7 +23,7 @@ ftp
 FTP download, failed PASV
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/115
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
index cc436a147867dd4286fb24402db03bbbd7c2f940..6a07b73dfb42b80375d72f978f8e1f9e5dc112ec 100644 (file)
@@ -30,7 +30,7 @@ http
 HTTP proxy with URLs using different ports
  </name>
  <command>
---proxy http://%HOSTIP:%HTTPPORT http://test.remote.example.com.1150:150/path http://test.remote.example.com.1150:1234/path/
+--proxy http://%HOSTIP:%HTTPPORT http://test.remote.example.com.%TESTNUMBER:150/path http://test.remote.example.com.%TESTNUMBER:1234/path/
 </command>
 <features>
 proxy
@@ -40,14 +40,14 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://test.remote.example.com.1150:150/path HTTP/1.1\r
-Host: test.remote.example.com.1150:150\r
+GET http://test.remote.example.com.%TESTNUMBER:150/path HTTP/1.1\r
+Host: test.remote.example.com.%TESTNUMBER:150\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://test.remote.example.com.1150:1234/path/ HTTP/1.1\r
-Host: test.remote.example.com.1150:1234\r
+GET http://test.remote.example.com.%TESTNUMBER:1234/path/ HTTP/1.1\r
+Host: test.remote.example.com.%TESTNUMBER:1234\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
index 6a1510011f748643f5b9cb98d7ff866bf90fcdd6..c8e1c67919880377cbf593fd1388364f08ef3c65 100644 (file)
@@ -38,20 +38,20 @@ http
 HTTP with too long cookies
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1151 -c log/cookies1151.txt
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c log/cookies%TESTNUMBER.txt
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1151 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file name="log/cookies1151.txt" mode="text">
+<file name="log/cookies%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
index aa8c0a7e4715df67dbb689e6667e4b11cb89d036..870215d9fffd6490cd0884a570fa3e15a240a5f2 100644 (file)
@@ -40,7 +40,7 @@ ftp
 FTP with uneven quote in PWD response
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/test-1152/
+ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/
 </command>
 </client>
 
@@ -51,7 +51,7 @@ ftp://%HOSTIP:%FTPPORT/test-1152/
 USER anonymous\r
 PASS ftp@example.com\r
 PWD\r
-CWD test-1152\r
+CWD test-%TESTNUMBER\r
 EPSV\r
 TYPE A\r
 LIST\r
index c0e37c13326147458f1616f399e90f21bf796955..b481431328d29579421156b4408700f33feec1f8 100644 (file)
@@ -40,7 +40,7 @@ ftp
 FTP with quoted double quotes
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/test-1153/
+ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/
 </command>
 </client>
 
@@ -51,7 +51,7 @@ ftp://%HOSTIP:%FTPPORT/test-1153/
 USER anonymous\r
 PASS ftp@example.com\r
 PWD\r
-CWD test-1153\r
+CWD test-%TESTNUMBER\r
 EPSV\r
 TYPE A\r
 LIST\r
index 4fc0b56dd460768ff2aa333d700d6e613810db33..ab1addec6b62592caf74747d0d67ab1a83873b30 100644 (file)
@@ -33,7 +33,7 @@ http
 HTTP GET with 100K (too long) response header
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1154
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -41,7 +41,7 @@ http://%HOSTIP:%HTTPPORT/1154
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1154 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 735f6e5332c6dbc8345f9a5ef1ff86505f34badb..65d76b6f519bd636f1295acba9790b52566ca8f8 100644 (file)
@@ -28,20 +28,20 @@ http
 HTTP cookie with parameter word as name
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1155 -c log/cookies1155.txt
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c log/cookies%TESTNUMBER.txt
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1155 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file name="log/cookies1155.txt" mode="text">
+<file name="log/cookies%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
index ff57bb0ec1027c045d9f793dffda26daaffcb123..35eb2dcfeade4f84cda3c92d8be2fd68a1fdd506 100644 (file)
@@ -52,7 +52,7 @@ body
 http
 </server>
 <tool>
-lib1156
+lib%TESTNUMBER
 </tool>
  <name>
 HTTP resume/range fail range-error content-range combinations
index dbb8ed581e14ac5d57ac299c9c9a8391af2d2e03..8c0bcc3466e9754655414be826f0efd9ea69f693 100644 (file)
@@ -35,10 +35,10 @@ http
  <name>
 Get -H headers from empty file
  </name>
-<file name="log/heads1157.txt">
+<file name="log/heads%TESTNUMBER.txt">
 </file>
  <command>
-http://%HOSTIP:%HTTPPORT/1157 -H @log/heads1157.txt
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H @log/heads%TESTNUMBER.txt
 </command>
 </client>
 
@@ -46,7 +46,7 @@ http://%HOSTIP:%HTTPPORT/1157 -H @log/heads1157.txt
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1157 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index c6a71c65ceeb584fdb8e304682907101ae1de60b..fd21d74bb15d5e53a3ff728eda112a8c8fb08cfe 100644 (file)
@@ -26,13 +26,13 @@ http
 HTTP RFC1867-type formposting with filename containing '"'
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/we/want/1158 -F "file=@\"log/test1158\\\".txt\";type=mo/foo;filename=\"test1158\\\".txt\"" -F 'file2=@"log/test1158\".txt"' -F 'file3=@"log/test1158\".txt";type=m/f,"log/test1158\".txt"'
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "file=@\"log/test%TESTNUMBER\\\".txt\";type=mo/foo;filename=\"test%TESTNUMBER\\\".txt\"" -F 'file2=@"log/test%TESTNUMBER\".txt"' -F 'file3=@"log/test%TESTNUMBER\".txt";type=m/f,"log/test%TESTNUMBER\".txt"'
 </command>
 <precheck>
 perl -e "print 'Test requires a system supporting double quotes in file names' if ($^O eq 'msys');"
 </precheck>
 # We create this file before the command is invoked!
-<file name=log/test1158".txt>
+<file name=log/test%TESTNUMBER".txt>
 foo bar
 This is a bar foo
 bar
@@ -46,7 +46,7 @@ foo
 ^(Content-Type: multipart/form-data;|Content-Type: multipart/mixed; boundary=|-------).*
 </strip>
 <protocol>
-POST /we/want/1158 HTTP/1.1\r
+POST /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -54,7 +54,7 @@ Content-Length: 954
 Content-Type: multipart/form-data; boundary=----------------------------24e78000bd32\r
 \r
 ------------------------------24e78000bd32\r
-Content-Disposition: form-data; name="file"; filename="test1158\".txt"\r
+Content-Disposition: form-data; name="file"; filename="test%TESTNUMBER\".txt"\r
 Content-Type: mo/foo\r
 \r
 foo bar
@@ -63,7 +63,7 @@ bar
 foo
 \r
 ------------------------------24e78000bd32\r
-Content-Disposition: form-data; name="file2"; filename="test1158\".txt"\r
+Content-Disposition: form-data; name="file2"; filename="test%TESTNUMBER\".txt"\r
 Content-Type: text/plain\r
 \r
 foo bar
@@ -75,7 +75,7 @@ foo
 Content-Disposition: form-data; name="file3"\r
 Content-Type: multipart/mixed; boundary=----------------------------7f0e85a48b0b\r
 \r
-Content-Disposition: attachment; filename="test1158\".txt"\r
+Content-Disposition: attachment; filename="test%TESTNUMBER\".txt"\r
 Content-Type: m/f\r
 \r
 foo bar
@@ -83,7 +83,7 @@ This is a bar foo
 bar
 foo
 \r
-Content-Disposition: attachment; filename="test1158\".txt"\r
+Content-Disposition: attachment; filename="test%TESTNUMBER\".txt"\r
 Content-Type: text/plain\r
 \r
 foo bar
index ea07f238f4842fbff2aabfa759a7eb3703a2700b..b09aff0e33530ba4b320258c3bb6baf88aa9369e 100644 (file)
@@ -30,14 +30,14 @@ http
 HTTP Location: and 'redirect_url' with non-supported scheme
  </name>
 <command>
-http://%HOSTIP:%HTTPPORT/we/want/our/1159 -w '%{redirect_url}\n'
+http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url}\n'
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/our/1159 HTTP/1.1\r
+GET /we/want/our/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 2ed4ab08cb79f5bc18c656d1a29a4ecb4d61cc64..f05c1bd2f5b4f04ba0711d397da7c70694136214 100644 (file)
@@ -29,7 +29,7 @@ ipv6
 FTP download, failed PORT
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/116 -P 1.2.3.4
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P 1.2.3.4
 </command>
 </client>
 
index 7004d37db0715a64697861e0bb25fea6d4e2f3ad..ac10e5a911fa245b5f2593b5fb25b279b66304d0 100644 (file)
@@ -29,20 +29,20 @@ http
 HTTP with long funny format cookie
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1160 -c log/cookies1160.txt
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c log/cookies%TESTNUMBER.txt
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1160 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file name="log/cookies1160.txt" mode="text">
+<file name="log/cookies%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
index b9c36c24c419be5257099964cf3b213944c79b15..89c1e657c52628374db3ecfafd67d4b9d807604c 100644 (file)
@@ -28,20 +28,20 @@ http
 HTTP cookie with path set twice
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1161 -c log/cookies1161.txt
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c log/cookies%TESTNUMBER.txt
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1161 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file name="log/cookies1161.txt" mode="text">
+<file name="log/cookies%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
index f62b0f66ec6ff086a58213af7ac8218e12145193..6140c2ec8fd1d8f94372feb0526086973050197b 100644 (file)
@@ -29,7 +29,7 @@ http
 HTTP/0.9 GET and all zeroes
  </name>
  <command option="force-output">
-http://%HOSTIP:%HTTPPORT/1164 -w '%{size_download}\n' --http0.9
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w '%{size_download}\n' --http0.9
 </command>
 </client>
 
@@ -37,7 +37,7 @@ http://%HOSTIP:%HTTPPORT/1164 -w '%{size_download}\n' --http0.9
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1164 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index ba8e17fedf0a040b0d4f2f85e37f8b2021505b23..609939f296e22c11a7554adabf78038bd449d421 100644 (file)
@@ -30,19 +30,19 @@ http
 HTTP response with cookies but not receiving!
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/1166 http://%HOSTIP:%HTTPPORT/want/1166
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/1166 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /want/1166 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index f41820b69148848a184291d8914ffe068649bc6f..5d0ed3a67152bf2ec24da0282a6877ee0c9c1673 100644 (file)
@@ -12,7 +12,7 @@ followlocation
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: /data/11680002.txt
+Location: /data/%TESTNUMBER0002.txt
 Connection: close
 
 This server reply is for testing a simple Location: following
@@ -31,7 +31,7 @@ If this is received, the location following worked
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: /data/11680002.txt
+Location: /data/%TESTNUMBER0002.txt
 Connection: close
 
 HTTP/1.1 200 Followed here fine swsclose
@@ -53,20 +53,20 @@ http
 HTTP redirect with credentials using # in user and password
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/1168 -L -u "catmai#d:#DZaRJYrixKE*gFY"
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -u "catmai#d:#DZaRJYrixKE*gFY"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/1168 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic Y2F0bWFpI2Q6I0RaYVJKWXJpeEtFKmdGWQ==\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /data/11680002.txt HTTP/1.1\r
+GET /data/%TESTNUMBER0002.txt HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic Y2F0bWFpI2Q6I0RaYVJKWXJpeEtFKmdGWQ==\r
 User-Agent: curl/%VERSION\r
index 2caad0da5bcee4b888ec72d4d19ba5e81881322b..b9c4b2ebadee4b9eeefe8f4423bc2b8df05b6a71 100644 (file)
@@ -22,7 +22,7 @@ ftp
 FTP download, failed TYPE
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/117
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
index 39ff3c8c9e2e59b00ba623477bc2e0aafd4a5791..688fbed7992a58c449f3e01405027f6aced17eef 100644 (file)
@@ -48,7 +48,7 @@ http
 HTTP GET transfer-encoding with removed Connection:
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1170 --tr-encoding -H "Connection:"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding -H "Connection:"
 </command>
 </client>
 
@@ -56,7 +56,7 @@ http://%HOSTIP:%HTTPPORT/1170 --tr-encoding -H "Connection:"
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1170 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index bc98d312e1634a9f0531ac8df96a21cdff9502ea..7057e0cb5ca3dbd2e70d7651dbda1c81167ba233 100644 (file)
@@ -48,7 +48,7 @@ http
 HTTP GET transfer-encoding with blanked Connection:
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1171 --tr-encoding -H "Connection;"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding -H "Connection;"
 </command>
 </client>
 
@@ -56,7 +56,7 @@ http://%HOSTIP:%HTTPPORT/1171 --tr-encoding -H "Connection;"
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1171 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index a099057f2c10b591b8a88776be44483ffb4db8fe..53179623d41c3d6baa30174b2c431af71144f5c8 100644 (file)
@@ -26,7 +26,7 @@ http
 HTTP/0.9 GET response denied
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1172 --no-http0.9
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --no-http0.9
 </command>
 </client>
 
@@ -34,7 +34,7 @@ http://%HOSTIP:%HTTPPORT/1172 --no-http0.9
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1172 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 7768696ffd8bb52992d694b378de605e9f2b30b7..5f45bb8622691f395b97ad1e27483b7d3bd21b4f 100644 (file)
@@ -26,7 +26,7 @@ http
 HTTP/0.9 GET response denied by default
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1174
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -34,7 +34,7 @@ http://%HOSTIP:%HTTPPORT/1174
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1174 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 5a76a20552058540348bc8f65c03e3ce687e48ff..bc3711c56cf53d1a8c88daf2495ff19da5a50ade 100644 (file)
@@ -34,7 +34,7 @@ http
 HTTP GET
  </name>
  <command option="no-output">
-http://%HOSTIP:%HTTPPORT/1176 -o 'log/base-#0'
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o 'log/base-#0'
 </command>
 </client>
 
@@ -42,7 +42,7 @@ http://%HOSTIP:%HTTPPORT/1176 -o 'log/base-#0'
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1176 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 6ebdf8c4fc275d50f1f3a74d2892cbb42b05b951..f8fa1ca1cb1791af325f243081e99771983b8a93 100644 (file)
@@ -30,7 +30,7 @@ HTTP proxy auth with credentials longer than 256 bytes
  </name>
 # 400 x 'A' : 600 x 'B' ...
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/that/page/1178 -x http://%HOSTIP:%HTTPPORT -U AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
+http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER -x http://%HOSTIP:%HTTPPORT -U AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
 </command>
 <features>
 proxy
@@ -41,7 +41,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/we/want/that/page/1178 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Proxy-Authorization: Basic QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQTpCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkI=\r
 User-Agent: curl/%VERSION\r
index 206ee7cae5c358268f5f423bc46c201d7436f6de..8dca8ab88320fba3339d14365b4fd8e6769da920 100644 (file)
@@ -25,7 +25,7 @@ manual
 error when using unknown command line option
 </name>
 <command>
---never-implemented http://never.use.this.example.com/1179
+--never-implemented http://never.use.this.example.com/%TESTNUMBER
 </command>
 </client>
 
index 94985e31908a41d3f06a685f35b11a59b8168e6b..4d47282af9685348b3d354af9ad08d4996f257bd 100644 (file)
@@ -25,7 +25,7 @@ ftp
 FTP download, failed RETR
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/118
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -41,8 +41,8 @@ PWD
 EPSV\r
 PASV\r
 TYPE I\r
-SIZE 118\r
-RETR 118\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 88e8bc43cf1aba8dbec66a015f6922ad7cdf8bf5..1eb9ed69b603acf8f74aa3a28c6dc0ad92950290 100644 (file)
@@ -31,13 +31,13 @@ proxy
 HTTP GET request with proxy and -H "Proxy-Connection: keep-alive"
  </name>
  <command>
---proxy http://%HOSTIP:%HTTPPORT -H "Proxy-Connection: Keep-Alive" http://%HOSTIP:%HTTPPORT/1180
+--proxy http://%HOSTIP:%HTTPPORT -H "Proxy-Connection: Keep-Alive" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/1180 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 3d77b634ae2c93a6a42c2b0df1e23bbd562b2cf6..367265c802b86da5a1ef7f2e5986a3a46627dc1f 100644 (file)
@@ -31,13 +31,13 @@ proxy
 HTTP GET request with proxy and --proxy-header "Proxy-Connection: Keep-Alive"
  </name>
  <command>
---proxy http://%HOSTIP:%HTTPPORT --proxy-header "Proxy-Connection: Keep-Alive" http://%HOSTIP:%HTTPPORT/1181
+--proxy http://%HOSTIP:%HTTPPORT --proxy-header "Proxy-Connection: Keep-Alive" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/1181 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 0e5a672d21ab569b38da394263a2730e5a09ea07..105d3d1f4abda928fef2745817ad8b5cb1247d94 100644 (file)
@@ -16,13 +16,13 @@ Verify that runtests.pl accepts an exclude file with the -E option
 </name>
 
 <command type="perl">
-%SRCDIR/runtests.pl -o TESTDIR=%SRCDIR/log/data -o LOGDIR=%SRCDIR/log/log -E %SRCDIR/log/test1182-exclude-file 1
+%SRCDIR/runtests.pl -o TESTDIR=%SRCDIR/log/data -o LOGDIR=%SRCDIR/log/log -E %SRCDIR/log/test%TESTNUMBER-exclude-file 1
 </command>
 <precheck>
-mkdir %SRCDIR/log/data ; mkdir %SRCDIR/log/log; cp %SRCDIR/data/test1 %SRCDIR/log/data; echo 'test:1:Test should not run for unit test 1182' > %SRCDIR/log/test1182-exclude-file
+mkdir %SRCDIR/log/data ; mkdir %SRCDIR/log/log; cp %SRCDIR/data/test1 %SRCDIR/log/data; echo 'test:1:Test should not run for unit test %TESTNUMBER' > %SRCDIR/log/test%TESTNUMBER-exclude-file
 </precheck>
 <postcheck>
-grep -q "Test should not run for unit test 1182" %SRCDIR/log/stdout1182
+grep -q "Test should not run for unit test %TESTNUMBER" %SRCDIR/log/stdout%TESTNUMBER
 </postcheck>
 
 </client>
index d8309e6ada883c366aa5f4f4f6c81077f7fdc55f..2955bdcc49a61857327d1466871e271491e5ab43 100644 (file)
@@ -35,10 +35,10 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
-# Verify that the %TESTNUMBER has been resolved to 1183
+# Verify that the %TESTNUMBER has been resolved to %TESTNUMBER
 <verify>
 <protocol>
-GET /1183 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 6078ee4834106ba6b284315dfdeb382d7aad32a8..0cbaaeb04fc6559f8b37281c479a2c29c970a01c 100644 (file)
@@ -26,19 +26,19 @@ http
 --write-out with %{onerror} and %{urlnum} to stderr
  </name>
 <command>
--f -s -w '%{onerror}%{stderr}%{urlnum} says %{exitcode} %{errormsg}\n' http://%HOSTIP:%HTTPPORT/we/want/our/1188 http://%HOSTIP:%HTTPPORT/we/want/our/1188
+-f -s -w '%{onerror}%{stderr}%{urlnum} says %{exitcode} %{errormsg}\n' http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/our/1188 HTTP/1.1\r
+GET /we/want/our/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /we/want/our/1188 HTTP/1.1\r
+GET /we/want/our/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 95d1021ca801b2866060d53cf5f12b6be46d33bd..6999e0da709a2f14126265cac4efab79350041cf 100644 (file)
@@ -24,7 +24,7 @@ ftp
 FTP download, failed RETR with PORT
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/119 -P -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P -
 </command>
 </client>
 
@@ -43,8 +43,8 @@ USER anonymous
 PASS ftp@example.com\r
 PWD\r
 TYPE I\r
-SIZE 119\r
-RETR 119\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 007a15013eb1a63917e386efc03a9c3709e119eb..f866352eafda46d10ce56f7d01fed36bc3b0e7d3 100644 (file)
@@ -30,7 +30,7 @@ mqtt
 MQTT SUBSCRIBE
 </name>
 <command option="binary-trace">
-mqtt://%HOSTIP:%MQTTPORT/1190
+mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER
 </command>
 </client>
 
index a36bc31130703155c26eed4e25bbba60995f41a8..69cf33fbd107bbb0363f80b8bd4ff69b63ad3d33 100644 (file)
@@ -26,7 +26,7 @@ mqtt
 MQTT PUBLISH
 </name>
 <command option="binary-trace">
-mqtt://%HOSTIP:%MQTTPORT/1191 -d something
+mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER -d something
 </command>
 </client>
 
index 691c7783fc1205105a392375358f729b49ff7f47..47036ab83ea5e1d24f18052c9e5b1e99b329ab1b 100644 (file)
@@ -30,7 +30,7 @@ mqtt
 MQTT SUBSCRIBE 2k topic
 </name>
 <command option="binary-trace">
-mqtt://%HOSTIP:%MQTTPORT/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/1192
+mqtt://%HOSTIP:%MQTTPORT/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/%TESTNUMBER
 </command>
 </client>
 
index 8da9abb21b41048e0e2fca3230c95897b0ba7b2d..bed10b24191e411bd9da48739b496b25ad4f88f2 100644 (file)
@@ -26,9 +26,9 @@ mqtt
 MQTT PUBLISH 2k payload
 </name>
 <command option="binary-trace">
-mqtt://%HOSTIP:%MQTTPORT/1193 -d @log/payload1193
+mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER -d @log/payload%TESTNUMBER
 </command>
-<file name="log/payload1193">
+<file name="log/payload%TESTNUMBER">
 123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
 123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
 123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
index 497891add91d005020865a6c2396fc8585d1ef20..cabf6beb0f172a0fc6311134d13b6f7e54768413 100644 (file)
@@ -33,7 +33,7 @@ mqtt
 MQTT SUBSCRIBE with PUBLISH befoire SUBACK
 </name>
 <command option="binary-trace">
-mqtt://%HOSTIP:%MQTTPORT/1194
+mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER
 </command>
 </client>
 
index 0dfaccd53f136efcc20832a9f9f53b98f136ec18..803bdd980d6f75b6f7c586855d21df8fca88e186 100644 (file)
@@ -34,7 +34,7 @@ mqtt
 MQTT SUBSCRIBE with short PUBLISH
 </name>
 <command option="binary-trace">
-mqtt://%HOSTIP:%MQTTPORT/1195
+mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER
 </command>
 </client>
 
index c07efd927d23311a0a84c157b31f2a7f92c6a5e6..9290144128e9433421b12e60d5ff269368b842b2 100644 (file)
@@ -35,7 +35,7 @@ mqtt
 MQTT with error in CONNACK
 </name>
 <command option="binary-trace">
-mqtt://%HOSTIP:%MQTTPORT/1196
+mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER
 </command>
 </client>
 
index 634a30b4126abe3c7525e5c49b9857e1c43694bc..8b882c714c999921cb96a23f42df9c664a946db1 100644 (file)
@@ -17,7 +17,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 8\r
 Connection: close\r
 Content-Type: text/plain\r
-Location: ./11970001\r
+Location: ./%TESTNUMBER0001\r
 \r
 monster
 </data>
@@ -43,7 +43,7 @@ http
 HTTP POST redirected to GET and --write-out method
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1197 -w "%{method}\n" -L -d "twinkle twinkle little star"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{method}\n" -L -d "twinkle twinkle little star"
 </command>
 </client>
 
@@ -51,14 +51,14 @@ http://%HOSTIP:%HTTPPORT/1197 -w "%{method}\n" -L -d "twinkle twinkle little sta
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST /1197 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 27\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-twinkle twinkle little starGET /11970001 HTTP/1.1\r
+twinkle twinkle little starGET /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -71,7 +71,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 8\r
 Connection: close\r
 Content-Type: text/plain\r
-Location: ./11970001\r
+Location: ./%TESTNUMBER0001\r
 \r
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
index 8f93abbaaa15d5650286267c499fcf49168c9e69..a7c30d220bcc61357edf65760253d9a5b2f78a09 100644 (file)
@@ -36,14 +36,14 @@ http
 HTTP range support
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/12 -r 100-200
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -r 100-200
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/12 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=100-200\r
 User-Agent: curl/%VERSION\r
index 85d49f5296b8f1c897a75208d310d9fa5afae996..45e11a63e5fd9260db0db9cd234536f19ab689bf 100644 (file)
@@ -31,7 +31,7 @@ ftp
 ftp download with post-quote delete operation
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/120 -Q "-DELE file"
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "-DELE file"
 </command>
 </client>
 
@@ -44,8 +44,8 @@ PWD
 EPSV\r
 PASV\r
 TYPE I\r
-SIZE 120\r
-RETR 120\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 DELE file\r
 QUIT\r
 </protocol>
index ba1159f80e4a5b7c2c51040b85a0e6ee2ac0fc3a..886fa166f241143e093d18526427688c55478276 100644 (file)
@@ -25,7 +25,7 @@ gopher
 Gopher index
  </name>
  <command>
-gopher://%HOSTIP:%GOPHERPORT/1/1200
+gopher://%HOSTIP:%GOPHERPORT/1/%TESTNUMBER
 </command>
 </client>
 
@@ -33,7 +33,7 @@ gopher://%HOSTIP:%GOPHERPORT/1/1200
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-/1200\r
+/%TESTNUMBER\r
 </protocol>
 </verify>
 </testcase>
index 29a059aa07c6ecf452310b993a94dcffe86b4a15..9f1ba664b281ca0171a13ee52f533fba915a2256 100644 (file)
@@ -25,7 +25,7 @@ gopher
 Gopher selector
  </name>
  <command>
-gopher://%HOSTIP:%GOPHERPORT/1/selector/SELECTOR/1201?
+gopher://%HOSTIP:%GOPHERPORT/1/selector/SELECTOR/%TESTNUMBER?
 </command>
 </client>
 
@@ -33,7 +33,7 @@ gopher://%HOSTIP:%GOPHERPORT/1/selector/SELECTOR/1201?
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-/selector/SELECTOR/1201?\r
+/selector/SELECTOR/%TESTNUMBER?\r
 </protocol>
 </verify>
 </testcase>
index 6c91a774c36b3664cd4cb73edaccb5aadc010818..aefb6d00825f96ba59401324ab6102b426cca5ab 100644 (file)
@@ -26,7 +26,7 @@ gopher
 Gopher query
  </name>
  <command>
-"gopher://%HOSTIP:%GOPHERPORT/7/the/search/engine%09query%20succeeded/1202"
+"gopher://%HOSTIP:%GOPHERPORT/7/the/search/engine%09query%20succeeded/%TESTNUMBER"
 </command>
 </client>
 
@@ -34,7 +34,7 @@ Gopher query
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-/the/search/engine     query succeeded/1202\r
+/the/search/engine     query succeeded/%TESTNUMBER\r
 </protocol>
 </verify>
 </testcase>
index 02d094da0b2ebf6c58d7f2bd8089f401fa3d3430..9f4648e272e1098e707670cd4b2fe6cc137c9165 100644 (file)
@@ -29,7 +29,7 @@ gopher-ipv6
 Gopher IPv6 index
  </name>
  <command>
--g gopher://%HOST6IP:%GOPHER6PORT/1/moo/1203
+-g gopher://%HOST6IP:%GOPHER6PORT/1/moo/%TESTNUMBER
 </command>
 </client>
 
@@ -37,7 +37,7 @@ Gopher IPv6 index
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-/moo/1203\r
+/moo/%TESTNUMBER\r
 </protocol>
 </verify>
 </testcase>
index 50738011c42b26f241c0850f8c71e0ab5a67a313..9e8c2b6a03c41564a310c95c03d2ab470073b26d 100644 (file)
@@ -55,19 +55,19 @@ http
 HTTP with WWW-Authenticate and multiple auths in a single line
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1204 -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1204 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /1204 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=\r
 User-Agent: curl/%VERSION\r
index 9f1a34ce1f4164f2a4298ffc4d5eb4737fe4e7fa..df77175d642213530089f529133984c4270d84df 100644 (file)
@@ -30,7 +30,7 @@ http
 HTTP GET with 18K HTTP header
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1205
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/1205
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1205 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 3f853d1d9ee5186b806a99e90ecc089433938b65..b192592700401798bd69df5f44edb784c339f60e 100644 (file)
@@ -26,7 +26,7 @@ ftp
 FTP PORT and 425 on download
  </name>
  <command>
---max-time %FTPTIME2 ftp://%HOSTIP:%FTPPORT/1206 -P -
+--max-time %FTPTIME2 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P -
 </command>
 
 </client>
@@ -42,8 +42,8 @@ PASS ftp@example.com
 PWD\r
 EPRT |1|
 TYPE I\r
-SIZE 1206\r
-RETR 1206\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 <errorcode>
index 283e46d5b6d236d1ba9a3c92d56f9f6d2c42b25b..f105df54c0f4cac101d9b9c09da08ae505f37c81 100644 (file)
@@ -26,7 +26,7 @@ ftp
 FTP PORT and 421 on download
  </name>
  <command>
---max-time %FTPTIME2 ftp://%HOSTIP:%FTPPORT/1207 -P -
+--max-time %FTPTIME2 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P -
 </command>
 
 </client>
@@ -42,8 +42,8 @@ PASS ftp@example.com
 PWD\r
 EPRT |1|
 TYPE I\r
-SIZE 1207\r
-RETR 1207\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 <errorcode>
index 055aa932756f251883bd0d6cbf2e19a881370a6a..47ceb64d4dc194eae3047d7d4d8b02f68fb6a1ba 100644 (file)
@@ -27,7 +27,7 @@ ftp
 FTP PORT download, no data conn and no transient negative reply
  </name>
  <command>
---max-time %FTPTIME2 ftp://%HOSTIP:%FTPPORT/1208 -P -
+--max-time %FTPTIME2 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P -
 </command>
 
 </client>
@@ -48,8 +48,8 @@ PASS ftp@example.com
 PWD\r
 EPRT |1|
 TYPE I\r
-SIZE 1208\r
-RETR 1208\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 </protocol>
 <errorcode>
 28
index 76bce5fd56026996be3b80cbe4e028e731756fcd..4d442d177b7bcde1c3dfa011a57b9c948299b404 100644 (file)
@@ -26,7 +26,7 @@ ftp
 FTP PORT download, no data conn and no positive preliminary reply
  </name>
  <command>
---max-time %FTPTIME2 ftp://%HOSTIP:%FTPPORT/1209 -P -
+--max-time %FTPTIME2 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P -
 </command>
 
 </client>
@@ -48,8 +48,8 @@ PASS ftp@example.com
 PWD\r
 EPRT |1|
 TYPE I\r
-SIZE 1209\r
-RETR 1209\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 </protocol>
 <errorcode>
 28
index de7a56174e49528ee7e4dae4a34481aade2d795e..b8ec70136c5c5614f47f312872012ee2f1410b20 100644 (file)
@@ -29,7 +29,7 @@ ftp
 ftp download with post- and pre-transfer delete operations
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/121 -Q "-DELE after_transfer" -Q "DELE before_transfer"
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "-DELE after_transfer" -Q "DELE before_transfer"
 </command>
 </client>
 
@@ -42,8 +42,8 @@ PWD
 DELE before_transfer\r
 EPSV\r
 TYPE I\r
-SIZE 121\r
-RETR 121\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 DELE after_transfer\r
 QUIT\r
 </protocol>
index a1cf5a78d518266e5768ab347adf6669ef792f66..037eb16d8e3ebecef0ac3fa40eead7b5aec3af89 100644 (file)
@@ -39,7 +39,7 @@ HTTP GET with -J without Content-Disposition
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1210 -J -O
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O
 </command>
 </client>
 
@@ -47,13 +47,13 @@ http://%HOSTIP:%HTTPPORT/1210 -J -O
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1210 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file name="log/1210">
+<file name="log/%TESTNUMBER">
 12345
 </file>
 
index 5418a85f73a4b94e5363e66cd9cae22580c07cff..6d31357dff03eb01275efed498663b305d544a8c 100644 (file)
@@ -26,7 +26,7 @@ ftp
 FTP PORT and 425 on download
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1211 -P -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P -
 </command>
 
 </client>
@@ -43,8 +43,8 @@ PASS ftp@example.com
 PWD\r
 EPRT |1|
 TYPE I\r
-SIZE 1211\r
-RETR 1211\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 </protocol>
 <errorcode>
 28
index befd91f4c57304b1b42afb5c1e80403a9dea53e8..5a93089717e76178102654ef4f31106c08a0a9cd 100644 (file)
@@ -31,14 +31,14 @@ noproxy setting together with socks proxy
  </name>
 
 <command>
-http://user:secret@%HOSTIP:%HTTPPORT/ulion/1212 --socks5 non-existing-host.haxx.se:1080 --noproxy %HOSTIP --max-time 5
+http://user:secret@%HOSTIP:%HTTPPORT/ulion/%TESTNUMBER --socks5 non-existing-host.haxx.se:1080 --noproxy %HOSTIP --max-time 5
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /ulion/1212 HTTP/1.1\r
+GET /ulion/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dXNlcjpzZWNyZXQ=\r
 User-Agent: curl/%VERSION\r
index 5abf974df03f6aa1123cf30ab6e3761e3d5345ab..6bd4d2c362f493d75c6b04604284f01c68a3bef4 100644 (file)
@@ -33,7 +33,7 @@ HTTP with proxy and host-only URL
 # for normal server use, and we need to make sure it gets converted to
 # RFC style even for proxies
  <command>
--x %HOSTIP:%HTTPPORT we.want.that.site.com.1213
+-x %HOSTIP:%HTTPPORT we.want.that.site.com.%TESTNUMBER
 </command>
 <features>
 proxy
@@ -43,8 +43,8 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://we.want.that.site.com.1213/ HTTP/1.1\r
-Host: we.want.that.site.com.1213\r
+GET http://we.want.that.site.com.%TESTNUMBER/ HTTP/1.1\r
+Host: we.want.that.site.com.%TESTNUMBER\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
index 0957fb71ceb47ac916f8669b948d961306618747..1758693971ec9644faf292f0c6d111eef5740854 100644 (file)
@@ -33,7 +33,7 @@ HTTP with proxy and URL with ? and no slash separator
 # for normal server use, and we need to make sure it gets converted to
 # RFC style even for proxies
  <command>
--x %HOSTIP:%HTTPPORT http://we.want.that.site.com.1214?moo=foo
+-x %HOSTIP:%HTTPPORT http://we.want.that.site.com.%TESTNUMBER?moo=foo
 </command>
 <features>
 proxy
@@ -43,8 +43,8 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://we.want.that.site.com.1214/?moo=foo HTTP/1.1\r
-Host: we.want.that.site.com.1214\r
+GET http://we.want.that.site.com.%TESTNUMBER/?moo=foo HTTP/1.1\r
+Host: we.want.that.site.com.%TESTNUMBER\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
index 7aa1c4237c743dbe363bb147382f1601ddbe0571..83e6503295893a3de91a7d3059c5c1c9aad691d5 100644 (file)
@@ -76,7 +76,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/1215 -u testuser:testpass --ntlm --proxy http://%HOSTIP:%HTTPPORT
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm --proxy http://%HOSTIP:%HTTPPORT
 </command>
 <precheck>
 chkhostname curlhost
@@ -86,14 +86,14 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/1215 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://%HOSTIP:%HTTPPORT/1215 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
 User-Agent: curl/%VERSION\r
index 62271332358f755462fa3eb21ff624e137bbbd37..5353b36d1894373693d9948a1c3dc620054e9c37 100644 (file)
@@ -31,9 +31,9 @@ http
 HTTP cookie domains tailmatching the host name
  </name>
  <command>
-http://example.fake/c/1216 http://bexample.fake/c/1216 -b log/injar1216 -x %HOSTIP:%HTTPPORT
+http://example.fake/c/%TESTNUMBER http://bexample.fake/c/%TESTNUMBER -b log/injar%TESTNUMBER -x %HOSTIP:%HTTPPORT
 </command>
-<file name="log/injar1216">
+<file name="log/injar%TESTNUMBER">
 example.fake   FALSE   /a      FALSE   2139150993      mooo    indeed
 example.fake   FALSE   /b      FALSE   0               moo1    indeed
 example.fake   FALSE   /c      FALSE   2139150993      moo2    indeed
@@ -47,14 +47,14 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://example.fake/c/1216 HTTP/1.1\r
+GET http://example.fake/c/%TESTNUMBER HTTP/1.1\r
 Host: example.fake\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Cookie: moo3=indeed; moo2=indeed\r
 \r
-GET http://bexample.fake/c/1216 HTTP/1.1\r
+GET http://bexample.fake/c/%TESTNUMBER HTTP/1.1\r
 Host: bexample.fake\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 1efa4d604bdd7920c1b859989ee728598a30da0d..0f4772d9706f478a399d7f0c4975145b162fa977 100644 (file)
@@ -26,7 +26,7 @@ ftp
 FTP with rubbish before name in 257-response
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/get/file/1217 ftp://%HOSTIP:%FTPPORT/get/file/again/1217 --ftp-method singlecwd
+ftp://%HOSTIP:%FTPPORT/get/file/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/get/file/again/%TESTNUMBER --ftp-method singlecwd
 </command>
 </client>
 
@@ -44,13 +44,13 @@ PWD
 CWD get/file\r
 EPSV\r
 TYPE I\r
-SIZE 1217\r
-RETR 1217\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 CWD /this/is/the/path\r
 CWD get/file/again\r
 EPSV\r
-SIZE 1217\r
-RETR 1217\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index b9914d25fd6ae003dff45367dc37b2a54fbecf42..259281c1c3490df5fafeb638b8425fe9b28bd418 100644 (file)
@@ -30,7 +30,7 @@ http
 HTTP cookies and domains with same prefix
  </name>
  <command>
-http://example.fake/c/1218 http://example.fake/c/1218 http://bexample.fake/c/1218 -b nonexisting -x %HOSTIP:%HTTPPORT
+http://example.fake/c/%TESTNUMBER http://example.fake/c/%TESTNUMBER http://bexample.fake/c/%TESTNUMBER -b nonexisting -x %HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -40,20 +40,20 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://example.fake/c/1218 HTTP/1.1\r
+GET http://example.fake/c/%TESTNUMBER HTTP/1.1\r
 Host: example.fake\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://example.fake/c/1218 HTTP/1.1\r
+GET http://example.fake/c/%TESTNUMBER HTTP/1.1\r
 Host: example.fake\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Cookie: bug=fixed\r
 \r
-GET http://bexample.fake/c/1218 HTTP/1.1\r
+GET http://bexample.fake/c/%TESTNUMBER HTTP/1.1\r
 Host: bexample.fake\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index e42a211a2a40ca57758504c29d9c415a7d595c39..f579859fda71499a5b3aae9a63fe4ab4184e93b1 100644 (file)
@@ -30,7 +30,7 @@ ftp
 FTP with no user+password required (230 response)
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1219
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 
 </client>
@@ -41,8 +41,8 @@ ftp://%HOSTIP:%FTPPORT/1219
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 1219\r
-RETR 1219\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index fb1dd05fc3f276abea70a83299e38da2cb059403..8d636af4786afb5fd51a4e437214d63c91d48131 100644 (file)
@@ -25,7 +25,7 @@ ftp
 FTP download resume with whole file already downloaded
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/122 -C 5
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C 5
 </command>
 </client>
 
@@ -38,7 +38,7 @@ PWD
 EPSV\r
 PASV\r
 TYPE I\r
-SIZE 122\r
+SIZE %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index c8eb52cb1c40a3d81c0209008e1cad7a140cdf1f..49cbf2c4916355ea5864f465f4c6de66bd51e3f8 100644 (file)
@@ -21,9 +21,9 @@ file
 file:// URLs with query string
  </name>
 <command option="no-include">
-file://localhost%FILE_PWD/log/test1220.txt?a_query=foobar#afragment
+file://localhost%FILE_PWD/log/test%TESTNUMBER.txt?a_query=foobar#afragment
 </command>
-<file name="log/test1220.txt">
+<file name="log/test%TESTNUMBER.txt">
 contents in a single file
 </file>
 </client>
index 46461546d5383ef036e7dd4bd71b3f99566c9131..9404adf6f271ab5f8c40c060c53d4077c7a1d662 100644 (file)
@@ -30,7 +30,7 @@ http
 HTTP GET -w remote_ip and -w remote_port
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1223 -w 'IP %{remote_ip} and PORT %{remote_port}\n'
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w 'IP %{remote_ip} and PORT %{remote_port}\n'
 </command>
 </client>
 
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/1223 -w 'IP %{remote_ip} and PORT %{remote_port}\n'
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1223 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 315936b99e52fcf0dbae20aeb8a3a762e6726ac2..fc898a7a197262e9b9c24981b4dcc6ff1b477c58 100644 (file)
@@ -27,7 +27,7 @@ ftp
 FTP fetch a file from the root directory
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT//1224
+ftp://%HOSTIP:%FTPPORT//%TESTNUMBER
 </command>
 
 </client>
@@ -41,8 +41,8 @@ PWD
 CWD /\r
 EPSV\r
 TYPE I\r
-SIZE 1224\r
-RETR 1224\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 09a1abb79fbf41624bba87ce774820f73b376ada..7e4f39b01006714c156b5d839d95f1ad71eeb326 100644 (file)
@@ -27,7 +27,7 @@ ftp
 FTP fetch two files using absolute paths
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT//foo/1225 ftp://%HOSTIP:%FTPPORT//foo/bar/1225
+ftp://%HOSTIP:%FTPPORT//foo/%TESTNUMBER ftp://%HOSTIP:%FTPPORT//foo/bar/%TESTNUMBER
 </command>
 
 </client>
@@ -42,14 +42,14 @@ CWD /
 CWD foo\r
 EPSV\r
 TYPE I\r
-SIZE 1225\r
-RETR 1225\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 CWD /\r
 CWD foo\r
 CWD bar\r
 EPSV\r
-SIZE 1225\r
-RETR 1225\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 6381b122a4a54c1c424c832af4c10888a248c3bc..a22776eac711a96462667a810cec4cfc90aa6a82 100644 (file)
@@ -27,7 +27,7 @@ ftp
 FTP fetch a file from the root directory with singlecwd
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT//1226 --ftp-method singlecwd
+ftp://%HOSTIP:%FTPPORT//%TESTNUMBER --ftp-method singlecwd
 </command>
 
 </client>
@@ -41,8 +41,8 @@ PWD
 CWD /\r
 EPSV\r
 TYPE I\r
-SIZE 1226\r
-RETR 1226\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 46b28d510b78531acfb413f103cc0f12c46960fe..1cd9bf24fa5a025ee9f5c3d17203d7f4465415fe 100644 (file)
@@ -27,7 +27,7 @@ ftp
 FTP fetch a file from the root directory with nocwd
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT//1227 --ftp-method nocwd
+ftp://%HOSTIP:%FTPPORT//%TESTNUMBER --ftp-method nocwd
 </command>
 
 </client>
@@ -40,8 +40,8 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE /1227\r
-RETR /1227\r
+SIZE /%TESTNUMBER\r
+RETR /%TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 529c7e55d0506edfc9b9c0a2737b6dab85c27da1..2a7faff48d0e1ac0bc8953e8eb48135ab4293e07 100644 (file)
@@ -29,7 +29,7 @@ http
 HTTP cookie path match
  </name>
  <command>
-http://example.fake/hoge/1228 http://example.fake/hogege/ -b nonexisting -x %HOSTIP:%HTTPPORT
+http://example.fake/hoge/%TESTNUMBER http://example.fake/hogege/ -b nonexisting -x %HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -39,7 +39,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://example.fake/hoge/1228 HTTP/1.1\r
+GET http://example.fake/hoge/%TESTNUMBER HTTP/1.1\r
 Host: example.fake\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 0cb45358a89917823a48337a69ee4cd10267bc23..06d81758e94f036da99617a963f4c864165fc8b9 100644 (file)
@@ -59,21 +59,21 @@ crypto
 HTTP with Digest authorization with user name needing escape
  </name>
  <command>
-http://%5cuser%22:password@%HOSTIP:%HTTPPORT/1229 --digest
+http://%5cuser%22:password@%HOSTIP:%HTTPPORT/%TESTNUMBER --digest
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1229 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /1229 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="\\user\"", realm="testrealm", nonce="1053604145", uri="/1229", response="f2694d426040712584c156d3de72b8d6"\r
+Authorization: Digest username="\\user\"", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="f2694d426040712584c156d3de72b8d6"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index 4bbfce9a48a08e85040e7fa6c792867853d6e501..1604f0b0c7eeb93402dbe6562eec7fa41df7bc08 100644 (file)
@@ -19,9 +19,9 @@ ftp
 FTP upload resume with whole file already downloaded
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/123 -T log/upload123 -C 51
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER -C 51
 </command>
-<file name="log/upload123">
+<file name="log/upload%TESTNUMBER">
 --------------------------------------------------
 </file>
 </client>
index 5184f2a7d3b7a80aa890eaa44335cd9c28db3c50..8d4a35c8da07ec3f32f63a32db8fbc74193f819d 100644 (file)
@@ -53,9 +53,9 @@ http
  <name>
 HTTP CONNECT to IPv6 numerical address
  </name>
-# 0x4ce == 1230, the test number
+# 0x4ce == %TESTNUMBER, the test number
  <command>
-http://[1234:1234:1234::4ce]:%HTTPPORT/wanted/page/1230 -p -x %HOSTIP:%HTTPPORT
+http://[1234:1234:1234::4ce]:%HTTPPORT/wanted/page/%TESTNUMBER -p -x %HOSTIP:%HTTPPORT
 </command>
 </client>
 
@@ -68,7 +68,7 @@ Host: [1234:1234:1234::4ce]:%HTTPPORT
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET /wanted/page/1230 HTTP/1.1\r
+GET /wanted/page/%TESTNUMBER HTTP/1.1\r
 Host: [1234:1234:1234::4ce]:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 7b085c52390e5727459bbaa73f5d88af711883a9..c37f50915dbb21a30f4455cd3fa32d03b4f76c05 100644 (file)
@@ -37,7 +37,7 @@ http
 HTTP URL with dotdot removal from path
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/../../hej/but/who/../1231?stupid=me/../1231#soo/../1231 http://%HOSTIP:%HTTPPORT/../../hej/but/who/../12310001#/../12310001
+http://%HOSTIP:%HTTPPORT/../../hej/but/who/../%TESTNUMBER?stupid=me/../%TESTNUMBER#soo/../%TESTNUMBER http://%HOSTIP:%HTTPPORT/../../hej/but/who/../%TESTNUMBER0001#/../%TESTNUMBER0001
 </command>
 </client>
 
@@ -45,12 +45,12 @@ http://%HOSTIP:%HTTPPORT/../../hej/but/who/../1231?stupid=me/../1231#soo/../1231
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /hej/but/1231?stupid=me/../1231 HTTP/1.1\r
+GET /hej/but/%TESTNUMBER?stupid=me/../%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /hej/but/12310001 HTTP/1.1\r
+GET /hej/but/%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 7a74cb12d2bc8ba1ec95ccf85e425a41f6d6fe67..3f91ecf5c435c47c9a5f533630df999667c05f58 100644 (file)
@@ -39,7 +39,7 @@ http
 HTTP URL with dotdot removal from path using an HTTP proxy
  </name>
  <command>
---proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.1232:8990/../../hej/but/who/../1232?stupid=me/../1232#soo/../1232 http://test.remote.haxx.se.1232:8990/../../hej/but/who/../12320001#/../12320001
+--proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.%TESTNUMBER:8990/../../hej/but/who/../%TESTNUMBER?stupid=me/../%TESTNUMBER#soo/../%TESTNUMBER http://test.remote.haxx.se.%TESTNUMBER:8990/../../hej/but/who/../%TESTNUMBER0001#/../%TESTNUMBER0001
 </command>
 <features>
 proxy
@@ -50,14 +50,14 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://test.remote.haxx.se.1232:8990/hej/but/1232?stupid=me/../1232 HTTP/1.1\r
-Host: test.remote.haxx.se.1232:8990\r
+GET http://test.remote.haxx.se.%TESTNUMBER:8990/hej/but/%TESTNUMBER?stupid=me/../%TESTNUMBER HTTP/1.1\r
+Host: test.remote.haxx.se.%TESTNUMBER:8990\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://test.remote.haxx.se.1232:8990/hej/but/12320001 HTTP/1.1\r
-Host: test.remote.haxx.se.1232:8990\r
+GET http://test.remote.haxx.se.%TESTNUMBER:8990/hej/but/%TESTNUMBER0001 HTTP/1.1\r
+Host: test.remote.haxx.se.%TESTNUMBER:8990\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
index 1d4d3d561668c6246f49d827382d39b4ffaf3ba0..b5dedca09ad092941a862b3b127954cd7d964d86 100644 (file)
@@ -26,7 +26,7 @@ ftp
 FTP failing to connect to EPSV port, switching to PASV
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1233
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -39,8 +39,8 @@ PWD
 EPSV\r
 PASV\r
 TYPE I\r
-SIZE 1233\r
-RETR 1233\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 577ba51aa7ebb220130d55ac99d62591028ae9de..c20b3b4a3b2a7b5898dd5b46f12df29fe0b4c0f7 100644 (file)
@@ -19,7 +19,7 @@ none
 abusing {}-globbing
  </name>
  <command>
-"%HOSTIP:%NOLISTENPORT/1234[0-1]{" "%HOSTIP:%NOLISTENPORT/{}{}{}{"
+"%HOSTIP:%NOLISTENPORT/%TESTNUMBER[0-1]{" "%HOSTIP:%NOLISTENPORT/{}{}{}{"
 </command>
 </client>
 
index 3fffb42090f96a23686da7d1b14755da20956331..b04958eeb6b63b11b65d37747d025472a2b47953 100644 (file)
@@ -34,54 +34,54 @@ http
 multiple requests using {}{} in the URL
  </name>
  <command>
-"%HOSTIP:%HTTPPORT/{1235,1235}{0001,0002}"
+"%HOSTIP:%HTTPPORT/{%TESTNUMBER,%TESTNUMBER}{0001,0002}"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /12350001 HTTP/1.1\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /12350002 HTTP/1.1\r
+GET /%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /12350001 HTTP/1.1\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /12350002 HTTP/1.1\r
+GET /%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 <stdout>
---_curl_--%HOSTIP:%HTTPPORT/12350001
+--_curl_--%HOSTIP:%HTTPPORT/%TESTNUMBER0001
 HTTP/1.1 200 OK\r
 Funny-head: yesyes\r
 Content-Length: 15\r
 \r
 the number one
---_curl_--%HOSTIP:%HTTPPORT/12350002
+--_curl_--%HOSTIP:%HTTPPORT/%TESTNUMBER0002
 HTTP/1.1 200 OK\r
 Funny-head: yesyes\r
 Content-Length: 16\r
 \r
 two is nice too
---_curl_--%HOSTIP:%HTTPPORT/12350001
+--_curl_--%HOSTIP:%HTTPPORT/%TESTNUMBER0001
 HTTP/1.1 200 OK\r
 Funny-head: yesyes\r
 Content-Length: 15\r
 \r
 the number one
---_curl_--%HOSTIP:%HTTPPORT/12350002
+--_curl_--%HOSTIP:%HTTPPORT/%TESTNUMBER0002
 HTTP/1.1 200 OK\r
 Funny-head: yesyes\r
 Content-Length: 16\r
index a016e5fb6d72c18d026684faac02f44f2c5b2cdc..8e9590e24e5fae0172133530026c06c3ae5a512a 100644 (file)
@@ -27,14 +27,14 @@ http
 URL with 1000+ letter user name + password
  </name>
  <command>
-"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB@%HOSTIP:%HTTPPORT/1237"
+"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB@%HOSTIP:%HTTPPORT/%TESTNUMBER"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1237 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQTpCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkI=\r
 User-Agent: curl/%VERSION\r
index 88c9a5b3ba71f99b4704e60eb70d4ba278fb7a36..606dd1fe47ff58861b870d528d1e8af43763ddc0 100644 (file)
@@ -37,7 +37,7 @@ slow TFTP retrieve cancel due to -Y and -y
  </name>
 # if less than 1000 bytes/sec within 2 seconds, abort!
  <command>
-tftp://%HOSTIP:%TFTPPORT//1238 -Y1000 -y2
+tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER -Y1000 -y2
 </command>
 </client>
 
@@ -50,7 +50,7 @@ mode: octet
 tsize: 0
 blksize: 512
 timeout: 6
-filename: /1238
+filename: /%TESTNUMBER
 </protocol>
 # 28 = CURLE_OPERATION_TIMEDOUT
 <errorcode>
index cf7c40573bd0b1982a2b7a2326307bda732d6ada..1679ce5b32ac28f42dccf7686b6f7670eadd4916 100644 (file)
@@ -34,7 +34,7 @@ http
 HTTP with -z + -w response_code and simulated 304
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1239 -z "-dec 12 12:00:00 1999 GMT" -w '%{response_code}'
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "-dec 12 12:00:00 1999 GMT" -w '%{response_code}'
 </command>
 </client>
 
@@ -42,7 +42,7 @@ http://%HOSTIP:%HTTPPORT/1239 -z "-dec 12 12:00:00 1999 GMT" -w '%{response_code
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1239 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 255d8731f181e2bf209a21a372baa335442055f7..f21c28f05baebb5d041cef978c66d008800b28cd 100644 (file)
@@ -26,7 +26,7 @@ ftp
 FTP download, failed PWD
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/124
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -39,8 +39,8 @@ PWD
 EPSV\r
 PASV\r
 TYPE I\r
-SIZE 124\r
-RETR 124\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 44ce1f69ba0b338733822b1e5516d5e26d5f5fe7..11a7e0f8944cfcf14d494cc57c96bfe19845dfdf 100644 (file)
@@ -25,19 +25,19 @@ http
 glob [0-1] with stuff after range (7.33.0 regression)
  </name>
  <command>
-"%HOSTIP:%HTTPPORT/0[0-1]/1240"
+"%HOSTIP:%HTTPPORT/0[0-1]/%TESTNUMBER"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /00/1240 HTTP/1.1\r
+GET /00/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /01/1240 HTTP/1.1\r
+GET /01/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 0089828f86243a72535d5d9722d84fcc6434c381..952fa2355f02399ee46ac08d53516cc17d7084ac 100644 (file)
@@ -38,7 +38,7 @@ http
 HTTP _without_ dotdot removal
  </name>
  <command>
---path-as-is --proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.1241:8990/../../hej/but/who/../1241?stupid=me/../1241#soo/../1241 http://test.remote.haxx.se.1241:8990/../../hej/but/who/../12410001#/../12410001
+--path-as-is --proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.%TESTNUMBER:8990/../../hej/but/who/../%TESTNUMBER?stupid=me/../%TESTNUMBER#soo/../%TESTNUMBER http://test.remote.haxx.se.%TESTNUMBER:8990/../../hej/but/who/../%TESTNUMBER0001#/../%TESTNUMBER0001
 </command>
 <features>
 proxy
@@ -49,14 +49,14 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://test.remote.haxx.se.1241:8990/../../hej/but/who/../1241?stupid=me/../1241 HTTP/1.1\r
-Host: test.remote.haxx.se.1241:8990\r
+GET http://test.remote.haxx.se.%TESTNUMBER:8990/../../hej/but/who/../%TESTNUMBER?stupid=me/../%TESTNUMBER HTTP/1.1\r
+Host: test.remote.haxx.se.%TESTNUMBER:8990\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://test.remote.haxx.se.1241:8990/../../hej/but/who/../12410001 HTTP/1.1\r
-Host: test.remote.haxx.se.1241:8990\r
+GET http://test.remote.haxx.se.%TESTNUMBER:8990/../../hej/but/who/../%TESTNUMBER0001 HTTP/1.1\r
+Host: test.remote.haxx.se.%TESTNUMBER:8990\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
index 80111eba531a920d939df1be89cc3c5442e0703a..9f573a7568926fbda904f3166e385b7a3d7c8c4d 100644 (file)
@@ -27,7 +27,7 @@ tftp
 TFTP retrieve without TFTP options requests
  </name>
  <command>
-tftp://%HOSTIP:%TFTPPORT//1242 --tftp-no-options
+tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --tftp-no-options
 </command>
 </client>
 
@@ -37,7 +37,7 @@ tftp://%HOSTIP:%TFTPPORT//1242 --tftp-no-options
 <protocol>
 opcode: 1
 mode: octet
-filename: /1242
+filename: /%TESTNUMBER
 </protocol>
 </verify>
 </testcase>
index 8a89af0558a1e72a6a693bf15aedbd3b7541080b..f8b246fe7dcd1501f53f1ce0f7dce2676f134643 100644 (file)
@@ -16,9 +16,9 @@ tftp
 TFTP send without TFTP options requests
  </name>
  <command>
--T log/test1243.txt tftp://%HOSTIP:%TFTPPORT// --tftp-no-options
+-T log/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT// --tftp-no-options
 </command>
-<file name="log/test1243.txt">
+<file name="log/test%TESTNUMBER.txt">
 a chunk of
 data
 sent
@@ -38,7 +38,7 @@ sent
 <protocol>
 opcode: 2
 mode: octet
-filename: /test1243.txt
+filename: /test%TESTNUMBER.txt
 </protocol>
 </verify>
 </testcase>
index c2ac4a4d14e7381fb18664a1a6140cf3a2e6c7bd..fa8ac90753c57237dcbabb77a8bb0d660478e411 100644 (file)
@@ -39,7 +39,7 @@ proxy
 HTTP GET same URL - different proxy ports
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1244 -x %HOSTIP:%HTTPPORT --next http://%HOSTIP:%HTTPPORT/124400001 -x %HOSTIP:%HTTPSPORT
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -x %HOSTIP:%HTTPPORT --next http://%HOSTIP:%HTTPPORT/%TESTNUMBER00001 -x %HOSTIP:%HTTPSPORT
 </command>
 </client>
 
@@ -51,7 +51,7 @@ http://%HOSTIP:%HTTPPORT/1244 -x %HOSTIP:%HTTPPORT --next http://%HOSTIP:%HTTPPO
 56
 </errorcode>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/1244 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 09b3ff7ea3fccb6ed5daa3f3ce09553b505e8c1b..0814e7dc328a476a99b5598ab23090996e724f70 100644 (file)
@@ -18,7 +18,7 @@ HTTP/1.1 301 OK swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
 Content-Length: 0\r
-Location: ftp://%HOSTIP:%FTPPORT/1245\r
+Location: ftp://%HOSTIP:%FTPPORT/%TESTNUMBER\r
 Connection: close\r
 \r
 </data>
@@ -35,7 +35,7 @@ ftp
 --proto deny must override --proto-redir allow
 </name>
 <command>
---location --proto +all,-ftp --proto-redir -all,+ftp http://%HOSTIP:%HTTPPORT/1245
+--location --proto +all,-ftp --proto-redir -all,+ftp http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -43,7 +43,7 @@ ftp
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1245 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index bc3d2b000233699576093a1ca0f2506a8bab88b1..4cb0c3a16e2454a352aa28ff8a3d9a97001e9bbe 100644 (file)
@@ -38,7 +38,7 @@ http
 URL with '#' at end of host name instead of '/'
  </name>
  <command>
---proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.1246:%HTTPPORT#@127.0.0.1/tricked.html no-scheme-url.com.1246:%HTTPPORT#@127.127.127.127/again.html
+--proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.%TESTNUMBER:%HTTPPORT#@127.0.0.1/tricked.html no-scheme-url.com.%TESTNUMBER:%HTTPPORT#@127.127.127.127/again.html
 </command>
 <features>
 proxy
@@ -49,14 +49,14 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://test.remote.haxx.se.1246:%HTTPPORT/ HTTP/1.1\r
-Host: test.remote.haxx.se.1246:%HTTPPORT\r
+GET http://test.remote.haxx.se.%TESTNUMBER:%HTTPPORT/ HTTP/1.1\r
+Host: test.remote.haxx.se.%TESTNUMBER:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://no-scheme-url.com.1246:%HTTPPORT/ HTTP/1.1\r
-Host: no-scheme-url.com.1246:%HTTPPORT\r
+GET http://no-scheme-url.com.%TESTNUMBER:%HTTPPORT/ HTTP/1.1\r
+Host: no-scheme-url.com.%TESTNUMBER:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
index ff127eb57e226b911d49f9fc179b8cf912c8ae5d..02c695cd6d3c19986e9f49f1adaa7add91134ac2 100644 (file)
@@ -23,7 +23,7 @@ http
 --fail-early
  </name>
  <command>
---fail-early h1234://%HOSTIP:%HTTPPORT/1247 http://%HOSTIP:%HTTPPORT/1247
+--fail-early h1234://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
index 0c5a165abd603eeaaa00706f2b819621958069ca..721c03e738036e2b188ff339ca5338c659716647 100644 (file)
@@ -29,14 +29,14 @@ http
 Access a non-proxied host with using the combination of --proxy option and --noproxy option
 </name>
 <command>
-http://user:secret@%HOSTIP:%HTTPPORT/1248 --proxy http://dummy:%NOLISTENPORT/ --noproxy %HOSTIP --max-time 5
+http://user:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy http://dummy:%NOLISTENPORT/ --noproxy %HOSTIP --max-time 5
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1248 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dXNlcjpzZWNyZXQ=\r
 User-Agent: curl/%VERSION\r
index 2ddfd5b3424ce4ae511c00b839dc52776c88d788..cae3e995adba56a553b3c086813bddcb5a9d7c1f 100644 (file)
@@ -32,14 +32,14 @@ Access a non-proxied host with using the combination of --proxy option and NO_PR
 NO_PROXY=%HOSTIP
 </setenv>
 <command>
-http://user:secret@%HOSTIP:%HTTPPORT/1249 --proxy http://dummy:%NOLISTENPORT/ --max-time 5
+http://user:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy http://dummy:%NOLISTENPORT/ --max-time 5
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1249 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dXNlcjpzZWNyZXQ=\r
 User-Agent: curl/%VERSION\r
index 5677aeb47ae724e3922862d6f3be0bca990eccaa..39b2b32ce725d3665ea84221103bdf262f8c7997 100644 (file)
@@ -21,7 +21,7 @@ ftp
 FTP download, failed CWD
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/to/file/125
+ftp://%HOSTIP:%FTPPORT/path/to/file/%TESTNUMBER
 </command>
 </client>
 
index d48e90a9878ad7d49ba68de49e413f7f85c28c8e..4c47cf2b16d284fa151913e2628497739b067648 100644 (file)
@@ -33,14 +33,14 @@ Access a non-proxied host with using the combination of http_proxy env var and -
 http_proxy=http://dummy:%PROXYPORT/
 </setenv>
 <command>
-http://user:secret@%HOSTIP:%HTTPPORT/1250 --noproxy %HOSTIP --max-time 5
+http://user:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER --noproxy %HOSTIP --max-time 5
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1250 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dXNlcjpzZWNyZXQ=\r
 User-Agent: curl/%VERSION\r
index ab2816aba91ce165af2a15c6b8cacc6e107bc5c4..f5db4d3d75968486e9fa7d466a2675456b24f423 100644 (file)
@@ -34,14 +34,14 @@ http_proxy=http://dummy:%PROXYPORT/
 NO_PROXY=%HOSTIP
 </setenv>
 <command>
-http://user:secret@%HOSTIP:%HTTPPORT/1251 --max-time 5
+http://user:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER --max-time 5
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1251 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dXNlcjpzZWNyZXQ=\r
 User-Agent: curl/%VERSION\r
index c5f5f5b173c625259d9e726b93f6dca42c87f9d5..13fe3b3d9ed4fcd72974e166606ddf3e4f2fec0a 100644 (file)
@@ -33,14 +33,14 @@ Under condition using --proxy, override NO_PROXY by --nproxy and access target U
 NO_PROXY=example.com
 </setenv>
 <command>
-http://%HOSTIP:%HTTPPORT/1252 --proxy http://%HOSTIP:%HTTPPORT --noproxy %HOSTIP
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --noproxy %HOSTIP
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1252 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index bb41966abe51ce2a0d3e544cd1f961f01ac91867..96f0a2d20fb5adfa9e00f6e107e1005055d2de49 100644 (file)
@@ -33,7 +33,7 @@ Under condition using --proxy, override NO_PROXY by --nproxy and access target U
 NO_PROXY=example.com
 </setenv>
 <command>
-http://somewhere.example.com/1253 --proxy http://%HOSTIP:%HTTPPORT --noproxy %HOSTIP
+http://somewhere.example.com/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --noproxy %HOSTIP
 </command>
 <features>
 proxy
@@ -43,7 +43,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://somewhere.example.com/1253 HTTP/1.1\r
+GET http://somewhere.example.com/%TESTNUMBER HTTP/1.1\r
 Host: somewhere.example.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 20ba6068423becb597d89665ddae0968faaea699..a39cbd26e05c49631e742b4bc7c2af3b3a079f9d 100644 (file)
@@ -33,7 +33,7 @@ Under condition using --proxy, override NO_PROXY by --nproxy and access target U
 NO_PROXY=example.com
 </setenv>
 <command>
-http://somewhere.example.com/1254 --proxy http://%HOSTIP:%HTTPPORT --noproxy ""
+http://somewhere.example.com/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --noproxy ""
 </command>
 <features>
 proxy
@@ -43,7 +43,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://somewhere.example.com/1254 HTTP/1.1\r
+GET http://somewhere.example.com/%TESTNUMBER HTTP/1.1\r
 Host: somewhere.example.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index a5119d97055e277f1c1fa58116387a058179b738..7c1fa2438374dcfa93c87e6fe62d8834a7200093 100644 (file)
@@ -34,14 +34,14 @@ http_proxy=http://%HOSTIP:%HTTPPORT
 NO_PROXY=example.com
 </setenv>
 <command>
-http://%HOSTIP:%HTTPPORT/1255 --noproxy %HOSTIP
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --noproxy %HOSTIP
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1255 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 8bbd02c6638a6fd7ecb9fda30356d5d532e15738..f9f0fdc77b2882acc73d57a943269c112dfa5aba 100644 (file)
@@ -34,7 +34,7 @@ http_proxy=http://%HOSTIP:%HTTPPORT
 NO_PROXY=example.com
 </setenv>
 <command>
-http://somewhere.example.com/1256 --noproxy %HOSTIP
+http://somewhere.example.com/%TESTNUMBER --noproxy %HOSTIP
 </command>
 <features>
 proxy
@@ -44,7 +44,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://somewhere.example.com/1256 HTTP/1.1\r
+GET http://somewhere.example.com/%TESTNUMBER HTTP/1.1\r
 Host: somewhere.example.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 47822d3030b9addf0e0666c010e94880dbd34777..82c61ee74bb0b6b937421a4896e70ba15575dc69 100644 (file)
@@ -34,7 +34,7 @@ http_proxy=http://%HOSTIP:%HTTPPORT
 NO_PROXY=example.com
 </setenv>
 <command>
-http://somewhere.example.com/1257 --noproxy ""
+http://somewhere.example.com/%TESTNUMBER --noproxy ""
 </command>
 <features>
 proxy
@@ -44,7 +44,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://somewhere.example.com/1257 HTTP/1.1\r
+GET http://somewhere.example.com/%TESTNUMBER HTTP/1.1\r
 Host: somewhere.example.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 233e72b9c1b485eac4b6838a09231a542635a403..a4cef156c9d2d7f337903a161aa2a0027c3e2a09 100644 (file)
@@ -30,14 +30,14 @@ http
 HTTP, use cookies with localhost
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/1258 http://%HOSTIP:%HTTPPORT/we/want?hoge=fuga -b non-existing -H "Host: localhost"
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want?hoge=fuga -b non-existing -H "Host: localhost"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/1258 HTTP/1.1\r
+GET /we/want/%TESTNUMBER HTTP/1.1\r
 Host: localhost\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 96635074504947516aec8c4317c4abf5503f4d12..4e0c6d495fdc6dd1911cd40538f663e95c791c1e 100644 (file)
@@ -27,14 +27,14 @@ http
 HTTP URL with semicolon in password
  </name>
  <command>
-"http://user:pass;word@%HOSTIP:%HTTPPORT/we/want/1259"
+"http://user:pass;word@%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/1259 HTTP/1.1\r
+GET /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dXNlcjpwYXNzO3dvcmQ=\r
 User-Agent: curl/%VERSION\r
index 0872214af843ed81ef684a8feb4b4d723090916a..f1b252734307e69f433bbb379b8b92d3f7c7f8a6 100644 (file)
@@ -26,7 +26,7 @@ ftp
 FTP download with multiple replies at once in RETR
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/blalbla/lululul/126
+ftp://%HOSTIP:%FTPPORT/blalbla/lululul/%TESTNUMBER
 </command>
 </client>
 
@@ -40,8 +40,8 @@ CWD blalbla
 CWD lululul\r
 EPSV\r
 TYPE I\r
-SIZE 126\r
-RETR 126\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index b246882cb8f6d85dea2b570399ddb2dc5689cf0d..cff79e29882db43921b146f5e7c2c43a0fd20ccd 100644 (file)
@@ -22,7 +22,7 @@ http
 HTTP URL with rubbish after port number
  </name>
  <command>
--g "http://[%HOSTIP]:%NOLISTENPORT:80/we/want/1260" "http://%HOSTIP:%NOLISTENPORT:80/we/want/1260" "http://user@example.com:80@localhost"
+-g "http://[%HOSTIP]:%NOLISTENPORT:80/we/want/%TESTNUMBER" "http://%HOSTIP:%NOLISTENPORT:80/we/want/%TESTNUMBER" "http://user@example.com:80@localhost"
 </command>
 </client>
 
index ef3cded578d1d83f5acf436b1c99337a28393d9a..e60c9cca9de92a38f15db2a901af96a96f1ef2ed 100644 (file)
@@ -30,14 +30,14 @@ http
 'redirect_url' with --location and --max-redir
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/our/1261 -w '%{redirect_url}\n' --location --max-redir 0
+http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url}\n' --location --max-redir 0
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/our/1261 HTTP/1.1\r
+GET /we/want/our/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index ed526c099774fef0b269602de15beebee2c8daee..63abe8b8f084c0ce6d3f4ab288409f3c93d5f92a 100644 (file)
@@ -23,7 +23,7 @@ ftp
 FTP request and denied to download an older file with -z
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/blalbla/1262 -z "-1 jan 2001"
+ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -z "-1 jan 2001"
 </command>
 </client>
 
@@ -33,7 +33,7 @@ USER anonymous
 PASS ftp@example.com\r
 PWD\r
 CWD blalbla\r
-MDTM 1262\r
+MDTM %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 88b13775eb01dfba7161e0f651f35ac0ce2162a4..ef42f20e0231569baa237ea5ea91506fcd460cc9 100644 (file)
@@ -23,7 +23,7 @@ http
 HTTP URL with rubbish after IPv6 bracket
  </name>
  <command>
--g "http://[%HOSTIP]test:%NOLISTENPORT/we/want/1263" "http://[%HOSTIP][%HOSTIP]:%NOLISTENPORT/we/want/1263" "http://user@[::1]@localhost"
+-g "http://[%HOSTIP]test:%NOLISTENPORT/we/want/%TESTNUMBER" "http://[%HOSTIP][%HOSTIP]:%NOLISTENPORT/we/want/%TESTNUMBER" "http://user@[::1]@localhost"
 </command>
 </client>
 
index 272db736cd1a2bd3383db0ccac94860de500a739..54fb6ffa304e1c5c4f5301309f3e89c68cca4fca 100644 (file)
@@ -22,7 +22,7 @@ http
 HTTP URL with space in host name
  </name>
  <command>
--g "http://127.0.0.1 www.example.com/we/want/1264"
+-g "http://127.0.0.1 www.example.com/we/want/%TESTNUMBER"
 </command>
 </client>
 
index 5a7118c84f7986079f56ba4a089e0fb9cd677e7e..b18f2db7480a8b8e68a18af70b0bb6109fd9c6ec 100644 (file)
@@ -34,14 +34,14 @@ http_proxy=http://%HOSTIP:%HTTPPORT
 NO_PROXY=::1
 </setenv>
 <command>
-http://%HOST6IP:%HTTP6PORT/1265
+http://%HOST6IP:%HTTP6PORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1265 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOST6IP:%HTTP6PORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 1de936e03279b135c1417c6e59d147d00f88becb..c5c8ba37dc94f1f8737aa415aed8f254a15848f8 100644 (file)
@@ -26,7 +26,7 @@ http
 HTTP GET with a single-byte HTTP/0.9 response
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1266 --http0.9
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http0.9
 </command>
 </client>
 
@@ -34,7 +34,7 @@ http://%HOSTIP:%HTTPPORT/1266 --http0.9
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1266 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 06500e87b3435491b66a0cf749ac31ff7ecde99c..7ca6dde8084714e19dec2e319e3ec6965c1b58b8 100644 (file)
@@ -26,7 +26,7 @@ http
 HTTP GET with a invalid HTTP/1 response line start
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1267 --http0.9
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http0.9
 </command>
 </client>
 
@@ -34,7 +34,7 @@ http://%HOSTIP:%HTTPPORT/1267 --http0.9
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1267 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index c5fe5f7493fb7cbf79b0b02a702a134c274fd752..562f376a33fd8f8b9e2bc74a40749b4c9471f11c 100644 (file)
@@ -23,12 +23,12 @@ unix-sockets
 file name argument looks like a flag
  </name>
  <command>
---stderr log/moo1268 --unix-socket -k hej://moo
+--stderr log/moo%TESTNUMBER --unix-socket -k hej://moo
 </command>
 </client>
 
 <verify>
-<file name="log/moo1268" mode="text">
+<file name="log/moo%TESTNUMBER" mode="text">
 Warning: The file name argument '-k' looks like a flag.
 curl: (1) Protocol "hej" not supported or disabled in libcurl
 </file>
index 7cf86cab3cee04ae56748fdcbb335b8466e16a6f..f68cf9c09bda5f205953c1efdc7861ff8431d4b2 100644 (file)
@@ -20,7 +20,7 @@ none
 too large --retry-delay value
  </name>
  <command>
---retry 3 --retry-delay 9223372036854776 http://%HOSTIP:%NOLISTENPORT/1269
+--retry 3 --retry-delay 9223372036854776 http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER
 </command>
 </client>
 
index ac46d8d00856b0fa4b1225a23d631de45f176fee..0b0f4f5983eea847e7d1dd69ec1488406436bcda 100644 (file)
@@ -23,7 +23,7 @@ ftp
 FTP --disable-epsv
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/to/file/127 --disable-epsv
+ftp://%HOSTIP:%FTPPORT/path/to/file/%TESTNUMBER --disable-epsv
 </command>
 </client>
 
@@ -38,8 +38,8 @@ CWD to
 CWD file\r
 PASV\r
 TYPE I\r
-SIZE 127\r
-RETR 127\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 680e1e47c66f1a20306926b4eb6400d01aa919bb..0c289d0cffdc66e171a5ef1af355e592570bebca 100644 (file)
@@ -35,14 +35,14 @@ http
 Basic 'redirect_url'
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/our/1270 -w '%{redirect_url}\n' -s
+http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url}\n' -s
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/our/1270 HTTP/1.1\r
+GET /we/want/our/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index ce89c38f2fbb5ab1f85a20a9695ba2647e5ffe83..184fd87f135583dc37a047a8f7f9baafa92fe5d6 100644 (file)
@@ -27,16 +27,16 @@ http
 --write-out from file with empty file
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/our/1271 -w @log/blank1271
+http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w @log/blank%TESTNUMBER
 </command>
-<file name="log/blank1271">
+<file name="log/blank%TESTNUMBER">
 </file>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/our/1271 HTTP/1.1\r
+GET /we/want/our/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index fb2da2e324578af47bae80d7e143f113401e5b4f..fc1baea10020801a8ce989e223c78d032154cfac 100644 (file)
@@ -26,7 +26,7 @@ gophers
 Gophers index
  </name>
  <command>
--k gophers://%HOSTIP:%GOPHERSPORT/1/1272
+-k gophers://%HOSTIP:%GOPHERSPORT/1/%TESTNUMBER
 </command>
 </client>
 
@@ -34,7 +34,7 @@ Gophers index
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-/1272\r
+/%TESTNUMBER\r
 </protocol>
 </verify>
 </testcase>
index 743cd126ffe1db0af90ed5c1e92033d4945a8347..c9429c5fe0e62965a07de8cbfa7f2037645af9a8 100644 (file)
@@ -20,9 +20,9 @@ ftp
 FTP upload with --crlf
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/128 -T log/upload128 --crlf
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER --crlf
 </command>
-<file name="log/upload128">
+<file name="log/upload%TESTNUMBER">
 file
 with unix newlines
 meant to be
@@ -41,7 +41,7 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-STOR 128\r
+STOR %TESTNUMBER\r
 QUIT\r
 </protocol>
 <upload>
index 59e3968b09b84659d1b9c06a8bd8c03447da04ad..3744dc810633f1fc4b40a1ba1aa1147ad634353b 100644 (file)
@@ -27,29 +27,29 @@ http
 simple [a-d] globbing
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/[a-d]/1280
+http://%HOSTIP:%HTTPPORT/[a-d]/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /a/1280 HTTP/1.1\r
+GET /a/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /b/1280 HTTP/1.1\r
+GET /b/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /c/1280 HTTP/1.1\r
+GET /c/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /d/1280 HTTP/1.1\r
+GET /d/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 661b3c8519d166e2281427b28aeeb07ac3d2219a..f6781d4604f675a6a8c0165071e7a6a367188ef4 100644 (file)
@@ -24,7 +24,7 @@ http
 reject non-numerical port number in URL
  </name>
  <command>
-http://%HOSTIP:alpha/beta/1281
+http://%HOSTIP:alpha/beta/%TESTNUMBER
 </command>
 </client>
 
index 197356c6be8d6d9d8be515874aa89dd3a8501588..76e7a000e3269d28198feaeaf1003920f3d07ebf 100644 (file)
@@ -25,7 +25,7 @@ GSS-API
 FTP with 633 response before gss initialized
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1282
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 
 </client>
index 65284ca664fb2fd176db698c7ed035bcbaa77717..df0458cc54e183b0b12fc08f15ff990dbbb20d48 100644 (file)
@@ -30,20 +30,20 @@ http
 globbing range with same start and stop
 </name>
 <command option="no-output">
-http://%HOSTIP:%HTTPPORT/[a-a][1-1][b-b:1][2-2:1]/1283 -o "log/outfile1283_#1#2#3#4.dump"
+http://%HOSTIP:%HTTPPORT/[a-a][1-1][b-b:1][2-2:1]/%TESTNUMBER -o "log/outfile%TESTNUMBER_#1#2#3#4.dump"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /a1b2/1283 HTTP/1.1\r
+GET /a1b2/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file name="log/outfile1283_a1b2.dump">
+<file name="log/outfile%TESTNUMBER_a1b2.dump">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Content-Length: 6\r
index 4509a9b91397360ee8d6536f70491b8890acef4e..dd2d8b8b7ceb565f9dfb0f80f9291abd06118f5a 100644 (file)
@@ -60,23 +60,23 @@ HTTP POST --digest with user-specified Content-Length header
 # even when there is a user-specified Content-Length header.
 # https://github.com/curl/curl/pull/1242
 <command>
--H "Content-Length: 11" -u auser:apasswd --digest -d "junkelijunk" http://%HOSTIP:%HTTPPORT/1284
+-H "Content-Length: 11" -u auser:apasswd --digest -d "junkelijunk" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /1284 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-POST /1284 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1284", response="5763079608de439072861a59ac733515"\r
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="5763079608de439072861a59ac733515"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 11\r
index 62828ba4f719ddb9f2cd9c364a657b482f566959..e5a38e071dbd31ce99f0edd13ac9128ec15d5375 100644 (file)
@@ -60,9 +60,9 @@ HTTP PUT --digest with user-specified Content-Length header
 # even when there is a user-specified Content-Length header.
 # https://github.com/curl/curl/pull/1242
 <command>
--H "Content-Length: 85" -u auser:apasswd --digest -T log/put1285 http://%HOSTIP:%HTTPPORT/1285
+-H "Content-Length: 85" -u auser:apasswd --digest -T log/put%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
-<file name="log/put1285">
+<file name="log/put%TESTNUMBER">
 This is data we upload with PUT
 a second line
 line three
@@ -73,15 +73,15 @@ four is the number of lines
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /1285 HTTP/1.1\r
+PUT /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 0\r
 \r
-PUT /1285 HTTP/1.1\r
+PUT /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1285", response="dc185587d5e8391b347eef194c2a3cd6"\r
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="dc185587d5e8391b347eef194c2a3cd6"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 85\r
index c64a79b47a8808494e38614757b0efa576c79be9..df0f35fc5a1b8e0d6f648965ae956ac5a8ee0260 100644 (file)
@@ -22,7 +22,7 @@ Content-Length: 0
 HTTP/1.1 302 Thanks for this, but we want to redir you!\r
 Server: Microsoft-IIS/5.0\r
 Content-Type: text/html; charset=iso-8859-1\r
-Location: /12860001\r
+Location: /%TESTNUMBER0001\r
 Content-Length: 0\r
 \r
 </data1000>
@@ -44,7 +44,7 @@ Content-Length: 0
 HTTP/1.1 302 Thanks for this, but we want to redir you!\r
 Server: Microsoft-IIS/5.0\r
 Content-Type: text/html; charset=iso-8859-1\r
-Location: /12860001\r
+Location: /%TESTNUMBER0001\r
 Content-Length: 0\r
 \r
 HTTP/1.1 404 Not Found\r
@@ -71,7 +71,7 @@ HTTP GET --digest increasing nonce-count
 # This test is to ensure the nonce-count (nc) increases
 # https://github.com/curl/curl/pull/1251
 <command>
--u auser:apasswd --location --digest http://%HOSTIP:%HTTPPORT/1286
+-u auser:apasswd --location --digest http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -89,20 +89,20 @@ HTTP GET --digest increasing nonce-count
 if(s/^(Authorization: Digest )([^\r\n]+)(\r?\n)$//) { $_ = $1 . join(', ', map { s/^(cnonce=)"[a-zA-Z0-9+\/=]+"$/$1REMOVED/; s/^(response=)"[a-f0-9]{32}"$/$1REMOVED/; s/^qop="auth"$/qop=auth/; $_ } sort split(/, */, $2)) . $3; }
 </strippart>
 <protocol>
-GET /1286 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /1286 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest cnonce=REMOVED, nc=00000001, nonce="1053604144", qop=auth, realm="testrealm", response=REMOVED, uri="/1286", username="auser"\r
+Authorization: Digest cnonce=REMOVED, nc=00000001, nonce="1053604144", qop=auth, realm="testrealm", response=REMOVED, uri="/%TESTNUMBER", username="auser"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /12860001 HTTP/1.1\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest cnonce=REMOVED, nc=00000002, nonce="1053604144", qop=auth, realm="testrealm", response=REMOVED, uri="/12860001", username="auser"\r
+Authorization: Digest cnonce=REMOVED, nc=00000002, nonce="1053604144", qop=auth, realm="testrealm", response=REMOVED, uri="/%TESTNUMBER0001", username="auser"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index ef4c25e83f8b1c8ebc9d8849cbd9dbec17e7951e..5493e7dc03453d217e16006310f2f528aeb692df 100644 (file)
@@ -58,7 +58,7 @@ http-proxy
 HTTP over proxy-tunnel ignore TE and CL in CONNECT 2xx responses
 </name>
 <command>
--v --proxytunnel -x %HOSTIP:%PROXYPORT http://test.1287:%HTTPPORT/we/want/that/page/1287
+-v --proxytunnel -x %HOSTIP:%PROXYPORT http://test.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER
 </command>
 <features>
 proxy
@@ -69,20 +69,20 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT test.1287:%HTTPPORT HTTP/1.1\r
-Host: test.1287:%HTTPPORT\r
+CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
+Host: test.%TESTNUMBER:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>
-GET /we/want/that/page/1287 HTTP/1.1\r
-Host: test.1287:%HTTPPORT\r
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1\r
+Host: test.%TESTNUMBER:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file name="log/stderr1287" mode="text">
+<file name="log/stderr%TESTNUMBER" mode="text">
 * Ignoring Content-Length in CONNECT 200 response
 * Ignoring Transfer-Encoding in CONNECT 200 response
 </file>
index c0c7576c157fe5fa36a2b5627388d8fbcd1280cd..583fc42f32fca761abfc2823b045c0b265a13aea 100644 (file)
@@ -42,7 +42,7 @@ http-proxy
 Suppress proxy CONNECT response headers
 </name>
 <command>
---proxytunnel --suppress-connect-headers --dump-header - --include --write-out "\nCONNECT CODE: %{http_connect}\nRECEIVED HEADER BYTE TOTAL: %{size_header}\n" --proxy %HOSTIP:%PROXYPORT http://%HOSTIP.1288:%HTTPPORT/we/want/that/page/1288
+--proxytunnel --suppress-connect-headers --dump-header - --include --write-out "\nCONNECT CODE: %{http_connect}\nRECEIVED HEADER BYTE TOTAL: %{size_header}\n" --proxy %HOSTIP:%PROXYPORT http://%HOSTIP.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER
 </command>
 <features>
 proxy
@@ -53,15 +53,15 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT %HOSTIP.1288:%HTTPPORT HTTP/1.1\r
-Host: %HOSTIP.1288:%HTTPPORT\r
+CONNECT %HOSTIP.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
+Host: %HOSTIP.%TESTNUMBER:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>
-GET /we/want/that/page/1288 HTTP/1.1\r
-Host: %HOSTIP.1288:%HTTPPORT\r
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1\r
+Host: %HOSTIP.%TESTNUMBER:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index 6fe4ad9c5e3e9d353ca02fe9f4d1eb7fb2a13f69..6da58be2d42b7ac9dc8fcbda250c0e5ccde30771 100644 (file)
@@ -35,7 +35,7 @@ http
 HTTP/1.2 is rejected
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/129
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -43,7 +43,7 @@ http://%HOSTIP:%HTTPPORT/129
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /129 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 871dcd763c825703b94a6a333d2975284b63550d..959247863ec732708518feb6f82ac9e2df50c367 100644 (file)
@@ -29,14 +29,14 @@ http
 Verify URL globbing ignores []
 </name>
 <command>
-"http://%HOSTIP:%HTTPPORT/we/want/[]/page/1290"
+"http://%HOSTIP:%HTTPPORT/we/want/[]/page/%TESTNUMBER"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/[]/page/1290 HTTP/1.1\r
+GET /we/want/[]/page/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index a2e505fc9f91b3ceb879cff2f0fd5852f31e28df..5997dcc3ba4b431d4db199c120bc5b3813b88fb8 100644 (file)
@@ -24,14 +24,14 @@ none
 Attempt to upload 1000 files but fail immediately
 </name>
 <command>
--K log/cmd1291 --fail-early
+-K log/cmd%TESTNUMBER --fail-early
 </command>
 <file name="log/upload-this">
 XXXXXXXx
 </file>
 # generate the config file
 <precheck>
-perl -e 'for(1 .. 1000) { printf("upload-file=log/upload-this\nurl=htttttp://non-existing-host.haxx.se/upload/1291\n", $_);}' > log/cmd1291;
+perl -e 'for(1 .. 1000) { printf("upload-file=log/upload-this\nurl=htttttp://non-existing-host.haxx.se/upload/%TESTNUMBER\n", $_);}' > log/cmd%TESTNUMBER;
 </precheck>
 </client>
 
index 7910d6d1abd8c4bbe7940f4000e579e719eddf04..8b8806e413be11ad22059bd8674fa398ad15c2cc 100644 (file)
@@ -30,7 +30,7 @@ http
 Replaced internal headers with a blank one
  </name>
  <command>
- -H "Host;" -H "Accept;" http://%HOSTIP:%HTTPPORT/1292
+ -H "Host;" -H "Accept;" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -38,7 +38,7 @@ Replaced internal headers with a blank one
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1292 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host:\r
 User-Agent: curl/%VERSION\r
 Accept:\r
index 557920f4109ac025deca6c0de08cb109e98f72f4..82488619471de7b3f47202122c155a18ba95dbdc 100644 (file)
@@ -36,7 +36,7 @@ http
 Multipart formpost to two URLs, the first failing
  </name>
  <command>
-http://0 http://%HOSTIP:%HTTPPORT/1293 -F=
+http://0 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -F=
 </command>
 </client>
 
@@ -48,7 +48,7 @@ s/^--------------------------[a-z0-9]*/------------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
 </strippart>
 <protocol>
-POST /1293 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 201562404a18904c403c8fc4ffd91f1f6aaf8d5a..7f2a37797097f63aa8461c039647cddcc4ac6afd 100644 (file)
@@ -44,7 +44,7 @@ HTTP GET with split initial request send
 CURL_SMALLREQSEND=128
 </setenv>
 <command>
-http://%HOSTIP:%HTTPPORT/012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679/1294 -H "Among other public buildings in a certain town, which for many reasons it will be prudent to refrain from mentioning, and to which I will assign no fictitious name, there is one anciently common to most towns, great or small to wit, a workhouse; and in this workhouse was born; on a day and date which I need not trouble myself to repeat, inasmuch as it can be of no possible consequence to the reader, in this stage of the business at all events; the item of mortality whose name is prefixed to the head of this chapter: 511"
+http://%HOSTIP:%HTTPPORT/012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679/%TESTNUMBER -H "Among other public buildings in a certain town, which for many reasons it will be prudent to refrain from mentioning, and to which I will assign no fictitious name, there is one anciently common to most towns, great or small to wit, a workhouse; and in this workhouse was born; on a day and date which I need not trouble myself to repeat, inasmuch as it can be of no possible consequence to the reader, in this stage of the business at all events; the item of mortality whose name is prefixed to the head of this chapter: 511"
 </command>
 </client>
 
@@ -52,7 +52,7 @@ http://%HOSTIP:%HTTPPORT/0123456790123456790123456790123456790123456790123456790
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679/1294 HTTP/1.1\r
+GET /012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index dc6abeb0da1c80f831343cf3eac3ba75048265da..e3692f5d67293febcff6b0ae2c69e0822b705481 100644 (file)
@@ -44,7 +44,7 @@ HTTP POST with split initial request send
 CURL_SMALLREQSEND=100
 </setenv>
 <command>
-http://%HOSTIP:%HTTPPORT/012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679/1295 -H "012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679: 300" -d "Mr. Sherlock Holmes, who was usually very late in the mornings, save upon those not infrequent occasions when he was up all night, was seated at the breakfast table." -w '%{size_upload}\n'
+http://%HOSTIP:%HTTPPORT/012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679/%TESTNUMBER -H "012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679: 300" -d "Mr. Sherlock Holmes, who was usually very late in the mornings, save upon those not infrequent occasions when he was up all night, was seated at the breakfast table." -w '%{size_upload}\n'
 </command>
 </client>
 
@@ -52,7 +52,7 @@ http://%HOSTIP:%HTTPPORT/0123456790123456790123456790123456790123456790123456790
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679/1295 HTTP/1.1\r
+POST /012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 040c018144a0097c40b1f471afe32ed8427626ce..20dc265701c0fcda93f5f34af68034d5cc124892 100644 (file)
@@ -35,14 +35,14 @@ HTTP URL with %0a in name part
 </name>
 
 <command>
-http://user%0aname:password@%HOSTIP:%HTTPPORT/1296
+http://user%0aname:password@%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1296 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dXNlcgpuYW1lOnBhc3N3b3Jk\r
 User-Agent: curl/%VERSION\r
index 6cffff85dd48b54c7c4f4f895c501e7f880366a4..f4103622388294883ae59ddacd0d47d8a0991e53 100644 (file)
@@ -33,7 +33,7 @@ http-proxy
 CONNECT to peer that returns nothing
 </name>
 <command>
---proxytunnel --proxy %HOSTIP:%PROXYPORT http://%HOSTIP.1297:%HTTPPORT/we/want/that/page/1297
+--proxytunnel --proxy %HOSTIP:%PROXYPORT http://%HOSTIP.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER
 </command>
 <features>
 proxy
@@ -44,15 +44,15 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT %HOSTIP.1297:%HTTPPORT HTTP/1.1\r
-Host: %HOSTIP.1297:%HTTPPORT\r
+CONNECT %HOSTIP.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
+Host: %HOSTIP.%TESTNUMBER:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>
-GET /we/want/that/page/1297 HTTP/1.1\r
-Host: %HOSTIP.1297:%HTTPPORT\r
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1\r
+Host: %HOSTIP.%TESTNUMBER:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index a9ed01049cfc884287f71dc59d1e8cc293562101..2afefac5d36bde0acc6ee01c5c8869859e0cfbe9 100644 (file)
@@ -35,7 +35,7 @@ http
 HTTP GET special path with --request-target
  </name>
  <command>
---request-target "XXX" "http://%HOSTIP:%HTTPPORT/" -H "Testno: 1298"
+--request-target "XXX" "http://%HOSTIP:%HTTPPORT/" -H "Testno: %TESTNUMBER"
 </command>
 </client>
 
@@ -47,7 +47,7 @@ GET XXX HTTP/1.1
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
-Testno: 1298\r
+Testno: %TESTNUMBER\r
 \r
 </protocol>
 </verify>
index bfb8e5d0dbca0b4a743cf5cf491a2d592233018b..7f3e80e0c7f955c33e04238e49d2ecf9270466aa 100644 (file)
@@ -34,7 +34,7 @@ http
 Send "OPTIONS *" with --request-target
  </name>
  <command>
---request-target '*' -X OPTIONS http://%HOSTIP:%HTTPPORT/ -H "Testno: 1299"
+--request-target '*' -X OPTIONS http://%HOSTIP:%HTTPPORT/ -H "Testno: %TESTNUMBER"
 </command>
 </client>
 
@@ -46,7 +46,7 @@ OPTIONS * HTTP/1.1
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
-Testno: 1299\r
+Testno: %TESTNUMBER\r
 \r
 </protocol>
 </verify>
index 1216979475bd90d9df111045fcb91c2ebc7969e4..72dd191007d498e57ded145f1ee1d3b834e8e4e8 100644 (file)
@@ -25,14 +25,14 @@ http
 HTTP custom request 'DELETE'
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/13 -X DELETE
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -X DELETE
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-DELETE /want/13 HTTP/1.1\r
+DELETE /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 85892f1ee568cfe004531371f2348c56e7fab53e..31447cbbe3a42750576defb5119a45e42f21255b 100644 (file)
@@ -37,9 +37,9 @@ ftp
 FTP (optional .netrc; no user/pass) dir list PASV
  </name>
  <command>
---netrc-optional --netrc-file log/netrc130 ftp://%HOSTIP:%FTPPORT/
+--netrc-optional --netrc-file log/netrc%TESTNUMBER ftp://%HOSTIP:%FTPPORT/
 </command>
-<file name="log/netrc130" >
+<file name="log/netrc%TESTNUMBER" >
 # the following two lines were created while testing curl
 # machine %HOSTIP login user1 password commented
 machine %HOSTIP login user1 password passwd1
index b402bfc8bec05454d562c85dfc5bf62f6cbb16d7..699a2e43f5bddb12c0e17944327e4338ab5adeff 100644 (file)
@@ -18,7 +18,7 @@ unittest
  <name>
 netrc parsing unit tests
  </name>
-<file name="log/netrc1304">
+<file name="log/netrc%TESTNUMBER">
 machine example.com login admin password passwd
 machine curl.example.com login none password none
 </file>
index 52efbcbb0124ac2dfbd2907adc6a56f374515b93..7d14aa8491ce4e10fc78052bdf3a565a244800f7 100644 (file)
@@ -20,7 +20,7 @@ unittest
 internal hash create/destroy testing
  </name>
 <command>
-1305
+%TESTNUMBER
 </command>
 </client>
 </testcase>
index b490efb51bab704ba4568a2dcaa46be973e0ce7d..7ed450324d3e90dd1aa89d421ed06aa86c4b0e7d 100644 (file)
@@ -23,7 +23,7 @@ internal hash create/add/destroy testing
 unit1305
 </tool>
 <command>
-1306
+%TESTNUMBER
 </command>
 </client>
 
index 3755ef8b41f232fb262f7c4bf482bad1d8f8e62d..0c7d1b02df831b652001c3820022c975c473ad8d 100644 (file)
@@ -20,7 +20,7 @@ http
  <name>
 formpost unit tests
  </name>
-<file name="log/test-1308">
+<file name="log/test-%TESTNUMBER">
 Piece of the file that is to uploaded as a formpost
 </file>
 </client>
index 6e99d8a86f2007345de6b9d05d7ac9b6831abb5a..63bd021945e77355546e146c5970755d2b3e3985 100644 (file)
@@ -38,9 +38,9 @@ ftp
 FTP (optional .netrc; user/no pass) dir list PASV
  </name>
  <command>
---netrc-optional --netrc-file log/netrc131 ftp://user2@%HOSTIP:%FTPPORT/
+--netrc-optional --netrc-file log/netrc%TESTNUMBER ftp://user2@%HOSTIP:%FTPPORT/
 </command>
-<file name="log/netrc131" >
+<file name="log/netrc%TESTNUMBER" >
 # the following two lines were created while testing curl
 machine %HOSTIP login user1 password passwd1
 machine %HOSTIP login user2 password passwd2
index cb9db82814bc7b6280e544bfbbe6aab73b2b8191..11dcfef0cd90174d529899ae47cd722110b2fd94 100644 (file)
@@ -74,10 +74,10 @@ CURL_NTLM_WB_FILE=%PWD/server/fake_ntlm
 # set source directory so fake_ntlm can find the test files
 CURL_NTLM_AUTH_SRCDIR=%SRCDIR
 # set the test number
-CURL_NTLM_AUTH_TESTNUM=1310
+CURL_NTLM_AUTH_TESTNUM=%TESTNUMBER
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/1310 -u testuser:anypasswd --ntlm-wb
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:anypasswd --ntlm-wb
 </command>
 <precheck>
 chkhostname curlhost
@@ -87,13 +87,13 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1310 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAwAAAA\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /1310 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAE8AAAAYABgAZwAAAAAAAABAAAAACAAIAEAAAAAHAAcASAAAAAAAAAAAAAAAggEAAHRlc3R1c2VyVU5LTk9XTlpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOQ==\r
 User-Agent: curl/%VERSION\r
index 874b01e13547200ee4d5a45a788089244376fff8..6d5496f0c4328c15457224f54f88fcd091fda80f 100644 (file)
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1311; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 12345
 </data>
@@ -40,7 +40,7 @@ HTTP GET with -J and Content-Disposition
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1311 -J -O
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O
 </command>
 </client>
 
@@ -48,13 +48,13 @@ http://%HOSTIP:%HTTPPORT/1311 -J -O
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1311 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file name="log/name1311">
+<file name="log/name%TESTNUMBER">
 12345
 </file>
 
index bff2068b07e95b2fe7a9439861d2f334b71ad62d..2d48914580a201ecdd1a881fe95f83e314a5ab22 100644 (file)
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: inline; filename="name1312;weird"
+Content-Disposition: inline; filename="name%TESTNUMBER;weird"
 
 12345
 </data>
@@ -40,7 +40,7 @@ HTTP GET with -J, Content-Disposition and ; in filename
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-%HOSTIP:%HTTPPORT/1312 -J -O
+%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O
 </command>
 </client>
 
@@ -48,13 +48,13 @@ CURL_TESTDIR=%PWD/log
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1312 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file name="log/name1312;weird">
+<file name="log/name%TESTNUMBER;weird">
 12345
 </file>
 
index 7781b46ecfa32508b2c36a73156328f41e2e7dce..b1ac1fcea151c53edbd74583fa3842ec2190eee4 100644 (file)
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: inline; filename='name1313
+Content-Disposition: inline; filename='name%TESTNUMBER
 
 12345
 </data>
@@ -40,7 +40,7 @@ HTTP GET with -J, Content-Disposition, uneven quotes
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1313 -J -O
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O
 </command>
 </client>
 
@@ -48,13 +48,13 @@ http://%HOSTIP:%HTTPPORT/1313 -J -O
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1313 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file name="log/name1313">
+<file name="log/name%TESTNUMBER">
 12345
 </file>
 
index 55e3299e461bf0cf3e3e3e04637d7bbcab24c2e0..343a1c2407dd8dea228f890789d26d0e03168c60 100644 (file)
@@ -13,7 +13,7 @@ followlocation
 <data>
 HTTP/1.1 301 This is a weirdo text message swsbounce
 Server: test-server/fake
-Location: //somewhere.example.com/reply/1314
+Location: //somewhere.example.com/reply/%TESTNUMBER
 Content-Length: 32
 Connection: close
 
@@ -32,7 +32,7 @@ moo
 <datacheck>
 HTTP/1.1 301 This is a weirdo text message swsbounce
 Server: test-server/fake
-Location: //somewhere.example.com/reply/1314
+Location: //somewhere.example.com/reply/%TESTNUMBER
 Content-Length: 32
 Connection: close
 
@@ -54,7 +54,7 @@ http
 HTTP Location: following a // prefixed url
  </name>
  <command>
-http://firstplace.example.com/want/1314 -L -x http://%HOSTIP:%HTTPPORT
+http://firstplace.example.com/want/%TESTNUMBER -L -x http://%HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -64,13 +64,13 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://firstplace.example.com/want/1314 HTTP/1.1\r
+GET http://firstplace.example.com/want/%TESTNUMBER HTTP/1.1\r
 Host: firstplace.example.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://somewhere.example.com/reply/1314 HTTP/1.1\r
+GET http://somewhere.example.com/reply/%TESTNUMBER HTTP/1.1\r
 Host: somewhere.example.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index ffc7bdc7bd0ec34019cab3250c8abfad5acfe2e2..3d3faa8afd6d1c30682dd6eafd436505b997b2af 100644 (file)
@@ -29,10 +29,10 @@ http
 HTTP RFC1867-type formposting - -F with three files, one with explicit type
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/1315 -F name=value -F 'file=@log/test1315.txt,log/test1315.txt;type=magic/content,log/test1315.txt'
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=value -F 'file=@log/test%TESTNUMBER.txt,log/test%TESTNUMBER.txt;type=magic/content,log/test%TESTNUMBER.txt'
 </command>
 # We create this file before the command is invoked!
-<file name="log/test1315.txt">
+<file name="log/test%TESTNUMBER.txt">
 dummy data
 </file>
 </client>
@@ -43,7 +43,7 @@ dummy data
 -----+\w+
 </strip>
 <protocol>
-POST /we/want/1315 HTTP/1.1\r
+POST /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -58,19 +58,19 @@ value
 Content-Disposition: form-data; name="file"\r
 Content-Type: multipart/mixed; boundary=----------------------------aaaaaaaaaaaa\r
 \r
-Content-Disposition: attachment; filename="test1315.txt"\r
+Content-Disposition: attachment; filename="test%TESTNUMBER.txt"\r
 Content-Type: text/plain\r
 \r
 dummy data
 \r
 ------------------------------9ef8d6205763\r
-Content-Disposition: attachment; filename="test1315.txt"\r
+Content-Disposition: attachment; filename="test%TESTNUMBER.txt"\r
 Content-Type: magic/content\r
 \r
 dummy data
 \r
 ------------------------------9ef8d6205763\r
-Content-Disposition: attachment; filename="test1315.txt"\r
+Content-Disposition: attachment; filename="test%TESTNUMBER.txt"\r
 Content-Type: text/plain\r
 \r
 dummy data
index d6ea5e180afab4655048f9dcde48e47d28593a12..935c46798415bcc65310c87516644e25b04235f8 100644 (file)
@@ -61,7 +61,7 @@ http
 FTP LIST tunneled through HTTP proxy
  </name>
  <command>
-ftp://ftp.1316:%FTPPORT/ -p -x %HOSTIP:%PROXYPORT
+ftp://ftp.%TESTNUMBER:%FTPPORT/ -p -x %HOSTIP:%PROXYPORT
 </command>
 </client>
 
index dcde5902bfb2b2cf0d75000ee301adafb4c58331..6ef065280d9efc721703139f2dcef58dd4a63584 100644 (file)
@@ -36,7 +36,7 @@ http
 HTTP with --resolve
 </name>
 <command>
---resolve example.com:%HTTPPORT:%HOSTIP http://example.com:%HTTPPORT/1317
+--resolve example.com:%HTTPPORT:%HOSTIP http://example.com:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -44,7 +44,7 @@ HTTP with --resolve
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1317 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: example.com:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index a01ab27f60c60c4ecf8591fd5e71bcb8dfcbdf17..0844852e9b07fdb28810d37a88abdef8910ecb21 100644 (file)
@@ -36,7 +36,7 @@ http
 HTTP with --resolve and same host name using different cases
  </name>
  <command>
---resolve MiXeDcAsE.cOm:%HTTPPORT:%HOSTIP http://MiXeDcAsE.cOm:%HTTPPORT/1318 http://mixedcase.com:%HTTPPORT/13180001
+--resolve MiXeDcAsE.cOm:%HTTPPORT:%HOSTIP http://MiXeDcAsE.cOm:%HTTPPORT/%TESTNUMBER http://mixedcase.com:%HTTPPORT/%TESTNUMBER0001
 </command>
 </client>
 
@@ -44,12 +44,12 @@ HTTP with --resolve and same host name using different cases
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1318 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: MiXeDcAsE.cOm:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /13180001 HTTP/1.1\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: mixedcase.com:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index b37a97055ae7baaf04bda7efc73e8c36c9f8e28c..ea11925240c881cedf4aab0aeeb4e921c6ed161c 100644 (file)
@@ -56,7 +56,7 @@ proxy
 POP3 fetch tunneled through HTTP proxy
  </name>
  <command>
-pop3://pop.1319:%POP3PORT/1319 -p -x %HOSTIP:%PROXYPORT -u user:secret
+pop3://pop.%TESTNUMBER:%POP3PORT/%TESTNUMBER -p -x %HOSTIP:%PROXYPORT -u user:secret
 </command>
 </client>
 
@@ -67,12 +67,12 @@ pop3://pop.1319:%POP3PORT/1319 -p -x %HOSTIP:%PROXYPORT -u user:secret
 CAPA\r
 USER user\r
 PASS secret\r
-RETR 1319\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 <proxy>
-CONNECT pop.1319:%POP3PORT HTTP/1.1\r
-Host: pop.1319:%POP3PORT\r
+CONNECT pop.%TESTNUMBER:%POP3PORT HTTP/1.1\r
+Host: pop.%TESTNUMBER:%POP3PORT\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
index 51cb89c9ccbbc95e10c77757647f8b4bd6cfd171..d33980fa7df33448394ff6b1c414211963715993 100644 (file)
@@ -37,9 +37,9 @@ ftp
 FTP (optional .netrc; user/passwd supplied) dir list PASV
  </name>
  <command>
---netrc-optional --netrc-file log/netrc132 ftp://mary:mark@%HOSTIP:%FTPPORT/
+--netrc-optional --netrc-file log/netrc%TESTNUMBER ftp://mary:mark@%HOSTIP:%FTPPORT/
 </command>
-<file name="log/netrc132" >
+<file name="log/netrc%TESTNUMBER" >
 # the following two lines were created while testing curl
 machine %HOSTIP login user1 password passwd1
 machine %HOSTIP login user2 password passwd2
index 2db0e3dee2b14406a4c1c87cf9ea96cc52a734d4..7b43382b98eac07c75fbdc2aebe8e572b2396a70 100644 (file)
@@ -39,7 +39,7 @@ To: another
 body\r
 </stdin>
  <command>
-smtp://smtp.1320:%SMTPPORT/1320 --mail-rcpt recipient@example.com --mail-from sender@example.com -T - -p -x %HOSTIP:%PROXYPORT
+smtp://smtp.%TESTNUMBER:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T - -p -x %HOSTIP:%PROXYPORT
 </command>
 </client>
 
@@ -47,7 +47,7 @@ smtp://smtp.1320:%SMTPPORT/1320 --mail-rcpt recipient@example.com --mail-from se
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 1320\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient@example.com>\r
 DATA\r
@@ -61,8 +61,8 @@ body
 .\r
 </upload>
 <proxy>
-CONNECT smtp.1320:%SMTPPORT HTTP/1.1\r
-Host: smtp.1320:%SMTPPORT\r
+CONNECT smtp.%TESTNUMBER:%SMTPPORT HTTP/1.1\r
+Host: smtp.%TESTNUMBER:%SMTPPORT\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
index 4607797846ceb585ca393d182e829eebacbffaf3..88d865e7bb9c09b90f7f6e0017400be984016477 100644 (file)
@@ -52,7 +52,7 @@ proxy
 IMAP FETCH tunneled through HTTP proxy
  </name>
  <command>
-'imap://imap.1321:%IMAPPORT/1321/;MAILINDEX=1' -u user:secret -p -x %HOSTIP:%PROXYPORT
+'imap://imap.%TESTNUMBER:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret -p -x %HOSTIP:%PROXYPORT
 </command>
 </client>
 
@@ -62,13 +62,13 @@ IMAP FETCH tunneled through HTTP proxy
 <protocol>
 A001 CAPABILITY\r
 A002 LOGIN user secret\r
-A003 SELECT 1321\r
+A003 SELECT %TESTNUMBER\r
 A004 FETCH 1 BODY[]\r
 A005 LOGOUT\r
 </protocol>
 <proxy>
-CONNECT imap.1321:%IMAPPORT HTTP/1.1\r
-Host: imap.1321:%IMAPPORT\r
+CONNECT imap.%TESTNUMBER:%IMAPPORT HTTP/1.1\r
+Host: imap.%TESTNUMBER:%IMAPPORT\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
index eb05fe5b697f0eefdc6c212a8efd076e9e5bdf4c..ffd5048a781d6d6bf937d2050418d6e412fa1e90 100644 (file)
@@ -37,7 +37,7 @@ http
 HTTP with --resolve and hostname with trailing dot
 </name>
 <command>
---ipv4 --resolve example.com.:%HTTPPORT:%HOSTIP http://example.com.:%HTTPPORT/1322
+--ipv4 --resolve example.com.:%HTTPPORT:%HOSTIP http://example.com.:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -45,7 +45,7 @@ HTTP with --resolve and hostname with trailing dot
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1322 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: example.com:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 46f6e92a7de054337b1536ad3dde634986404434..c62e73f02bcdc7781cf6e6a0b514c508eadcca0d 100644 (file)
@@ -36,7 +36,7 @@ http-ipv6
 HTTP with --resolve and [ipv6address]
 </name>
 <command>
---resolve example.com:%HTTP6PORT:%HOST6IP http://example.com:%HTTP6PORT/1324
+--resolve example.com:%HTTP6PORT:%HOST6IP http://example.com:%HTTP6PORT/%TESTNUMBER
 </command>
 </client>
 
@@ -44,7 +44,7 @@ HTTP with --resolve and [ipv6address]
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1324 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: example.com:%HTTP6PORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index dadac8c23168b4649bbea1aeca124d95fb81b946..dea2b2a1163f34fa190d40f70231e79db4799346 100644 (file)
@@ -13,7 +13,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 308 OK swsclose\r
-Location: 13250002\r
+Location: %TESTNUMBER0002\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Connection: close\r
 \r
@@ -28,7 +28,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 308 OK swsclose\r
-Location: 13250002\r
+Location: %TESTNUMBER0002\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Connection: close\r
 \r
@@ -51,7 +51,7 @@ http
 HTTP 308-redirect with POST
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/1325 -L -d "moo"
+http://%HOSTIP:%HTTPPORT/we/%TESTNUMBER -L -d "moo"
 </command>
 </client>
 
@@ -59,14 +59,14 @@ http://%HOSTIP:%HTTPPORT/we/1325 -L -d "moo"
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /we/1325 HTTP/1.1\r
+POST /we/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 3\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-mooPOST /we/13250002 HTTP/1.1\r
+mooPOST /we/%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 2bcf64bda9dc427e25abd54ff73e2cd9b8638fe9..22c49cf4728cef1e5ba4fd74fa0bb84bf1547c16 100644 (file)
@@ -29,7 +29,7 @@ telnet
 TELNET to HTTP server
  </name>
 <stdin>
-GET /we/want/1326 HTTP/1.0\r
+GET /we/want/%TESTNUMBER HTTP/1.0\r
 \r
 </stdin>
  <command>
@@ -41,7 +41,7 @@ telnet://%HOSTIP:%HTTPPORT --upload-file -
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/1326 HTTP/1.0\r
+GET /we/want/%TESTNUMBER HTTP/1.0\r
 \r
 </protocol>
 </verify>
index a6e3d4fdc3565935f281ca4e8fe7586d32e732da..791189b90a601559d5409c93198218d8087a41cc 100644 (file)
@@ -24,15 +24,15 @@ telnet
 TELNET check of upload with stdout redirected
  </name>
 <stdin>
-GET /ignore/for/1327 HTTP/1.0\r
+GET /ignore/for/%TESTNUMBER HTTP/1.0\r
 \r
 </stdin>
-<file name="log/1327.txt">
-GET /we/want/1327 HTTP/1.0\r
+<file name="log/%TESTNUMBER.txt">
+GET /we/want/%TESTNUMBER HTTP/1.0\r
 \r
 </file>
  <command option="no-output">
-telnet://%HOSTIP:%HTTPPORT -T log/1327.txt
+telnet://%HOSTIP:%HTTPPORT -T log/%TESTNUMBER.txt
 </command>
 </client>
 
@@ -40,7 +40,7 @@ telnet://%HOSTIP:%HTTPPORT -T log/1327.txt
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/1327 HTTP/1.0\r
+GET /we/want/%TESTNUMBER HTTP/1.0\r
 \r
 </protocol>
 </verify>
index fc9fef991b289aa253735c18e3a8dd6149a34b0e..b7b3e3247bcc61c76144a12f8de947dbd65b5dc8 100644 (file)
@@ -47,7 +47,7 @@ http
 HTTP GET a globbed range with -f
  </name>
  <command>
--f 'http://%HOSTIP:%HTTPPORT/[13280000-13280001]' -o log/#1
+-f 'http://%HOSTIP:%HTTPPORT/[%TESTNUMBER0000-%TESTNUMBER0001]' -o log/#1
 </command>
 </client>
 
@@ -55,12 +55,12 @@ HTTP GET a globbed range with -f
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /13280000 HTTP/1.1\r
+GET /%TESTNUMBER0000 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /13280001 HTTP/1.1\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 2cec0b895d0625dc586b369dc39b3d5e41f7d013..0ca5b5aae307f5c733dfa0c5fdf7c4609ad56bab 100644 (file)
@@ -15,7 +15,7 @@ http
 /-prefixed proxy name
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/that/page/1329 -x "/server"
+http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER -x "/server"
 </command>
 <features>
 proxy
index 0b4d2ff70b96f7ddd9ee795021507de76c3b0a9c..e9fe83f7c6e7d0ea74f2798bf47d75bd921a81bc 100644 (file)
@@ -37,9 +37,9 @@ ftp
 FTP (compulsory .netrc; ignored user/passwd) dir list PASV
  </name>
  <command>
--n --netrc-file log/netrc133 ftp://mary:mark@%HOSTIP:%FTPPORT/
+-n --netrc-file log/netrc%TESTNUMBER ftp://mary:mark@%HOSTIP:%FTPPORT/
 </command>
-<file name="log/netrc133" >
+<file name="log/netrc%TESTNUMBER" >
 # the following two lines were created while testing curl
 machine %HOSTIP login user1 password passwd1
 machine %HOSTIP login user2 password passwd2
index f7ac9b0ddc4c8a4134e2096f56261df94169ba12..2cc5aedd7690262b1018d2b90fb35bb923707271 100644 (file)
@@ -32,8 +32,8 @@ nothing
 # Verify data after the test has been "shot"
 <verify>
 <file name="log/memdump">
-MEM unit1330.c: malloc()
-MEM unit1330.c: free()
+MEM unit%TESTNUMBER.c: malloc()
+MEM unit%TESTNUMBER.c: free()
 </file>
 <stripfile>
 s/ =.*//
index 09aabf879aee8217ac51dee03f36211bb0b9221e..4ef0c14df20ef06219f8f17c01e0cb265bf309ef 100644 (file)
@@ -62,7 +62,7 @@ http
 HTTP --proxy-anyauth and 407 with cookies
  </name>
  <command>
--U myname:mypassword -x %HOSTIP:%HTTPPORT http://z.x.com/1331 --proxy-anyauth -c log/dump1331
+-U myname:mypassword -x %HOSTIP:%HTTPPORT http://z.x.com/%TESTNUMBER --proxy-anyauth -c log/dump%TESTNUMBER
 </command>
 <features>
 proxy
@@ -72,13 +72,13 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://z.x.com/1331 HTTP/1.1\r
+GET http://z.x.com/%TESTNUMBER HTTP/1.1\r
 Host: z.x.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://z.x.com/1331 HTTP/1.1\r
+GET http://z.x.com/%TESTNUMBER HTTP/1.1\r
 Host: z.x.com\r
 Proxy-Authorization: Basic bXluYW1lOm15cGFzc3dvcmQ=\r
 User-Agent: curl/%VERSION\r
index 0ecbfbee10bb09b774e6cdf7d90d0f5df267f1ea..b7d201be0ba9efe3be49c4632e1b613606c45ab5 100644 (file)
@@ -12,7 +12,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 303 OK swsclose
-Location: moo.html&testcase=/13320002
+Location: moo.html&testcase=/%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
 
@@ -27,7 +27,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 303 OK swsclose
-Location: moo.html&testcase=/13320002
+Location: moo.html&testcase=/%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
 
@@ -50,7 +50,7 @@ http
 HTTP POST with 303 redirect and --post303
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/blah/1332 -L -d "moo" --post303
+http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo" --post303
 </command>
 </client>
 
@@ -58,14 +58,14 @@ http://%HOSTIP:%HTTPPORT/blah/1332 -L -d "moo" --post303
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /blah/1332 HTTP/1.1\r
+POST /blah/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 3\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-mooPOST /blah/moo.html&testcase=/13320002 HTTP/1.1\r
+mooPOST /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index c49cf96aade6aec517497ba3843574da01b934b1..0a991e48b26f8d8e41a8d1929f5f4acbe0cf0715 100644 (file)
@@ -31,7 +31,7 @@ http
 HTTP POST zero length, chunked-encoded
  </name>
  <command>
--d "" --header "Transfer-Encoding: chunked" http://%HOSTIP:%HTTPPORT/1333
+-d "" --header "Transfer-Encoding: chunked" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -39,7 +39,7 @@ HTTP POST zero length, chunked-encoded
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST /1333 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index a0210cb5e6a1f898a4572b92c1e54b46734295e9..b19155923c62f98fb0a43f88046a0426af59c8e2 100644 (file)
@@ -38,7 +38,7 @@ HTTP GET with -O without Content-Disposition, -D file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1334 -O -D log/heads1334
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D log/heads%TESTNUMBER
 </command>
 </client>
 
@@ -46,18 +46,18 @@ http://%HOSTIP:%HTTPPORT/1334 -O -D log/heads1334
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1334 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/1334">
+<file1 name="log/%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/heads1334">
+<file2 name="log/heads%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -67,7 +67,7 @@ Content-Type: text/html
 \r
 </file2>
 
-<file3 name="log/stdout1334">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
index 7f20c300fceab5ae486aa65207e6d666dca10ae5..e3507603bbb4d8b65f3ad8dd768c695614a4e046 100644 (file)
@@ -38,7 +38,7 @@ HTTP GET with -O without Content-Disposition, -D stdout
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1335 -O -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D -
 </command>
 </client>
 
@@ -46,18 +46,18 @@ http://%HOSTIP:%HTTPPORT/1335 -O -D -
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1335 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/1335">
+<file1 name="log/%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/stdout1335">
+<file2 name="log/stdout%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
index 129c35009127907b2da63ad0deeb8a4f424817a4..631f204e849c91cbf38642089b90b12becbd2ac4 100644 (file)
@@ -15,7 +15,7 @@ Server: test-server/fake
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1336; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 12345
 </data>
@@ -39,10 +39,10 @@ HTTP GET with -O and Content-Disposition, -D file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1336 -O -D log/heads1336
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name1336
+perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -50,29 +50,29 @@ perl %SRCDIR/libtest/notexists.pl log/name1336
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1336 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/1336">
+<file1 name="log/%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/heads1336">
+<file2 name="log/heads%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1336; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 </file2>
 
-<file3 name="log/stdout1336">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
index 0d7b20494daa3b03efaccfad8f6208817108991d..808c8a2a4b07d27bf3d44c1f28b7e31a3c9b1720 100644 (file)
@@ -15,7 +15,7 @@ Server: test-server/fake
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1337; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 12345
 </data>
@@ -39,10 +39,10 @@ HTTP GET with -O and Content-Disposition, -D stdout
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1337 -O -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name1337
+perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -50,25 +50,25 @@ perl %SRCDIR/libtest/notexists.pl log/name1337
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1337 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/1337">
+<file1 name="log/%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/stdout1337">
+<file2 name="log/stdout%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1337; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 </file2>
 
index 8fa05cfb0140043913564aef8fa2da721814487b..672e9aea89468e0a7a4341401eab75f50f7e7e7d 100644 (file)
@@ -39,7 +39,7 @@ HTTP GET with -O -J without Content-Disposition, -D file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1338 -J -O -D log/heads1338
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D log/heads%TESTNUMBER
 </command>
 </client>
 
@@ -47,18 +47,18 @@ http://%HOSTIP:%HTTPPORT/1338 -J -O -D log/heads1338
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1338 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/1338">
+<file1 name="log/%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/heads1338">
+<file2 name="log/heads%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -68,7 +68,7 @@ Content-Type: text/html
 \r
 </file2>
 
-<file3 name="log/stdout1338">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
index 0ebd5c492dbf76646df1daa79c473ebdf00a050c..4bc77e97627041a8895f813fd7612a51f3ee1b2d 100644 (file)
@@ -39,7 +39,7 @@ HTTP GET with -O -J without Content-Disposition, -D stdout
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1339 -J -O -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D -
 </command>
 </client>
 
@@ -47,18 +47,18 @@ http://%HOSTIP:%HTTPPORT/1339 -J -O -D -
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1339 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/1339">
+<file1 name="log/%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/stdout1339">
+<file2 name="log/stdout%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
index 4ca63accdbb789876efafc7f67d976cfe7e46f54..00d1732df46608fba6d10a2080abc6b50c301945 100644 (file)
@@ -39,9 +39,9 @@ FTP (optional .netrc; programmatic user/passwd) dir list PASV
 
 # -u overrides netrc which overrides the URL
 <command>
---netrc-optional --netrc-file log/netrc134 -u romulus:rhemus ftp://mary:mark@%HOSTIP:%FTPPORT/
+--netrc-optional --netrc-file log/netrc%TESTNUMBER -u romulus:rhemus ftp://mary:mark@%HOSTIP:%FTPPORT/
 </command>
-<file name="log/netrc134" >
+<file name="log/netrc%TESTNUMBER" >
 # the following two lines were created while testing curl
 machine %HOSTIP login user1 password passwd1
 machine %HOSTIP login user2 password passwd2
index 509c659c2d735d7b0e586d68203bdb673988c92d..17218bea05b8dbd0cbd98fe27bb49ef54daf2b61 100644 (file)
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1340; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 12345
 </data>
@@ -40,7 +40,7 @@ HTTP GET with -O -J and Content-Disposition, -D file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1340 -J -O -D log/heads1340 -w "curl: Saved to filename %{filename_effective}\n"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D log/heads%TESTNUMBER -w "curl: Saved to filename %{filename_effective}\n"
 </command>
 </client>
 
@@ -48,30 +48,30 @@ http://%HOSTIP:%HTTPPORT/1340 -J -O -D log/heads1340 -w "curl: Saved to filename
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1340 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/name1340">
+<file1 name="log/name%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/heads1340">
+<file2 name="log/heads%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1340; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 </file2>
 
-<file3 name="log/stdout1340" mode="text">
-curl: Saved to filename %PWD/log/name1340
+<file3 name="log/stdout%TESTNUMBER" mode="text">
+curl: Saved to filename %PWD/log/name%TESTNUMBER
 </file3>
 
 </verify>
index 9a70001803d0c214294dfbb96ba4a66f28f09e76..9203cc6ceb017ee9ea812dd69c7217c060290ee4 100644 (file)
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1341; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 12345
 </data>
@@ -40,7 +40,7 @@ HTTP GET with -O -J and Content-Disposition, -D stdout
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1341 -J -O -D - -w "curl: Saved to filename %{filename_effective}\n"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D - -w "curl: Saved to filename %{filename_effective}\n"
 </command>
 </client>
 
@@ -48,27 +48,27 @@ http://%HOSTIP:%HTTPPORT/1341 -J -O -D - -w "curl: Saved to filename %{filename_
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1341 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/name1341">
+<file1 name="log/name%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/stdout1341">
+<file2 name="log/stdout%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1341; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
-curl: Saved to filename %PWD/log/name1341
+curl: Saved to filename %PWD/log/name%TESTNUMBER
 </file2>
 
 </verify>
index 92aed317ecba5299854950abb845f206caab14be..6bab2831e475e686fd10ca14d466ee724ac1a9e8 100644 (file)
@@ -38,7 +38,7 @@ HTTP GET with -O -i without Content-Disposition, -D file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1342 -i -O -D log/heads1342
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D log/heads%TESTNUMBER
 </command>
 </client>
 
@@ -46,14 +46,14 @@ http://%HOSTIP:%HTTPPORT/1342 -i -O -D log/heads1342
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1342 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/1342">
+<file1 name="log/%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -64,7 +64,7 @@ Content-Type: text/html
 12345
 </file1>
 
-<file2 name="log/heads1342">
+<file2 name="log/heads%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -74,7 +74,7 @@ Content-Type: text/html
 \r
 </file2>
 
-<file3 name="log/stdout1342">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
index ed5b2d30aa23d870128c58da6dd334cf99f6882c..3f0d63059dde6567a193b54aebcd35bdd459b96c 100644 (file)
@@ -38,7 +38,7 @@ HTTP GET with -O -i without Content-Disposition, -D stdout
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1343 -i -O -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D -
 </command>
 </client>
 
@@ -46,14 +46,14 @@ http://%HOSTIP:%HTTPPORT/1343 -i -O -D -
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1343 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/1343">
+<file1 name="log/%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -64,7 +64,7 @@ Content-Type: text/html
 12345
 </file1>
 
-<file2 name="log/stdout1343">
+<file2 name="log/stdout%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
index 43aeb8b92fafaa70436220c6164ef57b7895a546..bb33616791d467daa8ae03db7f8671c8332e37cc 100644 (file)
@@ -15,7 +15,7 @@ Server: test-server/fake
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1344; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 12345
 </data>
@@ -39,10 +39,10 @@ HTTP GET with -O -i and Content-Disposition, -D file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1344 -i -O -D log/heads1344
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name1344
+perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -50,37 +50,37 @@ perl %SRCDIR/libtest/notexists.pl log/name1344
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1344 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/1344">
+<file1 name="log/%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1344; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 12345
 </file1>
 
-<file2 name="log/heads1344">
+<file2 name="log/heads%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1344; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 </file2>
 
-<file3 name="log/stdout1344">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
index d645e748de29e616cfdbc81281367948d6e3abdc..bd9470c14973fbd516921a5f41279bec780f4965 100644 (file)
@@ -15,7 +15,7 @@ Server: test-server/fake
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1345; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 12345
 </data>
@@ -39,10 +39,10 @@ HTTP GET with -O -i and Content-Disposition, -D stdout
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1345 -i -O -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name1345
+perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -50,33 +50,33 @@ perl %SRCDIR/libtest/notexists.pl log/name1345
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1345 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/1345">
+<file1 name="log/%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1345; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 12345
 </file1>
 
-<file2 name="log/stdout1345">
+<file2 name="log/stdout%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1345; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 </file2>
 
index 367a9dfa639397fc69a01ac210f5c0bc425b8941..32d434d03f8083719e4995d091677b296d4ecd6e 100644 (file)
@@ -38,7 +38,7 @@ HTTP GET with -O -i without Content-Disposition, without -D
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1346 -i -O
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O
 </command>
 </client>
 
@@ -46,14 +46,14 @@ http://%HOSTIP:%HTTPPORT/1346 -i -O
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1346 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/1346">
+<file1 name="log/%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -64,7 +64,7 @@ Content-Type: text/html
 12345
 </file1>
 
-<file2 name="log/stdout1346">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
 
 </verify>
index 20e0d4aead1b69cd7205be98632ab295b899e669..46e1ae608d1c7da6206a5f3dc084125554445687 100644 (file)
@@ -15,7 +15,7 @@ Server: test-server/fake
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1347; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 12345
 </data>
@@ -39,10 +39,10 @@ HTTP GET with -O -i and Content-Disposition, without -D
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1347 -i -O
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name1347
+perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -50,26 +50,26 @@ perl %SRCDIR/libtest/notexists.pl log/name1347
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1347 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/1347">
+<file1 name="log/%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1347; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 12345
 </file1>
 
-<file2 name="log/stdout1347">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
 
 </verify>
index 5f374cb2feca01b0eb8923cfa26ca74b6892b408..df7a620c3ac91e64e6ecbad289f6d7c57091697c 100644 (file)
@@ -31,7 +31,7 @@ FTP download, file without Content-Disposition inside, using -O
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1348 -O
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O
 </command>
 </client>
 
@@ -44,17 +44,17 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1348\r
-RETR file1348\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/file1348">
+<file1 name="log/file%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/stdout1348">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
 
 </verify>
index 33906f8a2919f45832c57d4f93b1123a8891b12c..10ba0bddc77c58c4e2324f17bfb3c7428c0156aa 100644 (file)
@@ -31,7 +31,7 @@ FTP download, file without C-D inside, using -O -D file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1349 -O -D log/heads1349
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D log/heads%TESTNUMBER
 </command>
 </client>
 
@@ -44,19 +44,19 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1349\r
-RETR file1349\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/file1349">
+<file1 name="log/file%TESTNUMBER">
 fooo
 mooo
 </file1>
 
 # The final "221 bye bye baby" response to QUIT will not be recorded
 # since that is not considered part of this particular transfer!
-<file2 name="log/heads1349">
+<file2 name="log/heads%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -69,14 +69,14 @@ mooo
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted\r
 213 10\r
-150 Binary data connection for 1349 () (10 bytes).\r
+150 Binary data connection for %TESTNUMBER () (10 bytes).\r
 226 File transfer complete\r
 </file2>
 <stripfile2>
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout1349">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
index 10eb0eacd1354bffe2e3df0ca534cfb530ceba8f..353735d6a4fa1f5e871d99c7c4d00c197e68e04e 100644 (file)
@@ -32,7 +32,7 @@ ftp
 FTP retrieve a byte-range
  </name>
  <command>
--r 4-16 ftp://%HOSTIP:%FTPPORT/135
+-r 4-16 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -44,9 +44,9 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 135\r
+SIZE %TESTNUMBER\r
 REST 4\r
-RETR 135\r
+RETR %TESTNUMBER\r
 ABOR\r
 QUIT\r
 </protocol>
index b7885972cf05630357c9d20148cf686bddca7c55..e9ea522bad63f511bf1dd2383f762956389e6fc7 100644 (file)
@@ -31,7 +31,7 @@ FTP download, file without C-D inside, using -O -D stdout
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1350 -O -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D -
 </command>
 </client>
 
@@ -44,19 +44,19 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1350\r
-RETR file1350\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/file1350">
+<file1 name="log/file%TESTNUMBER">
 fooo
 mooo
 </file1>
 
 # The final "221 bye bye baby" response to QUIT will not be recorded
 # since that is not considered part of this particular transfer!
-<file2 name="log/stdout1350">
+<file2 name="log/stdout%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -69,7 +69,7 @@ mooo
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted\r
 213 10\r
-150 Binary data connection for 1350 () (10 bytes).\r
+150 Binary data connection for %TESTNUMBER () (10 bytes).\r
 226 File transfer complete\r
 </file2>
 <stripfile2>
index 3e9cc211b8c17ceea44e8504b12478253c29a3f3..4c8ed4caad9da453cbf9dc981dc024b0c70074c4 100644 (file)
@@ -32,7 +32,7 @@ FTP download, file without C-D inside, using -O -J -D file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1351 -O -J -D log/heads1351
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D log/heads%TESTNUMBER
 </command>
 </client>
 
@@ -45,19 +45,19 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1351\r
-RETR file1351\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/file1351">
+<file1 name="log/file%TESTNUMBER">
 fooo
 mooo
 </file1>
 
 # The final "221 bye bye baby" response to QUIT will not be recorded
 # since that is not considered part of this particular transfer!
-<file2 name="log/heads1351">
+<file2 name="log/heads%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -70,14 +70,14 @@ mooo
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted\r
 213 10\r
-150 Binary data connection for 1351 () (10 bytes).\r
+150 Binary data connection for %TESTNUMBER () (10 bytes).\r
 226 File transfer complete\r
 </file2>
 <stripfile2>
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout1351">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
index cf690af67767a1165ad11735048ffce0abd02e5f..3af12a801590be9c338c4924ef2cbdcb49060443 100644 (file)
@@ -32,7 +32,7 @@ FTP download, file without C-D inside, using -O -J -D stdout
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1352 -O -J -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D -
 </command>
 </client>
 
@@ -45,19 +45,19 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1352\r
-RETR file1352\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/file1352">
+<file1 name="log/file%TESTNUMBER">
 fooo
 mooo
 </file1>
 
 # The final "221 bye bye baby" response to QUIT will not be recorded
 # since that is not considered part of this particular transfer!
-<file2 name="log/stdout1352">
+<file2 name="log/stdout%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -70,7 +70,7 @@ mooo
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted\r
 213 10\r
-150 Binary data connection for 1352 () (10 bytes).\r
+150 Binary data connection for %TESTNUMBER () (10 bytes).\r
 226 File transfer complete\r
 </file2>
 <stripfile2>
index 8bd751c269d26c38f4b585f49f7e75c80b7a1c5b..34049706dfa1837a46e9c6c8f31000ff0841f75b 100644 (file)
@@ -31,7 +31,7 @@ FTP download, file without C-D inside, using -O -i -D file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1353 -O -i -D log/heads1353
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D log/heads%TESTNUMBER
 </command>
 </client>
 
@@ -44,19 +44,19 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1353\r
-RETR file1353\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/file1353">
+<file1 name="log/file%TESTNUMBER">
 fooo
 mooo
 </file1>
 
 # The final "221 bye bye baby" response to QUIT will not be recorded
 # since that is not considered part of this particular transfer!
-<file2 name="log/heads1353">
+<file2 name="log/heads%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -69,14 +69,14 @@ mooo
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted\r
 213 10\r
-150 Binary data connection for 1353 () (10 bytes).\r
+150 Binary data connection for %TESTNUMBER () (10 bytes).\r
 226 File transfer complete\r
 </file2>
 <stripfile2>
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout1353">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
index 13c5a1bb527ba9d6f88f23eabe22abd9ea3c457f..e5d15635a47e010e7d2694472e02ccbd7f95ebbc 100644 (file)
@@ -31,7 +31,7 @@ FTP download, file without C-D inside, using -O -i -D stdout
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1354 -O -i -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D -
 </command>
 </client>
 
@@ -44,17 +44,17 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1354\r
-RETR file1354\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/file1354">
+<file1 name="log/file%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/stdout1354">
+<file2 name="log/stdout%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -67,7 +67,7 @@ mooo
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted\r
 213 10\r
-150 Binary data connection for 1354 () (10 bytes).\r
+150 Binary data connection for %TESTNUMBER () (10 bytes).\r
 226 File transfer complete\r
 </file2>
 <stripfile2>
index e7a392c1d87fbeb0104441b0dec39010f66eca12..f008803e67319008487bd37ea92702919bccb8e6 100644 (file)
@@ -31,7 +31,7 @@ FTP download, file without C-D inside, using -O -i, without -D
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1355 -O -i
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i
 </command>
 </client>
 
@@ -44,17 +44,17 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1355\r
-RETR file1355\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/file1355">
+<file1 name="log/file%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/stdout1355">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
 
 </verify>
index 72f573105d80c9015ea3e377b450ecc9cb08e52d..7be22473a3b74f9c7aa1dcbab7aa7381d8b49d37 100644 (file)
@@ -8,7 +8,7 @@ RETR
 
 # Server-side
 <reply>
-# file1356 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1356; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 MOOOO
 </data>
@@ -39,10 +39,10 @@ FTP download, file with Content-Disposition inside, using -O
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1356 -O
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name1356
+perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -55,24 +55,24 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1356\r
-RETR file1356\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/file1356">
+<file1 name="log/file%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1356; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 MOOOO
 </file1>
 
-<file2 name="log/stdout1356">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
 
 </verify>
index fca58cea51eff87753cf7e215ddb2298e78f4f76..ebb102c95c4fc08b2bae61fbd7e10049c01842c8 100644 (file)
@@ -8,7 +8,7 @@ RETR
 
 # Server-side
 <reply>
-# file1357 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1357; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </data>
@@ -39,10 +39,10 @@ FTP download, file with C-D inside, using -O -D file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1357 -O -D log/heads1357
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name1357
+perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -55,24 +55,24 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1357\r
-RETR file1357\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/file1357">
+<file1 name="log/file%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1357; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </file1>
 
-<file2 name="log/heads1357">
+<file2 name="log/heads%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -85,14 +85,14 @@ MOOOO
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted\r
 213 214\r
-150 Binary data connection for 1357 () (214 bytes).\r
+150 Binary data connection for %TESTNUMBER () (214 bytes).\r
 226 File transfer complete\r
 </file2>
 <stripfile2>
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout1357">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
index 684afe1c4ecf6895603cb6d22ab0dbf33490b078..983e1cdc0be6a9378453055881922a04fe0cb100 100644 (file)
@@ -8,7 +8,7 @@ RETR
 
 # Server-side
 <reply>
-# file1358 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1358; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </data>
@@ -39,10 +39,10 @@ FTP download, file with C-D inside, using -O -D stdout
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1358 -O -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name1358
+perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -55,24 +55,24 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1358\r
-RETR file1358\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/file1358">
+<file1 name="log/file%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1358; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </file1>
 
-<file2 name="log/stdout1358">
+<file2 name="log/stdout%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -85,7 +85,7 @@ MOOOO
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted\r
 213 214\r
-150 Binary data connection for 1358 () (214 bytes).\r
+150 Binary data connection for %TESTNUMBER () (214 bytes).\r
 226 File transfer complete\r
 </file2>
 <stripfile2>
index bae91f0d0b40fc08018f676c321063cb68b4f925..c4fb2eec437d02d8ecd930e6f4820d8edcb92e63 100644 (file)
@@ -9,7 +9,7 @@ RETR
 
 # Server-side
 <reply>
-# file1359 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1359; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </data>
@@ -40,10 +40,10 @@ FTP download, file with C-D inside, using -O -J -D file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1359 -O -J -D log/heads1359
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name1359
+perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -56,24 +56,24 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1359\r
-RETR file1359\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/file1359">
+<file1 name="log/file%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1359; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </file1>
 
-<file2 name="log/heads1359">
+<file2 name="log/heads%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -86,14 +86,14 @@ MOOOO
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted\r
 213 214\r
-150 Binary data connection for 1359 () (214 bytes).\r
+150 Binary data connection for %TESTNUMBER () (214 bytes).\r
 226 File transfer complete\r
 </file2>
 <stripfile2>
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout1359">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
index 25940b50d8d9f476742a579e082aef0631172fa8..63d936b5400d6d459f8a1f5a8746272e20d48552 100644 (file)
@@ -22,7 +22,7 @@ ftp
 FTP with user and no password
  </name>
  <command>
--u user: ftp://%HOSTIP:%FTPPORT/136
+-u user: ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -34,8 +34,8 @@ PASS
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 136\r
-RETR 136\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index f0aac4bb46e68bf808b4343cbe207b9e1b5fab2b..3f7b43535b6acdc60a7e6f269bf1409184c7b613 100644 (file)
@@ -9,7 +9,7 @@ RETR
 
 # Server-side
 <reply>
-# file1360 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1360; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </data>
@@ -40,10 +40,10 @@ FTP download, file with C-D inside, using -O -J -D stdout
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1360 -O -J -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name1360
+perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -56,24 +56,24 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1360\r
-RETR file1360\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/file1360">
+<file1 name="log/file%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1360; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </file1>
 
-<file2 name="log/stdout1360">
+<file2 name="log/stdout%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -86,7 +86,7 @@ MOOOO
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted\r
 213 214\r
-150 Binary data connection for 1360 () (214 bytes).\r
+150 Binary data connection for %TESTNUMBER () (214 bytes).\r
 226 File transfer complete\r
 </file2>
 <stripfile2>
index c37b8fc584c8f0d31cc3c935cb621ca7a9a8a4fe..3f1f378936539cd1b3d644bed36fd858fca0c18b 100644 (file)
@@ -8,7 +8,7 @@ RETR
 
 # Server-side
 <reply>
-# file1361 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1361; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </data>
@@ -39,10 +39,10 @@ FTP download, file with C-D inside, using -O -i -D file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1361 -O -i -D log/heads1361
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name1361
+perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -55,24 +55,24 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1361\r
-RETR file1361\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/file1361">
+<file1 name="log/file%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1361; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </file1>
 
-<file2 name="log/heads1361">
+<file2 name="log/heads%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -85,14 +85,14 @@ MOOOO
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted\r
 213 214\r
-150 Binary data connection for 1361 () (214 bytes).\r
+150 Binary data connection for %TESTNUMBER () (214 bytes).\r
 226 File transfer complete\r
 </file2>
 <stripfile2>
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout1361">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
index be174efef5fe711d4eccd6cd8b9dc93fa9b7b38d..c5a09cbe8a4f331a1fa209757387901e7d8510f2 100644 (file)
@@ -8,7 +8,7 @@ RETR
 
 # Server-side
 <reply>
-# file1362 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1362; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </data>
@@ -39,10 +39,10 @@ FTP download, file with C-D inside, using -O -i -D stdout
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1362 -O -i -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name1362
+perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -55,24 +55,24 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1362\r
-RETR file1362\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/file1362">
+<file1 name="log/file%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1362; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </file1>
 
-<file2 name="log/stdout1362">
+<file2 name="log/stdout%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -85,7 +85,7 @@ MOOOO
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted\r
 213 214\r
-150 Binary data connection for 1362 () (214 bytes).\r
+150 Binary data connection for %TESTNUMBER () (214 bytes).\r
 226 File transfer complete\r
 </file2>
 <stripfile2>
index 36b7069ce844b05d20185ac9999fcf1528beb354..e48074b46f2654091c281233224a61abcc41152d 100644 (file)
@@ -8,7 +8,7 @@ RETR
 
 # Server-side
 <reply>
-# file1363 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1363; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 MOOOO
 </data>
@@ -39,10 +39,10 @@ FTP download, file with C-D inside, using -O -i, without -D
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1363 -O -i
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name1363
+perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -55,24 +55,24 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1363\r
-RETR file1363\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/file1363">
+<file1 name="log/file%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1363; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 MOOOO
 </file1>
 
-<file2 name="log/stdout1363">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
 
 </verify>
index 8184573e45b939e6c07cfa3d78dd76e7ff26509a..ac2c423d29e8fc4d5410cf9e9666b228f6ee3fb7 100644 (file)
@@ -30,10 +30,10 @@ http
 HTTP GET -o fname without Content-Disposition, -D file
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1364 -o log/outfile1364 -D log/heads1364
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/outfile%TESTNUMBER -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1364
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER
 </postcheck>
 </client>
 
@@ -41,18 +41,18 @@ perl %SRCDIR/libtest/notexists.pl log/1364
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1364 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/outfile1364">
+<file1 name="log/outfile%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/heads1364">
+<file2 name="log/heads%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -62,7 +62,7 @@ Content-Type: text/html
 \r
 </file2>
 
-<file3 name="log/stdout1364">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
index 6da4f648eab15a27ff3e81300ef5bc4a64a523a6..cee54b3a7d3f6c1300adbcaaaa23e109663caea8 100644 (file)
@@ -30,10 +30,10 @@ http
 HTTP GET -o fname without Content-Disposition, -D stdout
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1365 -o log/outfile1365 -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/outfile%TESTNUMBER -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1365
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER
 </postcheck>
 </client>
 
@@ -41,18 +41,18 @@ perl %SRCDIR/libtest/notexists.pl log/1365
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1365 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/outfile1365">
+<file1 name="log/outfile%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/stdout1365">
+<file2 name="log/stdout%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
index 7a33c29955db5fd85be32a66cfe950276db71bbc..ae634cf65d34f63c4dd74929cb8f8f9a41e92d4b 100644 (file)
@@ -15,7 +15,7 @@ Server: test-server/fake
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1366; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 12345
 </data>
@@ -31,10 +31,10 @@ http
 HTTP GET -o fname and Content-Disposition, -D file
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1366 -o log/outfile1366 -D log/heads1366
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/outfile%TESTNUMBER -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1366 log/name1366
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -42,29 +42,29 @@ perl %SRCDIR/libtest/notexists.pl log/1366 log/name1366
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1366 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/outfile1366">
+<file1 name="log/outfile%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/heads1366">
+<file2 name="log/heads%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1366; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 </file2>
 
-<file3 name="log/stdout1366">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
index 211b20b7d028a8057bc6a1b2f291e12174b8f504..a74a4c423a3c1b690fb140d805daec54bab7b05e 100644 (file)
@@ -15,7 +15,7 @@ Server: test-server/fake
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1367; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 12345
 </data>
@@ -31,10 +31,10 @@ http
 HTTP GET -o fname and Content-Disposition, -D stdout
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1367 -o log/outfile1367 -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/outfile%TESTNUMBER -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1367 log/name1367
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -42,25 +42,25 @@ perl %SRCDIR/libtest/notexists.pl log/1367 log/name1367
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1367 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/outfile1367">
+<file1 name="log/outfile%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/stdout1367">
+<file2 name="log/stdout%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1367; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 </file2>
 
index 12bc53211b311b0c209c849d6ff89e7dde7ff5f0..629a635d9a5d7df5afd10c67b7c16b618b971e7e 100644 (file)
@@ -31,10 +31,10 @@ http
 HTTP GET -o fname -J without Content-Disposition, -D file
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1368 -J -o log/outfile1368 -D log/heads1368
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o log/outfile%TESTNUMBER -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1368
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER
 </postcheck>
 </client>
 
@@ -42,18 +42,18 @@ perl %SRCDIR/libtest/notexists.pl log/1368
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1368 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/outfile1368">
+<file1 name="log/outfile%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/heads1368">
+<file2 name="log/heads%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -63,7 +63,7 @@ Content-Type: text/html
 \r
 </file2>
 
-<file3 name="log/stdout1368">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
index 114c84a6013a242f51f5adf67608f6b353fdb435..08665d12dfc0617f0e1f4d29f3d7ade48cefcec2 100644 (file)
@@ -31,10 +31,10 @@ http
 HTTP GET -o fname -J without Content-Disposition, -D stdout
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1369 -J -o log/outfile1369 -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o log/outfile%TESTNUMBER -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1369
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER
 </postcheck>
 </client>
 
@@ -42,18 +42,18 @@ perl %SRCDIR/libtest/notexists.pl log/1369
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1369 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/outfile1369">
+<file1 name="log/outfile%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/stdout1369">
+<file2 name="log/stdout%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
index b8e2726a08f145d5e04ad059569aa8f052e53d11..7766f09ff50d39fc65ab916531fe353972891f74 100644 (file)
@@ -25,7 +25,7 @@ ftp
 FTP download without size in RETR string
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/blalbla/lululul/137
+ftp://%HOSTIP:%FTPPORT/blalbla/lululul/%TESTNUMBER
 </command>
 </client>
 
@@ -39,8 +39,8 @@ CWD blalbla
 CWD lululul\r
 EPSV\r
 TYPE I\r
-SIZE 137\r
-RETR 137\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 576ca84383d225bd99544e87bb09e9ccfc9d8432..96e7e745786307c0fd39bc6321a7eb8a880da8fb 100644 (file)
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1370; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 12345
 </data>
@@ -32,10 +32,10 @@ http
 HTTP GET -o fname -J and Content-Disposition, -D file
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1370 -J -o log/outfile1370 -D log/heads1370
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o log/outfile%TESTNUMBER -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1370 log/name1370
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -43,29 +43,29 @@ perl %SRCDIR/libtest/notexists.pl log/1370 log/name1370
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1370 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/outfile1370">
+<file1 name="log/outfile%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/heads1370">
+<file2 name="log/heads%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1370; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 </file2>
 
-<file3 name="log/stdout1370">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
index 9a5a3c438a712a9bdb49af5f5f8647291d29ed69..aa5c69a752205c301b448583868d7ac0d00dea16 100644 (file)
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1371; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 12345
 </data>
@@ -32,10 +32,10 @@ http
 HTTP GET -o fname -J and Content-Disposition, -D stdout
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1371 -J -o log/outfile1371 -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o log/outfile%TESTNUMBER -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1371 log/name1371
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -43,25 +43,25 @@ perl %SRCDIR/libtest/notexists.pl log/1371 log/name1371
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1371 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/outfile1371">
+<file1 name="log/outfile%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/stdout1371">
+<file2 name="log/stdout%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1371; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 </file2>
 
index 7f079e6cf0513e5df57b53543321b913d03bf82f..29c478cdf6e7a9156ae0483529514387cdae4f2a 100644 (file)
@@ -30,10 +30,10 @@ http
 HTTP GET -o fname -i without Content-Disposition, -D file
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1372 -i -o log/outfile1372 -D log/heads1372
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o log/outfile%TESTNUMBER -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1372
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER
 </postcheck>
 </client>
 
@@ -41,14 +41,14 @@ perl %SRCDIR/libtest/notexists.pl log/1372
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1372 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/outfile1372">
+<file1 name="log/outfile%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -59,7 +59,7 @@ Content-Type: text/html
 12345
 </file1>
 
-<file2 name="log/heads1372">
+<file2 name="log/heads%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -69,7 +69,7 @@ Content-Type: text/html
 \r
 </file2>
 
-<file3 name="log/stdout1372">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
index 5e94144f8f6e4d3b5395abfcc30dabeaad145017..b4c737d68dda0229726664e76b48f2b237b1fe50 100644 (file)
@@ -30,10 +30,10 @@ http
 HTTP GET -o fname -i without Content-Disposition, -D stdout
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1373 -i -o log/outfile1373 -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o log/outfile%TESTNUMBER -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1373
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER
 </postcheck>
 </client>
 
@@ -41,14 +41,14 @@ perl %SRCDIR/libtest/notexists.pl log/1373
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1373 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/outfile1373">
+<file1 name="log/outfile%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -59,7 +59,7 @@ Content-Type: text/html
 12345
 </file1>
 
-<file2 name="log/stdout1373">
+<file2 name="log/stdout%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
index e8379c5af80b7e56f0789e690d2008b6be1067bb..07bd3bb5a6fd46d94b43010a14519b63a0974351 100644 (file)
@@ -15,7 +15,7 @@ Server: test-server/fake
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1374; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 12345
 </data>
@@ -31,10 +31,10 @@ http
 HTTP GET -o fname -i and Content-Disposition, -D file
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1374 -i -o log/outfile1374 -D log/heads1374
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o log/outfile%TESTNUMBER -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1374 log/name1374
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -42,37 +42,37 @@ perl %SRCDIR/libtest/notexists.pl log/1374 log/name1374
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1374 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/outfile1374">
+<file1 name="log/outfile%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1374; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 12345
 </file1>
 
-<file2 name="log/heads1374">
+<file2 name="log/heads%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1374; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 </file2>
 
-<file3 name="log/stdout1374">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
index f7ff0eebc9873c28ee53c01880c35f827d65205c..2acdb54a156e315dc01081003875dd4905075c9b 100644 (file)
@@ -15,7 +15,7 @@ Server: test-server/fake
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1375; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 12345
 </data>
@@ -31,10 +31,10 @@ http
 HTTP GET -o fname -i and Content-Disposition, -D stdout
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1375 -i -o log/outfile1375 -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o log/outfile%TESTNUMBER -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1375 log/name1375
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -42,33 +42,33 @@ perl %SRCDIR/libtest/notexists.pl log/1375 log/name1375
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1375 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/outfile1375">
+<file1 name="log/outfile%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1375; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 12345
 </file1>
 
-<file2 name="log/stdout1375">
+<file2 name="log/stdout%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1375; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 </file2>
 
index c78f0ed6462f552431c61852d0f452a76a3fed81..f81f35fe3d5a0754706c340b76d3d093595faab9 100644 (file)
@@ -30,10 +30,10 @@ http
 HTTP GET -o fname -i without Content-Disposition, without -D
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1376 -i -o log/outfile1376
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o log/outfile%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1376
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER
 </postcheck>
 </client>
 
@@ -41,14 +41,14 @@ perl %SRCDIR/libtest/notexists.pl log/1376
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1376 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/outfile1376">
+<file1 name="log/outfile%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -59,7 +59,7 @@ Content-Type: text/html
 12345
 </file1>
 
-<file2 name="log/stdout1376">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
 
 </verify>
index d08c3ac941dd38050a1da6e8246a3d67a481a8f2..745f08f4891ffe27f4fb5a6975c016eb206936df 100644 (file)
@@ -15,7 +15,7 @@ Server: test-server/fake
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1377; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 12345
 </data>
@@ -31,10 +31,10 @@ http
 HTTP GET -o fname -i and Content-Disposition, without -D
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1377 -i -o log/outfile1377
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o log/outfile%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1377 log/name1377
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -42,26 +42,26 @@ perl %SRCDIR/libtest/notexists.pl log/1377 log/name1377
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1377 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/outfile1377">
+<file1 name="log/outfile%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1377; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 12345
 </file1>
 
-<file2 name="log/stdout1377">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
 
 </verify>
index e004afcaf2c74e63ced7079159d907c807507771..d04e740bf83d5afa0ef66a5a179607e6407797bf 100644 (file)
@@ -23,10 +23,10 @@ ftp
 FTP DL, file without Content-Disposition inside, using -o fname
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1378 -o log/download1378
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1378
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER
 </postcheck>
 </client>
 
@@ -39,17 +39,17 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1378\r
-RETR file1378\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/download1378">
+<file1 name="log/download%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/stdout1378">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
 
 </verify>
index 81314b6db6fbca4b79ecafd96d9dc3f31bc5478d..e611ac6b812ffb2b0638a1c94375d0df9f5a2142 100644 (file)
@@ -23,10 +23,10 @@ ftp
 FTP DL, file without C-D inside, using -o fname -D file
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1379 -o log/download1379 -D log/heads1379
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1379
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER
 </postcheck>
 </client>
 
@@ -39,17 +39,17 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1379\r
-RETR file1379\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/download1379">
+<file1 name="log/download%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/heads1379">
+<file2 name="log/heads%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -62,14 +62,14 @@ mooo
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted\r
 213 10\r
-150 Binary data connection for 1379 () (10 bytes).\r
+150 Binary data connection for %TESTNUMBER () (10 bytes).\r
 226 File transfer complete\r
 </file2>
 <stripfile2>
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout1379">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
index 873313848ef0acb0c9c0039e3e9a8c3da48e797b..f70eb078e9344caf77d698c3d1a4c335ae06d63e 100644 (file)
@@ -28,7 +28,7 @@ ftp
 FTP download without size in RETR string and no SIZE command
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/blalbla/lululul/138
+ftp://%HOSTIP:%FTPPORT/blalbla/lululul/%TESTNUMBER
 </command>
 </client>
 
@@ -42,8 +42,8 @@ CWD blalbla
 CWD lululul\r
 EPSV\r
 TYPE I\r
-SIZE 138\r
-RETR 138\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index e71527001b8634906a9ef110cab86c877f117f5d..3cc52613baaf853e77a1177d0d226a91064d7e39 100644 (file)
@@ -23,10 +23,10 @@ ftp
 FTP DL, file without C-D inside, using -o fname -D stdout
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1380 -o log/download1380 -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1380
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER
 </postcheck>
 </client>
 
@@ -39,17 +39,17 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1380\r
-RETR file1380\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/download1380">
+<file1 name="log/download%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/stdout1380">
+<file2 name="log/stdout%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -62,7 +62,7 @@ mooo
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted\r
 213 10\r
-150 Binary data connection for 1380 () (10 bytes).\r
+150 Binary data connection for %TESTNUMBER () (10 bytes).\r
 226 File transfer complete\r
 </file2>
 <stripfile2>
index a55c6b588687c39f941fd34784c20037255fe54f..a62ee4748427457df623fcd8bd0307dd5d5811e8 100644 (file)
@@ -24,10 +24,10 @@ ftp
 FTP DL, file without C-D inside, using -o fname -J -D file
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1381 -o log/download1381 -J -D log/heads1381
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -J -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1381
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER
 </postcheck>
 </client>
 
@@ -40,17 +40,17 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1381\r
-RETR file1381\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/download1381">
+<file1 name="log/download%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/heads1381">
+<file2 name="log/heads%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -63,14 +63,14 @@ mooo
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted\r
 213 10\r
-150 Binary data connection for 1381 () (10 bytes).\r
+150 Binary data connection for %TESTNUMBER () (10 bytes).\r
 226 File transfer complete\r
 </file2>
 <stripfile2>
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout1381">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
index a657e1fe2d70572201413e8cc0f6efd7e67be069..8c49877b1a152b76436d4e27f5dbdfeeb675b105 100644 (file)
@@ -24,10 +24,10 @@ ftp
 FTP DL, file without C-D inside, using -o fname -J -D stdout
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1382 -o log/download1382 -J -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -J -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1382
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER
 </postcheck>
 </client>
 
@@ -40,17 +40,17 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1382\r
-RETR file1382\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/download1382">
+<file1 name="log/download%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/stdout1382">
+<file2 name="log/stdout%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -63,7 +63,7 @@ mooo
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted\r
 213 10\r
-150 Binary data connection for 1382 () (10 bytes).\r
+150 Binary data connection for %TESTNUMBER () (10 bytes).\r
 226 File transfer complete\r
 </file2>
 <stripfile2>
index 0694a22407c747888c3989cf22a54a76f7994bce..34f3cf6bc5c1f32db682dd87dbef1490c3f64771 100644 (file)
@@ -23,10 +23,10 @@ ftp
 FTP DL, file without C-D inside, using -o fname -i -D file
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1383 -o log/download1383 -i -D log/heads1383
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -i -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1383
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER
 </postcheck>
 </client>
 
@@ -39,17 +39,17 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1383\r
-RETR file1383\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/download1383">
+<file1 name="log/download%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/heads1383">
+<file2 name="log/heads%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -62,14 +62,14 @@ mooo
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted\r
 213 10\r
-150 Binary data connection for 1383 () (10 bytes).\r
+150 Binary data connection for %TESTNUMBER () (10 bytes).\r
 226 File transfer complete\r
 </file2>
 <stripfile2>
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout1383">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
index c07c266b4c4ce31d6cf49f89b8a73403ce84f429..f27d59a754bf54e04f5f7ec8be610523cd67fe53 100644 (file)
@@ -23,10 +23,10 @@ ftp
 FTP DL, file without C-D inside, using -o fname -i -D stdout
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1384 -o log/download1384 -i -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -i -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1384
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER
 </postcheck>
 </client>
 
@@ -39,17 +39,17 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1384\r
-RETR file1384\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/download1384">
+<file1 name="log/download%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/stdout1384">
+<file2 name="log/stdout%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -62,7 +62,7 @@ mooo
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted\r
 213 10\r
-150 Binary data connection for 1384 () (10 bytes).\r
+150 Binary data connection for %TESTNUMBER () (10 bytes).\r
 226 File transfer complete\r
 </file2>
 <stripfile2>
index ee35ab7046961e085f26ec74ce1d8eec33ddff6e..e35c674b3a0ab9836bb4dbe0709bec4a6d7252f0 100644 (file)
@@ -23,10 +23,10 @@ ftp
 FTP DL, file without C-D inside, using -o fname -i, without -D
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1385 -o log/download1385 -i
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -i
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1385
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER
 </postcheck>
 </client>
 
@@ -39,17 +39,17 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1385\r
-RETR file1385\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/download1385">
+<file1 name="log/download%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/stdout1385">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
 
 </verify>
index ceaebd72e4eca0b35e55ba4da298682628799352..471493b44fefeb8c27ff6914de85a582880ba9e7 100644 (file)
@@ -8,7 +8,7 @@ RETR
 
 # Server-side
 <reply>
-# file1386 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1386; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 MOOOO
 </data>
@@ -31,10 +31,10 @@ ftp
 FTP DL, file with Content-Disposition inside, using -o fname
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1386 -o log/download1386
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1386 log/name1386
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -47,24 +47,24 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1386\r
-RETR file1386\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/download1386">
+<file1 name="log/download%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1386; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 MOOOO
 </file1>
 
-<file2 name="log/stdout1386">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
 
 </verify>
index 8bacfcbbfa3d61acb53e47c164874c0cce33097a..c8f5ae6d7b20ada215bd0fdb2a88f6284329ff78 100644 (file)
@@ -8,7 +8,7 @@ RETR
 
 # Server-side
 <reply>
-# file1387 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1387; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 MOOOO
 </data>
@@ -31,10 +31,10 @@ ftp
 FTP DL, file with C-D inside, using -o fname -D file
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1387 -o log/download1387 -D log/heads1387
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1387 log/name1387
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -47,24 +47,24 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1387\r
-RETR file1387\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/download1387">
+<file1 name="log/download%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1387; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 MOOOO
 </file1>
 
-<file2 name="log/heads1387">
+<file2 name="log/heads%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -77,14 +77,14 @@ MOOOO
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted\r
 213 222\r
-150 Binary data connection for 1387 () (222 bytes).\r
+150 Binary data connection for %TESTNUMBER () (222 bytes).\r
 226 File transfer complete\r
 </file2>
 <stripfile2>
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout1387">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
index a8046a3fac51630d7a410b6a33472fe2e30771b6..479ca42f022a2dd96927815990806b11ee357465 100644 (file)
@@ -8,7 +8,7 @@ RETR
 
 # Server-side
 <reply>
-# file1388 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1388; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 MOOOO
 </data>
@@ -31,10 +31,10 @@ ftp
 FTP DL, file with C-D inside, using -o fname -D stdout
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1388 -o log/download1388 -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1388 log/name1388
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -47,24 +47,24 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1388\r
-RETR file1388\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/download1388">
+<file1 name="log/download%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1388; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 MOOOO
 </file1>
 
-<file2 name="log/stdout1388">
+<file2 name="log/stdout%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -77,7 +77,7 @@ MOOOO
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted\r
 213 222\r
-150 Binary data connection for 1388 () (222 bytes).\r
+150 Binary data connection for %TESTNUMBER () (222 bytes).\r
 226 File transfer complete\r
 </file2>
 <stripfile2>
index 8387a2395032ca4a098f2c74d5afb17f6419e134..eb35d39f5c901f5c47db852ae8440a1cd5807757 100644 (file)
@@ -9,7 +9,7 @@ RETR
 
 # Server-side
 <reply>
-# file1389 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1389; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 MOOOO
 </data>
@@ -32,10 +32,10 @@ ftp
 FTP DL, file with C-D inside, using -o fname -J -D file
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1389 -o log/download1389 -J -D log/heads1389
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -J -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1389 log/name1389
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -48,24 +48,24 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1389\r
-RETR file1389\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/download1389">
+<file1 name="log/download%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1389; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 MOOOO
 </file1>
 
-<file2 name="log/heads1389">
+<file2 name="log/heads%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -78,14 +78,14 @@ MOOOO
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted\r
 213 222\r
-150 Binary data connection for 1389 () (222 bytes).\r
+150 Binary data connection for %TESTNUMBER () (222 bytes).\r
 226 File transfer complete\r
 </file2>
 <stripfile2>
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout1389">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
index 15a242b66d5fa62a4d1bc7df1476911fc8f361f2..ab04953c508ee0c3a656e4318c080a74a7ff8e62 100644 (file)
@@ -25,7 +25,7 @@ ftp
 FTP download a newer file with -z
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/blalbla/139 -z "1 jan 1989"
+ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -z "1 jan 1989"
 </command>
 </client>
 
@@ -36,11 +36,11 @@ USER anonymous
 PASS ftp@example.com\r
 PWD\r
 CWD blalbla\r
-MDTM 139\r
+MDTM %TESTNUMBER\r
 EPSV\r
 TYPE I\r
-SIZE 139\r
-RETR 139\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 10ed5d0f520ffc292158c71b43c0486934f967ee..fc30849d331128210e1b173ca71363dac22c86cb 100644 (file)
@@ -9,7 +9,7 @@ RETR
 
 # Server-side
 <reply>
-# file1390 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1390; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 MOOOO
 </data>
@@ -32,10 +32,10 @@ ftp
 FTP DL, file with C-D inside, using -o fname -J -D stdout
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1390 -o log/download1390 -J -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -J -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1390 log/name1390
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -48,24 +48,24 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1390\r
-RETR file1390\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/download1390">
+<file1 name="log/download%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1390; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 MOOOO
 </file1>
 
-<file2 name="log/stdout1390">
+<file2 name="log/stdout%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -78,7 +78,7 @@ MOOOO
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted\r
 213 222\r
-150 Binary data connection for 1390 () (222 bytes).\r
+150 Binary data connection for %TESTNUMBER () (222 bytes).\r
 226 File transfer complete\r
 </file2>
 <stripfile2>
index 94b5587f6dfde6968f8f2627ec0e749890a45a22..ce28e5aa746278fd0c38755fa888293f1ca321a6 100644 (file)
@@ -8,7 +8,7 @@ RETR
 
 # Server-side
 <reply>
-# file1391 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1391; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 MOOOO
 </data>
@@ -31,10 +31,10 @@ ftp
 FTP DL, file with C-D inside, using -o fname -i -D file
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1391 -o log/download1391 -i -D log/heads1391
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -i -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1391 log/name1391
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -47,24 +47,24 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1391\r
-RETR file1391\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/download1391">
+<file1 name="log/download%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1391; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 MOOOO
 </file1>
 
-<file2 name="log/heads1391">
+<file2 name="log/heads%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -77,14 +77,14 @@ MOOOO
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted\r
 213 222\r
-150 Binary data connection for 1391 () (222 bytes).\r
+150 Binary data connection for %TESTNUMBER () (222 bytes).\r
 226 File transfer complete\r
 </file2>
 <stripfile2>
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout1391">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
index 0d5607ed653f8f6de83158f4222fbd3b580ae015..99e13c349389f7eb35b216d48220f3c944e6f16f 100644 (file)
@@ -8,7 +8,7 @@ RETR
 
 # Server-side
 <reply>
-# file1392 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1392; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 MOOOO
 </data>
@@ -31,10 +31,10 @@ ftp
 FTP DL, file with C-D inside, using -o fname -i -D stdout
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1392 -o log/download1392 -i -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -i -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1392 log/name1392
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -47,24 +47,24 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1392\r
-RETR file1392\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/download1392">
+<file1 name="log/download%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1392; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 MOOOO
 </file1>
 
-<file2 name="log/stdout1392">
+<file2 name="log/stdout%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -77,7 +77,7 @@ MOOOO
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted\r
 213 222\r
-150 Binary data connection for 1392 () (222 bytes).\r
+150 Binary data connection for %TESTNUMBER () (222 bytes).\r
 226 File transfer complete\r
 </file2>
 <stripfile2>
index 1d4da7d93d1d75fe7dcca48b10b6e898a29e3dda..1402eaf4cd79b62e13f3a630a6139ef52b92a960 100644 (file)
@@ -8,7 +8,7 @@ RETR
 
 # Server-side
 <reply>
-# file1393 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1393; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 MOOOO
 </data>
@@ -31,10 +31,10 @@ ftp
 FTP DL, file with C-D inside, using -o fname -i, without -D
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1393 -o log/download1393 -i
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -i
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1393 log/name1393
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -47,24 +47,24 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE file1393\r
-RETR file1393\r
+SIZE file%TESTNUMBER\r
+RETR file%TESTNUMBER\r
 QUIT\r
 </protocol>
 
-<file1 name="log/download1393">
+<file1 name="log/download%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1393; charset=funny; option=strange\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 MOOOO
 </file1>
 
-<file2 name="log/stdout1393">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
 
 </verify>
index f6c568ede4e1d7e86e62f120a36d8ed5b8fb75f6..f2bf61004eaceeda08a56dfd54420864ecc17903 100644 (file)
@@ -24,14 +24,14 @@ http
 HTTP HEAD with Connection: close
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/14 -i --head
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -i --head
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-HEAD /want/14 HTTP/1.1\r
+HEAD /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 4d8bc85c75237a4ea3562fa9f4da6fd023db3cb3..36a01cc1c2fc1eb7473d3b505c4b6aa9be512191 100644 (file)
@@ -24,7 +24,7 @@ ftp
 FTP download file with -z, expected to not transfer
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/blalbla/140 -z "1 jan 2004"
+ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -z "1 jan 2004"
 </command>
 </client>
 
@@ -35,7 +35,7 @@ USER anonymous
 PASS ftp@example.com\r
 PWD\r
 CWD blalbla\r
-MDTM 140\r
+MDTM %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 04b2e0c9514219884e50ff80a5fb5ec804b5c840..08fa023d4144db4526c19c727fdfcc9548d995d5 100644 (file)
@@ -31,14 +31,14 @@ http
 SSL_CERT_FILE=
 </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/1400 --libcurl log/test1400.c
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl log/test%TESTNUMBER.c
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/1400 HTTP/1.1\r
+GET /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -55,7 +55,7 @@ $_ = '' if /CURLOPT_HTTP_VERSION/
 $_ = '' if /CURLOPT_HTTP09_ALLOWED/
 $_ = '' if /CURLOPT_INTERLEAVEDATA/
 </stripfile>
-<file name="log/test1400.c" mode="text">
+<file name="log/test%TESTNUMBER.c" mode="text">
 /********* Sample code generated by the curl command line tool **********
  * All curl_easy_setopt() options are documented at:
  * https://curl.se/libcurl/c/curl_easy_setopt.html
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
 
   hnd = curl_easy_init();
   curl_easy_setopt(hnd, CURLOPT_BUFFERSIZE, 102400L);
-  curl_easy_setopt(hnd, CURLOPT_URL, "http://%HOSTIP:%HTTPPORT/we/want/1400");
+  curl_easy_setopt(hnd, CURLOPT_URL, "http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER");
   curl_easy_setopt(hnd, CURLOPT_USERAGENT, "stripped");
   curl_easy_setopt(hnd, CURLOPT_MAXREDIRS, 50L);
   curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L);
index 7c1620951b12ce4ac35c2106a1425d45363f1ee3..609b34ce01eebc595b4022f766caacb37f993ff8 100644 (file)
@@ -35,14 +35,14 @@ http
 SSL_CERT_FILE=
 </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/1401 --libcurl log/test1401.c --basic -u fake:user -H "X-Files: Mulder" -H "X-Men: cyclops, iceman" -A MyUA -b chocolate=chip --proto "=http,ftp,file"
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl log/test%TESTNUMBER.c --basic -u fake:user -H "X-Files: Mulder" -H "X-Men: cyclops, iceman" -A MyUA -b chocolate=chip --proto "=http,ftp,file"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/1401 HTTP/1.1\r
+GET /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic ZmFrZTp1c2Vy\r
 User-Agent: MyUA\r
@@ -60,7 +60,7 @@ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
 $_ = '' if /CURLOPT_HTTP_VERSION/
 $_ = '' if /CURLOPT_INTERLEAVEDATA/
 </stripfile>
-<file name="log/test1401.c" mode="text">
+<file name="log/test%TESTNUMBER.c" mode="text">
 /********* Sample code generated by the curl command line tool **********
  * All curl_easy_setopt() options are documented at:
  * https://curl.se/libcurl/c/curl_easy_setopt.html
@@ -79,7 +79,7 @@ int main(int argc, char *argv[])
 
   hnd = curl_easy_init();
   curl_easy_setopt(hnd, CURLOPT_BUFFERSIZE, 102400L);
-  curl_easy_setopt(hnd, CURLOPT_URL, "http://%HOSTIP:%HTTPPORT/we/want/1401");
+  curl_easy_setopt(hnd, CURLOPT_URL, "http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER");
   curl_easy_setopt(hnd, CURLOPT_USERPWD, "fake:user");
   curl_easy_setopt(hnd, CURLOPT_HTTPAUTH, (long)CURLAUTH_BASIC);
   curl_easy_setopt(hnd, CURLOPT_HTTPHEADER, slist1);
index 990d3f94e723f8613f755c23aa5a73d85264a317..89515a8cec55bb2d2af8b679b8480708e0dbeab4 100644 (file)
@@ -32,14 +32,14 @@ http
 SSL_CERT_FILE=
 </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/1402 --libcurl log/test1402.c -d "foo=bar" -d "baz=quux"
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl log/test%TESTNUMBER.c -d "foo=bar" -d "baz=quux"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /we/want/1402 HTTP/1.1\r
+POST /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -58,7 +58,7 @@ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
 $_ = '' if /CURLOPT_HTTP_VERSION/
 $_ = '' if /CURLOPT_INTERLEAVEDATA/
 </stripfile>
-<file name="log/test1402.c" mode="text">
+<file name="log/test%TESTNUMBER.c" mode="text">
 /********* Sample code generated by the curl command line tool **********
  * All curl_easy_setopt() options are documented at:
  * https://curl.se/libcurl/c/curl_easy_setopt.html
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
 
   hnd = curl_easy_init();
   curl_easy_setopt(hnd, CURLOPT_BUFFERSIZE, 102400L);
-  curl_easy_setopt(hnd, CURLOPT_URL, "http://%HOSTIP:%HTTPPORT/we/want/1402");
+  curl_easy_setopt(hnd, CURLOPT_URL, "http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER");
   curl_easy_setopt(hnd, CURLOPT_POSTFIELDS, "foo=bar&baz=quux");
   curl_easy_setopt(hnd, CURLOPT_POSTFIELDSIZE_LARGE, (curl_off_t)16);
   curl_easy_setopt(hnd, CURLOPT_USERAGENT, "stripped");
index 8f1eec403877efb3a46076fb5e5893aa13b1afe2..f8964f86bea17f4ea8dff095f4a3c9eeb187ff4b 100644 (file)
@@ -32,14 +32,14 @@ http
 SSL_CERT_FILE=
 </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/1403 --libcurl log/test1403.c -G -d "foo=bar" -d "baz=quux"
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl log/test%TESTNUMBER.c -G -d "foo=bar" -d "baz=quux"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/1403?foo=bar&baz=quux HTTP/1.1\r
+GET /we/want/%TESTNUMBER?foo=bar&baz=quux HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -55,7 +55,7 @@ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
 $_ = '' if /CURLOPT_HTTP_VERSION/
 $_ = '' if /CURLOPT_INTERLEAVEDATA/
 </stripfile>
-<file name="log/test1403.c" mode="text">
+<file name="log/test%TESTNUMBER.c" mode="text">
 /********* Sample code generated by the curl command line tool **********
  * All curl_easy_setopt() options are documented at:
  * https://curl.se/libcurl/c/curl_easy_setopt.html
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
 
   hnd = curl_easy_init();
   curl_easy_setopt(hnd, CURLOPT_BUFFERSIZE, 102400L);
-  curl_easy_setopt(hnd, CURLOPT_URL, "http://%HOSTIP:%HTTPPORT/we/want/1403?foo=bar&baz=quux");
+  curl_easy_setopt(hnd, CURLOPT_URL, "http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER?foo=bar&baz=quux");
   curl_easy_setopt(hnd, CURLOPT_USERAGENT, "stripped");
   curl_easy_setopt(hnd, CURLOPT_MAXREDIRS, 50L);
   curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L);
index 400fb65c2704a3ce4ba6238eb44e8f5253bb423e..49f66a1cc2341a614c5608240d9cdd2ce85c6f38 100644 (file)
@@ -33,10 +33,10 @@ http
 SSL_CERT_FILE=
 </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/1404 -F name=value -F 'file=@log/test1404.txt,log/test1404.txt;type=magic/content;encoder=8bit,log/test1404.txt;headers=X-testheader-1: header 1;headers=X-testheader-2: header 2' --libcurl log/test1404.c
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=value -F 'file=@log/test%TESTNUMBER.txt,log/test%TESTNUMBER.txt;type=magic/content;encoder=8bit,log/test%TESTNUMBER.txt;headers=X-testheader-1: header 1;headers=X-testheader-2: header 2' --libcurl log/test%TESTNUMBER.c
 </command>
 # We create this file before the command is invoked!
-<file name="log/test1404.txt">
+<file name="log/test%TESTNUMBER.txt">
 dummy data
 </file>
 </client>
@@ -47,7 +47,7 @@ dummy data
 -----+\w+
 </strip>
 <protocol>
-POST /we/want/1404 HTTP/1.1\r
+POST /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -62,20 +62,20 @@ value
 Content-Disposition: form-data; name="file"\r
 Content-Type: multipart/mixed; boundary=----------------------------aaaaaaaaaaaa\r
 \r
-Content-Disposition: attachment; filename="test1404.txt"\r
+Content-Disposition: attachment; filename="test%TESTNUMBER.txt"\r
 Content-Type: text/plain\r
 \r
 dummy data
 \r
 ------------------------------9ef8d6205763\r
-Content-Disposition: attachment; filename="test1404.txt"\r
+Content-Disposition: attachment; filename="test%TESTNUMBER.txt"\r
 Content-Type: magic/content\r
 Content-Transfer-Encoding: 8bit\r
 \r
 dummy data
 \r
 ------------------------------9ef8d6205763\r
-Content-Disposition: attachment; filename="test1404.txt"\r
+Content-Disposition: attachment; filename="test%TESTNUMBER.txt"\r
 Content-Type: text/plain\r
 X-testheader-1: header 1\r
 X-testheader-2: header 2\r
@@ -98,7 +98,7 @@ $_ = '' if /CURLOPT_INTERLEAVEDATA/
 # CURL_DOES_CONVERSION generates an extra comment.
 $_ = '' if /\/\* "value" \*\//
 </stripfile>
-<file name="log/test1404.c" mode="text">
+<file name="log/test%TESTNUMBER.c" mode="text">
 /********* Sample code generated by the curl command line tool **********
  * All curl_easy_setopt() options are documented at:
  * https://curl.se/libcurl/c/curl_easy_setopt.html
@@ -123,7 +123,7 @@ int main(int argc, char *argv[])
 
   hnd = curl_easy_init();
   curl_easy_setopt(hnd, CURLOPT_BUFFERSIZE, 102400L);
-  curl_easy_setopt(hnd, CURLOPT_URL, "http://%HOSTIP:%HTTPPORT/we/want/1404");
+  curl_easy_setopt(hnd, CURLOPT_URL, "http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER");
   mime1 = curl_mime_init(hnd);
   part1 = curl_mime_addpart(mime1);
   curl_mime_data(part1, "value", CURL_ZERO_TERMINATED);
@@ -131,13 +131,13 @@ int main(int argc, char *argv[])
   part1 = curl_mime_addpart(mime1);
   mime2 = curl_mime_init(hnd);
   part2 = curl_mime_addpart(mime2);
-  curl_mime_filedata(part2, "log/test1404.txt");
+  curl_mime_filedata(part2, "log/test%TESTNUMBER.txt");
   part2 = curl_mime_addpart(mime2);
-  curl_mime_filedata(part2, "log/test1404.txt");
+  curl_mime_filedata(part2, "log/test%TESTNUMBER.txt");
   curl_mime_encoder(part2, "8bit");
   curl_mime_type(part2, "magic/content");
   part2 = curl_mime_addpart(mime2);
-  curl_mime_filedata(part2, "log/test1404.txt");
+  curl_mime_filedata(part2, "log/test%TESTNUMBER.txt");
   curl_mime_headers(part2, slist1, 1);
   slist1 = NULL;
   curl_mime_subparts(part1, mime2);
index b4087704f7b88183ea38511681277579bebe7665..0a144e1a405fd9184f494b5e01cc133e40b4308a 100644 (file)
@@ -36,7 +36,7 @@ ftp
 SSL_CERT_FILE=
 </setenv>
  <command>
-ftp://%HOSTIP:%FTPPORT/1405 -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FAIL" -Q "+*FAIL HARD" --libcurl log/test1405.c
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FAIL" -Q "+*FAIL HARD" --libcurl log/test%TESTNUMBER.c
 </command>
 </client>
 
@@ -53,12 +53,12 @@ PASV
 TYPE I\r
 NOOP 2\r
 FAIL HARD\r
-SIZE 1405\r
-RETR 1405\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 NOOP 3\r
 QUIT\r
 </protocol>
-<file name="log/test1405.c" mode="text">
+<file name="log/test%TESTNUMBER.c" mode="text">
 /********* Sample code generated by the curl command line tool **********
  * All curl_easy_setopt() options are documented at:
  * https://curl.se/libcurl/c/curl_easy_setopt.html
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
 
   hnd = curl_easy_init();
   curl_easy_setopt(hnd, CURLOPT_BUFFERSIZE, 102400L);
-  curl_easy_setopt(hnd, CURLOPT_URL, "ftp://%HOSTIP:%FTPPORT/1405");
+  curl_easy_setopt(hnd, CURLOPT_URL, "ftp://%HOSTIP:%FTPPORT/%TESTNUMBER");
   curl_easy_setopt(hnd, CURLOPT_QUOTE, slist1);
   curl_easy_setopt(hnd, CURLOPT_POSTQUOTE, slist2);
   curl_easy_setopt(hnd, CURLOPT_PREQUOTE, slist3);
index 38f68d11ee1a147d73f27ebbd9371871dc13876e..4983747790e986a9b5b30bef3251884c7c7651ae 100644 (file)
@@ -28,14 +28,14 @@ smtp
 <setenv>
 SSL_CERT_FILE=
 </setenv>
-<file name="log/test1406.eml">
+<file name="log/test%TESTNUMBER.eml">
 From: different\r
 To: another\r
 \r
 body\r
 </file>
  <command>
-smtp://%HOSTIP:%SMTPPORT/1406 --mail-rcpt recipient.one@example.com --mail-rcpt recipient.two@example.com --mail-from sender@example.com -T log/test1406.eml --libcurl log/test1406.c
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient.one@example.com --mail-rcpt recipient.two@example.com --mail-from sender@example.com -T log/test%TESTNUMBER.eml --libcurl log/test%TESTNUMBER.c
 </command>
 </client>
 
@@ -43,7 +43,7 @@ smtp://%HOSTIP:%SMTPPORT/1406 --mail-rcpt recipient.one@example.com --mail-rcpt
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 1406\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com> SIZE=38\r
 RCPT TO:<recipient.one@example.com>\r
 RCPT TO:<recipient.two@example.com>\r
@@ -57,7 +57,7 @@ To: another
 body\r
 .\r
 </upload>
-<file name="log/test1406.c" mode="text">
+<file name="log/test%TESTNUMBER.c" mode="text">
 /********* Sample code generated by the curl command line tool **********
  * All curl_easy_setopt() options are documented at:
  * https://curl.se/libcurl/c/curl_easy_setopt.html
@@ -76,7 +76,7 @@ int main(int argc, char *argv[])
 
   hnd = curl_easy_init();
   curl_easy_setopt(hnd, CURLOPT_BUFFERSIZE, 102400L);
-  curl_easy_setopt(hnd, CURLOPT_URL, "smtp://%HOSTIP:%SMTPPORT/1406");
+  curl_easy_setopt(hnd, CURLOPT_URL, "smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER");
   curl_easy_setopt(hnd, CURLOPT_UPLOAD, 1L);
   curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L);
   curl_easy_setopt(hnd, CURLOPT_FTP_SKIP_PASV_IP, 1L);
index a7e13ba7585f80510600128d86bb7590294c7e5a..5dba13943a67a7255ab75f3df3b93ce1cc6e47a3 100644 (file)
@@ -13,7 +13,7 @@ LIST
 # Server-side
 <reply>
 <servercmd>
-REPLY LIST +OK 1407 100\r\n.
+REPLY LIST +OK %TESTNUMBER 100\r\n.
 </servercmd>
 </reply>
 
@@ -30,7 +30,7 @@ pop3
 SSL_CERT_FILE=
 </setenv>
 <command>
-pop3://%HOSTIP:%POP3PORT/1407 -l -u user:secret --libcurl log/test1407.c
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -l -u user:secret --libcurl log/test%TESTNUMBER.c
 </command>
 </client>
 
@@ -41,10 +41,10 @@ pop3://%HOSTIP:%POP3PORT/1407 -l -u user:secret --libcurl log/test1407.c
 CAPA\r
 USER user\r
 PASS secret\r
-LIST 1407\r
+LIST %TESTNUMBER\r
 QUIT\r
 </protocol>
-<file name="log/test1407.c" mode="text">
+<file name="log/test%TESTNUMBER.c" mode="text">
 /********* Sample code generated by the curl command line tool **********
  * All curl_easy_setopt() options are documented at:
  * https://curl.se/libcurl/c/curl_easy_setopt.html
@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
 
   hnd = curl_easy_init();
   curl_easy_setopt(hnd, CURLOPT_BUFFERSIZE, 102400L);
-  curl_easy_setopt(hnd, CURLOPT_URL, "pop3://%HOSTIP:%POP3PORT/1407");
+  curl_easy_setopt(hnd, CURLOPT_URL, "pop3://%HOSTIP:%POP3PORT/%TESTNUMBER");
   curl_easy_setopt(hnd, CURLOPT_DIRLISTONLY, 1L);
   curl_easy_setopt(hnd, CURLOPT_USERPWD, "user:secret");
   curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L);
index f3acb0c9f6e685579ea31c317b085a46f0adb2e4..d4f40f72e9c7cf0a22cb8b8c1316c6021305f8a2 100644 (file)
@@ -48,7 +48,7 @@ http-ipv6
 HTTP receive cookies over IPV6
  </name>
  <command>
--c log/jar1408 -g http://%HOST6IP:%HTTP6PORT/path/14080001 http://%HOST6IP:%HTTP6PORT/path/14080002
+-c log/jar%TESTNUMBER -g http://%HOST6IP:%HTTP6PORT/path/%TESTNUMBER0001 http://%HOST6IP:%HTTP6PORT/path/%TESTNUMBER0002
 </command>
 </client>
 
@@ -56,12 +56,12 @@ HTTP receive cookies over IPV6
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /path/14080001 HTTP/1.1\r
+GET /path/%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOST6IP:%HTTP6PORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /path/14080002 HTTP/1.1\r
+GET /path/%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOST6IP:%HTTP6PORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 8d54b4c951852d5651f64e359447358909e7e750..120bf3cf39c54ea031ba8458f8a66f86453179b8 100644 (file)
@@ -17,7 +17,7 @@ none
 Pass in string to -C
  </name>
  <command>
-http://%HOSTIP:%NOLISTENPORT/1409 -C wrong
+http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER -C wrong
 </command>
 </client>
 
index 694d87c38ee9bb154e91f838356dc7c5329703c3..3fff42d9b306a6205927d8eed722d7e4f4ad1b7d 100644 (file)
@@ -26,7 +26,7 @@ ftp
 FTP download info with -I
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/blalbla/141 -I
+ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -I
 </command>
 </client>
 
@@ -37,9 +37,9 @@ USER anonymous
 PASS ftp@example.com\r
 PWD\r
 CWD blalbla\r
-MDTM 141\r
+MDTM %TESTNUMBER\r
 TYPE I\r
-SIZE 141\r
+SIZE %TESTNUMBER\r
 REST 0\r
 QUIT\r
 </protocol>
index a8b89db3fca2b2a688573579764aa215752ae533..65e52d4065285e94101a10d6a478de20d2a154e0 100644 (file)
@@ -17,7 +17,7 @@ none
 Pass in negative number to --max-time
  </name>
  <command>
-http://%HOSTIP:%NOLISTENPORT/1410 --max-time -4
+http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER --max-time -4
 </command>
 </client>
 
index f251ecc026af4a3c8a8c3b7e1bbd898608607565..a7d23ee2f16b83a1150d95ad6b83bb76b149f618 100644 (file)
@@ -36,10 +36,10 @@ http
 HTTP with zero size file PUT
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1411 -T log/empty1411
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/empty%TESTNUMBER
 </command>
 # create an empty file
-<file name="log/empty1411">
+<file name="log/empty%TESTNUMBER">
 </file>
 </client>
 
@@ -47,7 +47,7 @@ http://%HOSTIP:%HTTPPORT/1411 -T log/empty1411
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /1411 HTTP/1.1\r
+PUT /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 808ed17f2f3bf94248843efd26b121d5bca3abc2..20521704c9c9d7e42b5fa39304d69e255e0544f7 100644 (file)
@@ -94,9 +94,9 @@ crypto
 HTTP GET with --anyauth with two URLs (picking Digest) 
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1412 -u testuser:testpass --anyauth http://%HOSTIP:%HTTPPORT/14120001
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001
 </command>
-<file name="log/put1412">
+<file name="log/put%TESTNUMBER">
 This is data we upload with PUT
 a second line
 line three
@@ -107,25 +107,25 @@ four is the number of lines
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1412 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /1412 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/1412", response="0390dbe89e31adca0413d11f91f30e7f"\r
+Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/%TESTNUMBER", response="0390dbe89e31adca0413d11f91f30e7f"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /14120001 HTTP/1.1\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /14120001 HTTP/1.1\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/14120001", response="0085df91870374c8bf4e94415e7fbf8e"\r
+Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/%TESTNUMBER0001", response="0085df91870374c8bf4e94415e7fbf8e"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index cbb2608724e97a363907fab7e729e29760cd40a7..920417baed0e844412aa2a663161c7f779ee9883 100644 (file)
@@ -11,7 +11,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 302 OK swsclose\r
-Location: moo.html/14130002#fragmentpart\r
+Location: moo.html/%TESTNUMBER0002#fragmentpart\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Connection: close\r
 \r
@@ -26,7 +26,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 302 OK swsclose\r
-Location: moo.html/14130002#fragmentpart\r
+Location: moo.html/%TESTNUMBER0002#fragmentpart\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Connection: close\r
 \r
@@ -49,7 +49,7 @@ http
 HTTP redirect with fragment in new URL
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/this/1413 -L
+http://%HOSTIP:%HTTPPORT/this/%TESTNUMBER -L
 </command>
 </client>
 
@@ -57,12 +57,12 @@ http://%HOSTIP:%HTTPPORT/this/1413 -L
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /this/1413 HTTP/1.1\r
+GET /this/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /this/moo.html/14130002 HTTP/1.1\r
+GET /this/moo.html/%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 444037839f63a928731b14c05330e15b39f5a125..33214b04f275a574b4d25e6c9b23fe1509d9db4e 100644 (file)
@@ -32,7 +32,7 @@ ftp
 FTP PORT without SIZE or EPRT support
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1414 -P -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P -
 </command>
 </client>
 
@@ -49,8 +49,8 @@ PWD
 EPRT |1|
 PORT
 TYPE I\r
-SIZE 1414\r
-RETR 1414\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index e0f330e1151c3484c182f4d721afdc0726d2f7ef..79b14e6bd5b4ddb522809adf3c1d3b3375bbca27 100644 (file)
@@ -44,7 +44,7 @@ Delete expired cookies
 TZ=GMT
 </setenv>
 <command>
-http://example.com/we/want/1415 -b none -c log/jar1415.txt -x %HOSTIP:%HTTPPORT
+http://example.com/we/want/%TESTNUMBER -b none -c log/jar%TESTNUMBER.txt -x %HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -54,7 +54,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://example.com/we/want/1415 HTTP/1.1\r
+GET http://example.com/we/want/%TESTNUMBER HTTP/1.1\r
 Host: example.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -62,7 +62,7 @@ Proxy-Connection: Keep-Alive
 \r
 </protocol>
 
-<file name="log/jar1415.txt" mode="text">
+<file name="log/jar%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
index f6e9bbfe4c9152e50a82ea9e68e89d3689fa9f23..f3c6ba590e5e577e6abdfaa14880721ce26542df 100644 (file)
@@ -37,7 +37,7 @@ http
 HTTP GET with chunked Transfer-Encoding overflowed chunked size
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1416
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -45,7 +45,7 @@ http://%HOSTIP:%HTTPPORT/1416
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1416 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index a141b11d26ce7a2d4e5b2aaf7ca657120074a536..a0dd086d57de683fc98ebbcf4fcfde191ec9b640 100644 (file)
@@ -49,7 +49,7 @@ http
 HTTP GET with chunked encoding and chunked trailer without CRs
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1417 -D log/heads1417
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D log/heads%TESTNUMBER
 </command>
 </client>
 
@@ -57,13 +57,13 @@ http://%HOSTIP:%HTTPPORT/1417 -D log/heads1417
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1417 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file name="log/heads1417">
+<file name="log/heads%TESTNUMBER">
 HTTP/1.1 200 funky chunky!\r
 Server: fakeit/0.9 fakeitbad/1.0\r
 Transfer-Encoding: chunked\r
index 51d2e5f0af64c62abbefeb228c3925ea2ead9a31..83c38b0f38a713151f50023e1df675d1df6fc8fa 100644 (file)
@@ -87,32 +87,32 @@ crypto
 HTTP with --anyauth and connection re-use
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1418 -u testuser:testpass --anyauth http://%HOSTIP:%HTTPPORT/14180003
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth http://%HOSTIP:%HTTPPORT/%TESTNUMBER0003
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1418 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /1418 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="loonie", nonce="314156592", uri="/1418", response="986238b7e0077754944c966f56d9bc77"\r
+Authorization: Digest username="testuser", realm="loonie", nonce="314156592", uri="/%TESTNUMBER", response="986238b7e0077754944c966f56d9bc77"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /14180003 HTTP/1.1\r
+GET /%TESTNUMBER0003 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /14180003 HTTP/1.1\r
+GET /%TESTNUMBER0003 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="loonie", nonce="314156592", uri="/14180003", response="1c6390a67bac3283a9b023402f3b3540"\r
+Authorization: Digest username="testuser", realm="loonie", nonce="314156592", uri="/%TESTNUMBER0003", response="1c6390a67bac3283a9b023402f3b3540"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index 6d05f0b5a09f5bfb129856de7d453410393e837c..6be31498a4057539342a12138f45460bea926f8e 100644 (file)
@@ -45,19 +45,19 @@ http
 HTTP with --anyauth (but no auth!) and connection re-use
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1419 --anyauth http://%HOSTIP:%HTTPPORT/14190003
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --anyauth http://%HOSTIP:%HTTPPORT/%TESTNUMBER0003
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1419 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /14190003 HTTP/1.1\r
+GET /%TESTNUMBER0003 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index e26aa192a9e595038d080a7fc2b921d55540666a..f64dddb5967c37a5802c29f2cd7555d2cd4a241a 100644 (file)
@@ -20,7 +20,7 @@ ftp
 FTP URL with 150 dir levels
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/part1/part2/part3/part4/part5/part6/part7/part8/part9/part10/part11/part12/part13/part14/part15/part16/part17/part18/part19/part20/part21/part22/part23/part24/part25/part26/part27/part28/part29/part30/part31/part32/part33/part34/part35/part36/part37/part38/part39/part40/part41/part42/part43/part44/part45/part46/part47/part48/part49/part50/part51/part52/part53/part54/part55/part56/part57/part58/part59/part60/part61/part62/part63/part64/part65/part66/part67/part68/part69/part70/part71/part72/part73/part74/part75/part76/part77/part78/part79/part80/part81/part82/part83/part84/part85/part86/part87/part88/part89/part90/part91/part92/part93/part94/part95/part96/part97/part98/part99/part100/part101/part102/part103/part104/part105/part106/part107/part108/part109/part110/part111/part112/part113/part114/part115/part116/part117/part118/part119/part120/part121/part122/part123/part124/part125/part126/part127/part128/part129/part130/part131/part132/part133/part134/part135/part136/part137/part138/part139/part140/part141/part142/part143/part144/part145/part146/part147/part148/part149/part150/142
+ftp://%HOSTIP:%FTPPORT/part1/part2/part3/part4/part5/part6/part7/part8/part9/part10/part11/part12/part13/part14/part15/part16/part17/part18/part19/part20/part21/part22/part23/part24/part25/part26/part27/part28/part29/part30/part31/part32/part33/part34/part35/part36/part37/part38/part39/part40/part41/part42/part43/part44/part45/part46/part47/part48/part49/part50/part51/part52/part53/part54/part55/part56/part57/part58/part59/part60/part61/part62/part63/part64/part65/part66/part67/part68/part69/part70/part71/part72/part73/part74/part75/part76/part77/part78/part79/part80/part81/part82/part83/part84/part85/part86/part87/part88/part89/part90/part91/part92/part93/part94/part95/part96/part97/part98/part99/part100/part101/part102/part103/part104/part105/part106/part107/part108/part109/part110/part111/part112/part113/part114/part115/part116/part117/part118/part119/part120/part121/part122/part123/part124/part125/part126/part127/part128/part129/part130/part131/part132/part133/part134/part135/part136/part137/part138/part139/part140/part141/part142/part143/part144/part145/part146/part147/part148/part149/part150/%TESTNUMBER
 </command>
 </client>
 
@@ -182,8 +182,8 @@ CWD part149
 CWD part150\r
 EPSV\r
 TYPE I\r
-SIZE 142\r
-RETR 142\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 4b8d7bbf4187395aa025ec1dac1d13de31c62314..d100a61395aaca2cbd4931dafd3c65f5db19086f 100644 (file)
@@ -36,7 +36,7 @@ imap
 SSL_CERT_FILE=
 </setenv>
 <command>
-'imap://%HOSTIP:%IMAPPORT/1420/;MAILINDEX=1' -u user:secret --libcurl log/test1420.c
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret --libcurl log/test%TESTNUMBER.c
 </command>
 </client>
 
@@ -46,11 +46,11 @@ SSL_CERT_FILE=
 <protocol>
 A001 CAPABILITY\r
 A002 LOGIN user secret\r
-A003 SELECT 1420\r
+A003 SELECT %TESTNUMBER\r
 A004 FETCH 1 BODY[]\r
 A005 LOGOUT\r
 </protocol>
-<file name="log/test1420.c" mode="text">
+<file name="log/test%TESTNUMBER.c" mode="text">
 /********* Sample code generated by the curl command line tool **********
  * All curl_easy_setopt() options are documented at:
  * https://curl.se/libcurl/c/curl_easy_setopt.html
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
 
   hnd = curl_easy_init();
   curl_easy_setopt(hnd, CURLOPT_BUFFERSIZE, 102400L);
-  curl_easy_setopt(hnd, CURLOPT_URL, "imap://%HOSTIP:%IMAPPORT/1420/;MAILINDEX=1");
+  curl_easy_setopt(hnd, CURLOPT_URL, "imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1");
   curl_easy_setopt(hnd, CURLOPT_USERPWD, "user:secret");
   curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L);
   curl_easy_setopt(hnd, CURLOPT_FTP_SKIP_PASV_IP, 1L);
index c219770e3e5a5080cc93bee879b6c4475d3fb003..5b55547ceff22eec8ebb00786be985a7b6f12981 100644 (file)
@@ -33,7 +33,7 @@ http
 Re-using HTTP proxy connection for two different host names
  </name>
  <command>
---proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.1421:8990/ http://different.remote.haxx.se.1421:8990
+--proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.%TESTNUMBER:8990/ http://different.remote.haxx.se.%TESTNUMBER:8990
 </command>
 <features>
 proxy
@@ -56,14 +56,14 @@ Content-Length: 6
 -foo-
 </stdout>
 <protocol>
-GET http://test.remote.haxx.se.1421:8990/ HTTP/1.1\r
-Host: test.remote.haxx.se.1421:8990\r
+GET http://test.remote.haxx.se.%TESTNUMBER:8990/ HTTP/1.1\r
+Host: test.remote.haxx.se.%TESTNUMBER:8990\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://different.remote.haxx.se.1421:8990/ HTTP/1.1\r
-Host: different.remote.haxx.se.1421:8990\r
+GET http://different.remote.haxx.se.%TESTNUMBER:8990/ HTTP/1.1\r
+Host: different.remote.haxx.se.%TESTNUMBER:8990\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
index b6489ed4479663c53b1fd6b2898d5f9d090ff4b1..7cd1d1345675eec0c94bb4d37646654b2e5f3e1f 100644 (file)
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 0\r
 Connection: close\r
 Content-Type: text/html\r
-Content-Disposition: filename=name1422; charset=funny; option=str//nge\r
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=str//nge\r
 \r
 </data>
 </reply>
@@ -40,7 +40,7 @@ HTTP GET with -O -J and Content-Disposition (empty file)
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1422 -J -O file://%PWD/log/name1422
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O file://%PWD/log/name%TESTNUMBER
 </command>
 </client>
 
@@ -48,14 +48,14 @@ http://%HOSTIP:%HTTPPORT/1422 -J -O file://%PWD/log/name1422
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1422 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/name1422">
+<file1 name="log/name%TESTNUMBER">
 </file1>
 
 </verify>
index 62dbe93f472fc16a12196e029c53153e9d192f78..2eb1d8003a7cad8acc4ccb1518fd09e3831f3d32 100644 (file)
@@ -30,10 +30,10 @@ file
 HTTP GET -o fname without Content-Disposition (empty file)
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1423 -o log/outfile1423 file://%PWD/log/outfile1423
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/outfile%TESTNUMBER file://%PWD/log/outfile%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1423
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER
 </postcheck>
 </client>
 
@@ -41,14 +41,14 @@ perl %SRCDIR/libtest/notexists.pl log/1423
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1423 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/outfile1423">
+<file1 name="log/outfile%TESTNUMBER">
 </file1>
 
 </verify>
index 8f922e620b4559f3e22938bed92268f12155cb7a..ebe5f5213b48ecb9a57a661ccc0b63c2775fa727 100644 (file)
@@ -46,11 +46,11 @@ http
 <name>
 HTTP GET -o fname without Content-Disposition (unmet time condition)
 </name>
-<file name="log/outfile1424">
+<file name="log/outfile%TESTNUMBER">
 original contents
 </file>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1424 -z "dec 12 11:00:00 1999 GMT" -o log/outfile1424
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 11:00:00 1999 GMT" -o log/outfile%TESTNUMBER
 </command>
 </client>
 
@@ -58,7 +58,7 @@ http://%HOSTIP:%HTTPPORT/1424 -z "dec 12 11:00:00 1999 GMT" -o log/outfile1424
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1424 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -66,7 +66,7 @@ If-Modified-Since: Sun, 12 Dec 1999 11:00:00 GMT
 \r
 </protocol>
 
-<file1 name="log/outfile1424">
+<file1 name="log/outfile%TESTNUMBER">
 original contents
 </file1>
 
index 4d2bc24c8857386a63dcf391c5e5caac6487931e..2bd6d84379aab247fb674921723e47f8488924fc 100644 (file)
Binary files a/tests/data/test1425 and b/tests/data/test1425 differ
index d8317fc2b79c79d007a79215b26f248007cf211c..9ed994a56afc1e0e033f9d796f0ed219c7e8e875 100644 (file)
Binary files a/tests/data/test1426 and b/tests/data/test1426 differ
index 648b1da56b59e4b8fbc6488dd86dbf831e30d4d9..adce46a84c089bab0321571d30a19ec8aba64fd7 100644 (file)
@@ -15,7 +15,7 @@ none
 too large -m timeout value
  </name>
  <command>
-http://%HOSTIP:%NOLISTENPORT/1427 -m 184467440737095510
+http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER -m 184467440737095510
 </command>
 </client>
 
index 24cbcffa67ab44e3745b78438cc021af72b8e696..ac91fd2f5629bfb404dec715b15f1eab969e94a6 100644 (file)
@@ -50,7 +50,7 @@ http-proxy
 HTTP over proxy-tunnel with --proxy-header and --header
  </name>
  <command>
-http://test.1428:%HTTPPORT/we/want/that/page/1428 -p -x %HOSTIP:%PROXYPORT --user 'iam:my:;self' --header "header-type: server" --proxy-header "header-type: proxy"
+http://test.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -p -x %HOSTIP:%PROXYPORT --user 'iam:my:;self' --header "header-type: server" --proxy-header "header-type: proxy"
 </command>
 <features>
 proxy
@@ -61,16 +61,16 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT test.1428:%HTTPPORT HTTP/1.1\r
-Host: test.1428:%HTTPPORT\r
+CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
+Host: test.%TESTNUMBER:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 header-type: proxy\r
 \r
 </proxy>
 <protocol>
-GET /we/want/that/page/1428 HTTP/1.1\r
-Host: test.1428:%HTTPPORT\r
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1\r
+Host: test.%TESTNUMBER:%HTTPPORT\r
 Authorization: Basic aWFtOm15OjtzZWxm\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 40bc86b1d8995edab5ce03da53c9235ede60f91c..9fc3cd24666a3e38e9482b3539c37d207416acaa 100644 (file)
@@ -35,7 +35,7 @@ http
 HTTP GET with 4-digit response code
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1429 --write-out '%{response_code}' --http0.9
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --write-out '%{response_code}' --http0.9
 </command>
 </client>
 
@@ -58,7 +58,7 @@ Funny-head: yesyes
 234
 </stdout>
 <protocol>
-GET /1429 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 22bec33237a534a38c33d6c745513778f821b997..be5b33571d059a8418ecd503528a6c5168d6fb49 100644 (file)
@@ -22,7 +22,7 @@ ftp
 FTP URL with type=a
  </name>
  <command>
-"ftp://%HOSTIP:%FTPPORT/%2ftmp/moo/143;type=a"
+"ftp://%HOSTIP:%FTPPORT/%2ftmp/moo/%TESTNUMBER;type=a"
 </command>
 </client>
 
@@ -37,7 +37,7 @@ CWD tmp
 CWD moo\r
 EPSV\r
 TYPE A\r
-RETR 143\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index d227aa74abb53d6c17e842cb846ed28aa27c878d..3dbeae8560ec7f346bb47050270cd8c9fc5ff8c3 100644 (file)
@@ -33,7 +33,7 @@ http
 HTTP GET with negative response code
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1430
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -41,7 +41,7 @@ http://%HOSTIP:%HTTPPORT/1430
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1430 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 2f52347b4e9ac9a14ede16dfbcfc276180f1baa9..be6277d89b2c8d9345473f486a71c7334cfb6d4b 100644 (file)
@@ -33,7 +33,7 @@ http
 HTTP GET with single-digit response code
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1431
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -41,7 +41,7 @@ http://%HOSTIP:%HTTPPORT/1431
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1431 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index eeddcfdeb12068ba2688360e865cf8482b09873d..ab76e94b085edad5cb23a5df526c995afaca45ea 100644 (file)
@@ -34,7 +34,7 @@ http
 HTTP GET with 100-digit response code and survive
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1432
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -42,7 +42,7 @@ http://%HOSTIP:%HTTPPORT/1432
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1432 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 0de9c26180e1e7e773f65faa783faea4179d64ce..ac5081635871536d7f05d2aba03687d7361d35cd 100644 (file)
@@ -34,7 +34,7 @@ http
 HTTP GET with 100-digit subversion number in response
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1433
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -42,7 +42,7 @@ http://%HOSTIP:%HTTPPORT/1433
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1433 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 55031be71e907cf577e3df8e0b640bbff8659480..4801ee2c0281dfba0653470930198d962bcead43 100644 (file)
@@ -58,9 +58,9 @@ http
 HTTP GET resume at exactly the existing file size is fine
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1434 -C 100
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 100
 </command>
-<file name="log/curl1434.out">
+<file name="log/curl%TESTNUMBER.out">
 012345678
 012345678
 012345678
@@ -77,7 +77,7 @@ http://%HOSTIP:%HTTPPORT/1434 -C 100
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1434 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=100-\r
 User-Agent: curl/%VERSION\r
index 73262498e2ce770b49089b82aae04a3b3a3d486a..5e91f0289271640cebc741591a30ff797e4a7475 100644 (file)
@@ -28,13 +28,13 @@ http-unix
 simple HTTP GET over Unix socket
  </name>
  <command>
---unix-socket %HTTPUNIXPATH http://server-interpreted.example.com/1435
+--unix-socket %HTTPUNIXPATH http://server-interpreted.example.com/%TESTNUMBER
 </command>
 </client>
 
 <verify>
 <protocol>
-GET /1435 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: server-interpreted.example.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 040b3b389967f09a256eeec5c273f40b8bb8dbe1..38190f4a8573cdeef97b052c38793a82d837262b 100644 (file)
@@ -42,23 +42,23 @@ http-unix
 HTTP requests with multiple connections over Unix socket
  </name>
  <command>
---unix-socket %HTTPUNIXPATH http://one.example.com/14360001 http://two.example.com/14360002 http://one.example.com/14360003
+--unix-socket %HTTPUNIXPATH http://one.example.com/%TESTNUMBER0001 http://two.example.com/%TESTNUMBER0002 http://one.example.com/%TESTNUMBER0003
 </command>
 </client>
 
 <verify>
 <protocol>
-GET /14360001 HTTP/1.1\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: one.example.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /14360002 HTTP/1.1\r
+GET /%TESTNUMBER0002 HTTP/1.1\r
 Host: two.example.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /14360003 HTTP/1.1\r
+GET /%TESTNUMBER0003 HTTP/1.1\r
 Host: one.example.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 07346a9e8c22de14295654b469543b9b4dc8f7c7..87a36d56518f484213d568a2e858181594b1ebed 100644 (file)
@@ -59,21 +59,21 @@ crypto
 HTTP with duplicated WWW-Authenticate parameters
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1437 -u testuser:testpass --digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1437 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /1437 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/1437", response="4376eb639bf8e7343a6e7b56e1b89c4f", algorithm=MD5\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/%TESTNUMBER", response="4376eb639bf8e7343a6e7b56e1b89c4f", algorithm=MD5\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index 5d509b58fab4883a2fb06b66f2d89370724479ad..40a25bfd45b6f6e07645ad8e9208ef01b07bb2c6 100644 (file)
@@ -29,7 +29,7 @@ http
 Check if %{scheme} returns HTTP
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1438 --write-out '%{scheme}'
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --write-out '%{scheme}'
 </command>
 </client>
 
@@ -46,7 +46,7 @@ testdata
 HTTP
 </stdout>
 <protocol>
-GET /1438 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 561c715f94f46eb7ef23e49f0a4c2094799f04d7..9a9196e4b6d85e74447e3ffe3464155c95539a3f 100644 (file)
@@ -29,7 +29,7 @@ http
 Check if %{http_version} returns 1.1
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1439 --write-out '%{http_version}'
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --write-out '%{http_version}'
 </command>
 </client>
 
@@ -46,7 +46,7 @@ testdata
 1.1
 </stdout>
 <protocol>
-GET /1439 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index bc029ddfdd0bacc3c0847314315c51b578801e5f..a59958ae734548f38560e2145ae49e4c51048ecc 100644 (file)
@@ -40,12 +40,12 @@ HTTP GET with -O and --remote-time
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1443 -O --remote-time
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O --remote-time
 </command>
 # Verify the mtime of the file. The mtime is specifically chosen to be an even
 # number so that it can be represented exactly on a FAT filesystem.
 <postcheck>
-perl -e 'exit((stat("log/1443"))[9] != 960898200)'
+perl -e 'exit((stat("log/%TESTNUMBER"))[9] != 960898200)'
 </postcheck>
 </client>
 
@@ -53,13 +53,13 @@ perl -e 'exit((stat("log/1443"))[9] != 960898200)'
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1443 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file name="log/1443">
+<file name="log/%TESTNUMBER">
 12345
 </file>
 </verify>
index 7eec21b999d74726ad2e5bd7d9d96caef6549678..71b5f0ea0643ca6d243b0b012643193e8c0bdb2b 100644 (file)
@@ -26,12 +26,12 @@ ftp
 FTP with --remote-time
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1444 --remote-time
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --remote-time
 </command>
 # Verify the mtime of the file. The mtime is specifically chosen to be an even
 # number so that it can be represented exactly on a FAT filesystem.
 <postcheck>
-perl -e 'exit((stat("log/curl1444.out"))[9] != 1234567890)'
+perl -e 'exit((stat("log/curl%TESTNUMBER.out"))[9] != 1234567890)'
 </postcheck>
 </client>
 
@@ -41,11 +41,11 @@ perl -e 'exit((stat("log/curl1444.out"))[9] != 1234567890)'
 USER anonymous\r
 PASS ftp@example.com\r
 PWD\r
-MDTM 1444\r
+MDTM %TESTNUMBER\r
 EPSV\r
 TYPE I\r
-SIZE 1444\r
-RETR 1444\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 936c9aea6e706039a8ecd4d6c5a5f2bcf2cf870e..1811e071fe6566acdf3d1bdcd19695566bd6c80e 100644 (file)
@@ -15,17 +15,17 @@ FILE
 file
 </server>
 <precheck>
-perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test1445.dir
+perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test%TESTNUMBER.dir
 </precheck>
  <name>
 file:// with --remote-time
  </name>
  <command>
-file://localhost%FILE_PWD/log/test1445.dir/plainfile.txt --remote-time
+file://localhost%FILE_PWD/log/test%TESTNUMBER.dir/plainfile.txt --remote-time
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test1445.dir && \
-perl -e 'exit((stat("log/curl1445.out"))[9] != 946728000)'
+perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test%TESTNUMBER.dir && \
+perl -e 'exit((stat("log/curl%TESTNUMBER.out"))[9] != 946728000)'
 </postcheck>
 </client>
 
index 637df583fe159fd1ed105a0a396044c04cd483e7..0088375b4335a4e566557d67ee97f208556c96f2 100644 (file)
@@ -18,17 +18,17 @@ SFTP
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test1446.dir
+perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test%TESTNUMBER.dir
 </precheck>
  <name>
 SFTP with --remote-time
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test1446.dir/rofile.txt --insecure --remote-time
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.dir/rofile.txt --insecure --remote-time
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test1446.dir && \
-perl -e 'exit((stat("log/curl1446.out"))[9] != 978264000)'
+perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test%TESTNUMBER.dir && \
+perl -e 'exit((stat("log/curl%TESTNUMBER.out"))[9] != 978264000)'
 </postcheck>
 </client>
 
index e0f88b9fb4645cb1210684fa8cd6424130a1fa37..600f724156226b925b6e32def54474e03221bcf3 100644 (file)
@@ -18,7 +18,7 @@ HTTP/1.1 302 OK swsbounce
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 9
 Content-Type: text/plain
-Location: http://åäö.se:%HTTPPORT/14480001
+Location: http://åäö.se:%HTTPPORT/%TESTNUMBER0001
 
 redirect
 </data>
@@ -53,7 +53,7 @@ Redirect following to UTF-8 IDN host name
  </name>
 
  <command>
-http://åäö.se:%HTTPPORT/1448 --resolve xn--4cab6c.se:%HTTPPORT:%HOSTIP -L --connect-to %HOSTIP:%HTTPPORT:%HOSTIP:%HTTPPORT
+http://åäö.se:%HTTPPORT/%TESTNUMBER --resolve xn--4cab6c.se:%HTTPPORT:%HOSTIP -L --connect-to %HOSTIP:%HTTPPORT:%HOSTIP:%HTTPPORT
 </command>
 </client>
 
@@ -61,12 +61,12 @@ http://åäö.se:%HTTPPORT/1448 --resolve xn--4cab6c.se:%HTTPPORT:%HOSTIP -L --c
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1448 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: xn--4cab6c.se:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /14480001 HTTP/1.1\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: xn--4cab6c.se:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -78,7 +78,7 @@ HTTP/1.1 302 OK swsbounce
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 9
 Content-Type: text/plain
-Location: http://åäö.se:%HTTPPORT/14480001
+Location: http://åäö.se:%HTTPPORT/%TESTNUMBER0001
 
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
index 1911b0272b268452952ee625874f13086a595312..ba24ef91227f8a5479d8dcdb05d8b3ff2dca8f05 100644 (file)
@@ -21,7 +21,7 @@ ftp
 FTP download range with integer overflow
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1449 -r 36893488147419103232-
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -r 36893488147419103232-
 </command>
 </client>
 
index 9337b8b990dfc0e19e080c907c3fcc1a74834b88..cdbd398f396eb9d9a762af12a0e93029a1321239 100644 (file)
@@ -26,7 +26,7 @@ smb
 Basic SMB request
 </name>
 <command>
--u 'curltest:curltest' smb://%HOSTIP:%SMBPORT/TESTS/1451
+-u 'curltest:curltest' smb://%HOSTIP:%SMBPORT/TESTS/%TESTNUMBER
 </command>
 <precheck>
 python -c "__import__('pkgutil').find_loader('impacket') or (__import__('sys').stdout.write('Test only works if Python package impacket is installed\n'), __import__('sys').exit(1))"
index 6c76ef84a5d829662625e62023aff73e67b4a785..d1b7fa9cdd9bf12170e4acec53f8b91d598f7f8e 100644 (file)
@@ -26,7 +26,7 @@ telnet
 Basic TELNET negotiation
  </name>
 <stdin>
-test1452
+test%TESTNUMBER
 </stdin>
  <command>
 telnet://%HOSTIP:%TELNETPORT --upload-file -
@@ -37,7 +37,7 @@ telnet://%HOSTIP:%TELNETPORT --upload-file -
 # Verify data after the test has been "shot"
 <verify>
 <stdout nonewline="yes">
-test1452
+test%TESTNUMBER
 </stdout>
 </verify>
 </testcase>
index 10468ba93590539ff75c80a5c3e3370720f54d68..23b76ff78a0700adb3082b46c6d896452a556912 100644 (file)
@@ -10,7 +10,7 @@ haproxy
 
 #
 # Server-side
-<reply name="1455">
+<reply name="%TESTNUMBER">
 <data nocheck="yes">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -37,7 +37,7 @@ http
 HTTP GET when PROXY Protocol enabled
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1455 --haproxy-protocol -H "Testno: 1455"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --haproxy-protocol -H "Testno: %TESTNUMBER"
 </command>
 <features>
 proxy
@@ -52,11 +52,11 @@ s/^PROXY TCP4 %CLIENTIP %HOSTIP (\d*) %HTTPPORT/proxy-line/
 </strippart>
 <protocol>
 proxy-line\r
-GET /1455 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
-Testno: 1455\r
+Testno: %TESTNUMBER\r
 \r
 </protocol>
 </verify>
index a633408e11ee9caa9629f5d869b54c7f71ab4778..4aca9ca4e6f544b383fc222f8dbc04187494fea5 100644 (file)
@@ -40,7 +40,7 @@ http-ipv6
 HTTP-IPv6 GET with PROXY protocol
  </name>
  <command>
--g "http://%HOST6IP:%HTTP6PORT/1456" --haproxy-protocol
+-g "http://%HOST6IP:%HTTP6PORT/%TESTNUMBER" --haproxy-protocol
 </command>
 <features>
 proxy
@@ -57,7 +57,7 @@ s/PROXY TCP6 ::1 ::1 (\d+) (\d+)/PROXY TCP6 ::1 ::1 $2/
 </strippart>
 <protocol>
 PROXY TCP6 ::1 ::1 %HTTP6PORT\r
-GET /1456 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOST6IP:%HTTP6PORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 23d7e37595c2360516494ca8a8866638cd34a56f..f34abb7c3d5b94b5eeb4f27b23a6763586e9de53 100644 (file)
@@ -29,7 +29,7 @@ http
 Check if %{stderr} and %{stdout} switch between stdout and stderr.
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1457 --silent --write-out 'line1%{stderr}line2%{stdout}line3'
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --silent --write-out 'line1%{stderr}line2%{stdout}line3'
 </command>
 </client>
 
@@ -49,7 +49,7 @@ line1line3
 line2
 </stderr>
 <protocol>
-GET /1457 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 8e3718b786eb3d1ce5bfbf08bf35fe26e48cd9e7..785ceae16f3e462e63f266b30ee4668de4af0d85 100644 (file)
@@ -36,7 +36,7 @@ http
 HTTP with wildcard --resolve
 </name>
 <command>
---resolve *:%HTTPPORT:%HOSTIP http://example.com:%HTTPPORT/1458
+--resolve *:%HTTPPORT:%HOSTIP http://example.com:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -44,7 +44,7 @@ HTTP with wildcard --resolve
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1458 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: example.com:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 3e89595e49c72a60f77c440af6b507a9628a327b..fde8bf1d60ee8111c7075ce4547c5e89740ff494 100644 (file)
@@ -13,7 +13,7 @@ known_hosts
 sftp
 </server>
 <precheck>
-mkdir -p %PWD/log/test1459.dir/.ssh
+mkdir -p %PWD/log/test%TESTNUMBER.dir/.ssh
 </precheck>
 <features>
 sftp
@@ -24,12 +24,12 @@ SFTP with corrupted known_hosts
  <command>
 -u : sftp://%HOSTIP:%SSHPORT/ -l
 </command>
-<file name="log/test1459.dir/.ssh/known_hosts">
+<file name="log/test%TESTNUMBER.dir/.ssh/known_hosts">
 |1|qy29Y1x/+/F39AzdG5515YSSw+c=|iB2WX5jrU3ZTWc+ZfGau7HHEvBc= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAynDN8cDJ3xNzRjTNNGciSHSxpubxhZ6YnkLdp1TkrGW8n\
 R93Ey5VtBeBblYTRlFXBWJgKFcTKBRJ/O4qBZwbUgt10AHj31i6h8NehfT19tR8wG/YCmj3KtYLHmwdzmW1edEL9G2NdX2KiKYv7/zuly3QvmP0QA0NhWkAz0KdWNM=
 </file>
 <setenv>
-CURL_HOME=%PWD/log/test1459.dir
+CURL_HOME=%PWD/log/test%TESTNUMBER.dir
 </setenv>
 </client>
 
index 3cd4bd5aabe5dfc177f47c0c7285e7a04a6c1e96..f9f01174fb954f2bfcd5e730a8359eb2c2d45015 100644 (file)
@@ -23,7 +23,7 @@ ftp
 persistent FTP with different paths
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/first/dir/here/146 ftp://%HOSTIP:%FTPPORT/146
+ftp://%HOSTIP:%FTPPORT/first/dir/here/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -43,12 +43,12 @@ CWD dir
 CWD here\r
 EPSV\r
 TYPE I\r
-SIZE 146\r
-RETR 146\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 CWD /\r
 EPSV\r
-SIZE 146\r
-RETR 146\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 1cc13353e925a472011e90cf9bf839528ba68e7c..8f6b5f29371ad130ddfdf6a25ea569b1312aa4a8 100644 (file)
@@ -14,7 +14,7 @@ HTTP/1.1 200 swsclose
   12345
 fooo
 54 3 2 1
-Content-Disposition: filename=name1460; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 </data>
 </reply>
@@ -37,9 +37,9 @@ HTTP GET with -Ji and Content-Disposition with existing file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1460 -Ji -O
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -Ji -O
 </command>
-<file name="log/name1460">
+<file name="log/name%TESTNUMBER">
 initial content
 </file>
 </client>
@@ -51,7 +51,7 @@ initial content
 <errorcode>
 2
 </errorcode>
-<file name="log/name1460">
+<file name="log/name%TESTNUMBER">
 initial content
 </file>
 
index 5a12b94e790464df44a10ea8641c69eeaefa45f1..ebbd5d6f1750f76d86973f8c0636940bf566f10c 100644 (file)
Binary files a/tests/data/test1465 and b/tests/data/test1465 differ
index 6651df03b0c94ba2bc6c0104a0270e4ace452461..066118648259453f79bc26a52f5594a8772c7c50 100644 (file)
@@ -25,7 +25,7 @@ ftp
 FTP with --ftp-create-dirs (failing CWD)
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/first/dir/here/147 --ftp-create-dirs
+ftp://%HOSTIP:%FTPPORT/first/dir/here/%TESTNUMBER --ftp-create-dirs
 </command>
 </client>
 
@@ -47,8 +47,8 @@ CWD dir
 CWD here\r
 EPSV\r
 TYPE I\r
-SIZE 147\r
-RETR 147\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 540c8fe330b9263c0cea7970defd3cb2edca1674..8e9f842d8e65d01979b54e6a89afd8ffca9dfb9b 100644 (file)
@@ -22,7 +22,7 @@ ftp
 FTP with --ftp-create-dirs (failing MKD)
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/attempt/to/get/this/148 --ftp-create-dirs
+ftp://%HOSTIP:%FTPPORT/attempt/to/get/this/%TESTNUMBER --ftp-create-dirs
 </command>
 </client>
 
index a5d1499829dba3c8a88de0979374f5828cb529f9..94ca5f793cccfb70a80acc06724ccd14d7e6252a 100644 (file)
@@ -18,9 +18,9 @@ ftp
 FTP with multiple uploads
  </name>
  <command>
--T log/upload149 ftp://%HOSTIP:%FTPPORT/dir1/149 -T log/upload149 ftp://%HOSTIP:%FTPPORT/dir2/149
+-T log/upload%TESTNUMBER ftp://%HOSTIP:%FTPPORT/dir1/%TESTNUMBER -T log/upload%TESTNUMBER ftp://%HOSTIP:%FTPPORT/dir2/%TESTNUMBER
 </command>
-<file name="log/upload149">
+<file name="log/upload%TESTNUMBER">
 send away this contents
 </file>
 </client>
@@ -39,14 +39,14 @@ PWD
 CWD dir1\r
 EPSV\r
 TYPE I\r
-STOR 149\r
+STOR %TESTNUMBER\r
 CWD /\r
 CWD dir2\r
 EPSV\r
-STOR 149\r
+STOR %TESTNUMBER\r
 QUIT\r
 </protocol>
-<file name="log/upload149">
+<file name="log/upload%TESTNUMBER">
 send away this contents
 </file>
 </verify>
index b71588f4ed51c0fb5be7ff82511026bed9b949b7..ad7c06cb3621ccb4421d4ccce3f8f2d8921ab5c3 100644 (file)
@@ -28,7 +28,7 @@ http
 --write-out test
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/15 --write-out "%{url_effective} %{http_code} %{size_download}\n"
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER --write-out "%{url_effective} %{http_code} %{size_download}\n"
 </command>
 </client>
 
@@ -42,10 +42,10 @@ Fake: yes
 Content-Length: 26\r
 \r
 Repeated nonsense-headers
-http://%HOSTIP:%HTTPPORT/want/15 200 26
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER 200 26
 </stdout>
 <protocol>
-GET /want/15 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 2179163de38491d7112f20d46c84af71d65e32a1..c8bd8632b93e3ebaa6d8e8af731a2fa17661ef7e 100644 (file)
@@ -74,7 +74,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/150 -u testuser:testpass --ntlm --fail
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm --fail
 </command>
 <precheck>
 chkhostname curlhost
@@ -84,13 +84,13 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /150 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /150 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
 User-Agent: curl/%VERSION\r
index 9f0bbe5ac7ea0cd0645f28f53bf9dacac8ceab01..241f227f99dfc99063fc1f7615ee10d6c1717f29 100644 (file)
@@ -31,14 +31,14 @@ http
 </features>
 # tool is what to use instead of 'curl'
 <tool>
-lib1500
+lib%TESTNUMBER
 </tool>
 
  <name>
 curl_multi_wait
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1500
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 </testcase>
index 8c7e13af73b0665cb7f331afe9ccabf93a74bbd3..9a10e0e7d438b37ca5898d08d6c669bb7a36928b 100644 (file)
@@ -24,13 +24,13 @@ DELAY TYPE 2
 ftp
 </server>
 <tool>
-lib1501
+lib%TESTNUMBER
 </tool>
  <name>
 FTP with multi interface and slow LIST response 
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1501/
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/
 </command>
 </client>
 # Verify data after the test has been "shot"
@@ -42,7 +42,7 @@ ftp://%HOSTIP:%FTPPORT/1501/
 USER anonymous\r
 PASS ftp@example.com\r
 PWD\r
-CWD 1501\r
+CWD %TESTNUMBER\r
 EPSV\r
 TYPE A\r
 LIST\r
index b76a14478cb20966bc44c0578a27fee674f3a34b..859a98fc803f68c5fbc94fdbf5fa36a9cc77f3e6 100644 (file)
@@ -32,13 +32,13 @@ Funny-head: yesyes
 http
 </server>
 <tool>
-lib1502
+lib%TESTNUMBER
 </tool>
  <name>
 HTTP multi with CURLOPT_RESOLVE, cleanup sequence UA
  </name>
  <command>
-http://google.com:%HTTPPORT/1502 %HTTPPORT %HOSTIP
+http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP
 </command>
 </client>
 
@@ -46,7 +46,7 @@ http://google.com:%HTTPPORT/1502 %HTTPPORT %HOSTIP
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1502 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: google.com:%HTTPPORT\r
 Accept: */*\r
 \r
index 8a49d207844f6df3963acc71c1c094cfeedf1c18..a093ac3bba52c0aba4efa233f9e390ff246ba1a1 100644 (file)
@@ -32,13 +32,13 @@ Funny-head: yesyes
 http
 </server>
 <tool>
-lib1503
+lib%TESTNUMBER
 </tool>
  <name>
 HTTP multi with CURLOPT_RESOLVE, cleanup sequence PA
  </name>
  <command>
-http://google.com:%HTTPPORT/1503 %HTTPPORT %HOSTIP
+http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP
 </command>
 </client>
 
@@ -46,7 +46,7 @@ http://google.com:%HTTPPORT/1503 %HTTPPORT %HOSTIP
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1503 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: google.com:%HTTPPORT\r
 Accept: */*\r
 \r
index 8702e5d361ca0d923e114c6189fcbd416039cd31..8dc4f1856a24f8c8445c314fbb44bfab540a2ce7 100644 (file)
@@ -32,13 +32,13 @@ Funny-head: yesyes
 http
 </server>
 <tool>
-lib1504
+lib%TESTNUMBER
 </tool>
  <name>
 HTTP multi with CURLOPT_RESOLVE, cleanup sequence UB
  </name>
  <command>
-http://google.com:%HTTPPORT/1504 %HTTPPORT %HOSTIP
+http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP
 </command>
 </client>
 
@@ -46,7 +46,7 @@ http://google.com:%HTTPPORT/1504 %HTTPPORT %HOSTIP
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1504 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: google.com:%HTTPPORT\r
 Accept: */*\r
 \r
index 25d4c2e63b4c379fc1d5399cd29ee891b503806c..9ddac46b8ea22a8feb77b48df8a50bbc50851a64 100644 (file)
@@ -32,13 +32,13 @@ Funny-head: yesyes
 http
 </server>
 <tool>
-lib1505
+lib%TESTNUMBER
 </tool>
  <name>
 HTTP multi with CURLOPT_RESOLVE, cleanup sequence PB
  </name>
  <command>
-http://google.com:%HTTPPORT/1505 %HTTPPORT %HOSTIP
+http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP
 </command>
 </client>
 
@@ -46,7 +46,7 @@ http://google.com:%HTTPPORT/1505 %HTTPPORT %HOSTIP
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1505 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: google.com:%HTTPPORT\r
 Accept: */*\r
 \r
index fead56631351e24fa938867d2a13dddd03c4c1cc..07d3aac99eb4cb2a08e370732d57d4d707854d2d 100644 (file)
@@ -49,32 +49,32 @@ file contents should appear once for each file
 http
 </server>
 <tool>
-lib1506
+lib%TESTNUMBER
 </tool>
  <name>
 HTTP GET connection cache limit (CURLMOPT_MAXCONNECTS)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/path/1506 %HOSTIP %HTTPPORT
+http://%HOSTIP:%HTTPPORT/path/%TESTNUMBER %HOSTIP %HTTPPORT
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /path/15060001 HTTP/1.1\r
+GET /path/%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
-GET /path/15060002 HTTP/1.1\r
+GET /path/%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
-GET /path/15060003 HTTP/1.1\r
+GET /path/%TESTNUMBER0003 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
-GET /path/15060004 HTTP/1.1\r
+GET /path/%TESTNUMBER0004 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
@@ -82,7 +82,7 @@ Accept: */*
 <strip>
 ^Host:.*
 </strip>
-<file name="log/stderr1506" mode="text">
+<file name="log/stderr%TESTNUMBER" mode="text">
 * Connection #0 to host server1.example.com left intact
 * Connection #1 to host server2.example.com left intact
 * Connection #2 to host server3.example.com left intact
index ab7b47eb31b54b61f438c0105db1b05810b50283..8208752adf1ae95fadf6e4f449562e17c5e16e74 100644 (file)
@@ -18,7 +18,7 @@ multi
 smtp
 </server>
 <tool>
-lib1507
+lib%TESTNUMBER
 </tool>
 
 # based on bug report #1184
@@ -32,7 +32,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/1507
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -40,9 +40,9 @@ smtp://%HOSTIP:%SMTPPORT/1507
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 1507\r
-MAIL FROM:<1507-realuser@example.com>\r
-RCPT TO:<1507-recipient@example.com>\r
+EHLO %TESTNUMBER\r
+MAIL FROM:<%TESTNUMBER-realuser@example.com>\r
+RCPT TO:<%TESTNUMBER-recipient@example.com>\r
 DATA\r
 </protocol>
 <upload>
index fbdc322a05bab611d48c59bb681c116e9b3bccaa..02cb90a671e59d24f6d5a1f43baa80ad1a0705d5 100644 (file)
@@ -12,19 +12,19 @@ multi
 none
 </server>
 <tool>
-lib1508
+lib%TESTNUMBER
 </tool>
  <name>
 Close a multi handle without using it
  </name>
  <command>
-http://%HOSTIP:%NOLISTENPORT/path/1508
+http://%HOSTIP:%NOLISTENPORT/path/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/stdout1508">
+<file name="log/stdout%TESTNUMBER">
 We are done
 </file>
 </verify>
index dfef1e9dd73044a5b57f938d3df57cfa94bb49da..baa0a30ca9d3efac143de736b410fc4f7a07c3da 100644 (file)
@@ -51,7 +51,7 @@ http-proxy
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib1509
+lib%TESTNUMBER
 </tool>
 <features>
 proxy
@@ -60,9 +60,9 @@ proxy
 simple multi http:// through proxytunnel with authentication info
  </name>
  <command>
-http://the.old.moo.1509:%HTTPPORT/1509 %HOSTIP:%PROXYPORT
+http://the.old.moo.%TESTNUMBER:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT
 </command>
-<file name="log/test1509.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo
    bar
 bar
@@ -74,14 +74,14 @@ moo
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT the.old.moo.1509:%HTTPPORT HTTP/1.1\r
-Host: the.old.moo.1509:%HTTPPORT\r
+CONNECT the.old.moo.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
+Host: the.old.moo.%TESTNUMBER:%HTTPPORT\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>
-GET /1509 HTTP/1.1\r
-Host: the.old.moo.1509:%HTTPPORT\r
+GET /%TESTNUMBER HTTP/1.1\r
+Host: the.old.moo.%TESTNUMBER:%HTTPPORT\r
 Accept: */*\r
 \r
 [DISCONNECT]
index 03a55b4dcf31280893fe46f099db40cfa96edf5b..d05c7a00056d7a93dd46305d2aaba3a605a5aaea 100644 (file)
@@ -28,14 +28,14 @@ http
 HTTP GET with an error code that might trick authentication
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/151
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /151 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index cf1fad7cd4f3b737bd7235787fc8b3466902ac7a..d021dfee679f085bee70753fa9aa493a5bb76fd1 100644 (file)
@@ -49,32 +49,32 @@ file contents should appear once for each file
 http
 </server>
 <tool>
-lib1510
+lib%TESTNUMBER
 </tool>
  <name>
 HTTP GET connection cache limit (CURLOPT_MAXCONNECTS)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/path/1510 %HOSTIP %HTTPPORT
+http://%HOSTIP:%HTTPPORT/path/%TESTNUMBER %HOSTIP %HTTPPORT
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /path/15100001 HTTP/1.1\r
+GET /path/%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
-GET /path/15100002 HTTP/1.1\r
+GET /path/%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
-GET /path/15100003 HTTP/1.1\r
+GET /path/%TESTNUMBER0003 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
-GET /path/15100004 HTTP/1.1\r
+GET /path/%TESTNUMBER0004 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
@@ -82,7 +82,7 @@ Accept: */*
 <strip>
 ^Host:.*
 </strip>
-<file name="log/stderr1510" mode="text">
+<file name="log/stderr%TESTNUMBER" mode="text">
 * Connection #0 to host server1.example.com left intact
 * Connection #1 to host server2.example.com left intact
 * Connection #2 to host server3.example.com left intact
index e57df7403f439fa802919f583b0cfa4dc3ae731e..094ccf9c67f86952bb71b25cc363bf2fa1af8c6e 100644 (file)
@@ -50,13 +50,13 @@ http
 http
 </features>
 <tool>
-lib1511
+lib%TESTNUMBER
 </tool>
 <name>
 HTTP GET time conditions in repeated requests
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1511
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
index 63947e89a531bc386cdb394fda946ccbba81eda9..7c04660fe5da81731d2fd7f904a39d1c7c91fad8 100644 (file)
@@ -48,24 +48,24 @@ file contents should appear once for each file
 http
 </server>
 <tool>
-lib1512
+lib%TESTNUMBER
 </tool>
  <name>
 GLOBAL CACHE test over two easy performs
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/path/1512 %HOSTIP %HTTPPORT
+http://%HOSTIP:%HTTPPORT/path/%TESTNUMBER %HOSTIP %HTTPPORT
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /path/15120001 HTTP/1.1\r
+GET /path/%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
-GET /path/15120002 HTTP/1.1\r
+GET /path/%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
index ba0c18a407979f5c044c93c5c75192509eeb870a..189d3e3948aebd34f8303a14f999041ba16a604b 100644 (file)
@@ -22,7 +22,7 @@ wait 10
 http
 </server>
 <tool>
-lib1513
+lib%TESTNUMBER
 </tool>
  <name>
 return failure immediately from progress callback
@@ -30,7 +30,7 @@ return failure immediately from progress callback
 
 # this server/host won't be used for real
  <command>
-http://%HOSTIP:%HTTPPORT/1513
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
index 6c09ae3b0e107ff38bf7948560049ce786903e4b..9990c6bb6a668612cccbbc8e03c47edf16160351 100644 (file)
@@ -24,13 +24,13 @@ Connection: close
 http
 </server>
 <tool>
-lib1514
+lib%TESTNUMBER
 </tool>
 <name>
 HTTP POST with read callback and unknown data size
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1514
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -39,7 +39,7 @@ http://%HOSTIP:%HTTPPORT/1514
 # Content-Length header is not present
 # Transfer-Encoding header is added automatically
 <protocol>
-POST /1514 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Transfer-Encoding: chunked\r
index 741792429d03b01c030753a6799f8792f1d21c97..c75671ad02a82899d09ddd1d7a8aa8b40eefc882 100644 (file)
@@ -43,13 +43,13 @@ hello
 http
 </server>
 <tool>
-lib1515
+lib%TESTNUMBER
 </tool>
 <name>
 caching of manual libcurl DNS entries after DNS cache timeout
 </name>
 <command>
-path/1515 %HOSTIP %HTTPPORT
+path/%TESTNUMBER %HOSTIP %HTTPPORT
 </command>
 </client>
 
index bf2cd1511dd86ad032e6b9c7b7412c5feb18b4d8..79f0275f03c3efc5d5460776e78eb48927b39c55 100644 (file)
@@ -45,7 +45,7 @@ lib1515
 caching of manual libcurl DNS entries after dead connection
 </name>
 <command>
-/path/1516 %HOSTIP %HTTPPORT
+/path/%TESTNUMBER %HOSTIP %HTTPPORT
 </command>
 </client>
 
index d0a4aeca3a9c44aea990b602ecf5279c66ae7b45..5150ff6edf79a1dc7c21aa8f3a6ca6857eb6d1bb 100644 (file)
@@ -37,14 +37,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib1517
+lib%TESTNUMBER
 </tool>
 
  <name>
 HTTP POST, server responds before completed send
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1517
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -55,7 +55,7 @@ http://%HOSTIP:%HTTPPORT/1517
 s/^(this is what we post to the silly web server)(\r)?\n//
 </strippart>
 <protocol>
-POST /1517 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Content-Length: 45\r
index 134ea4af6eb9a89c07884baf4269277641f94357..e1d0d5ceca75f24837dfb3c2dfe1c128e3b06e09 100644 (file)
@@ -29,14 +29,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib1518
+lib%TESTNUMBER
 </tool>
 
  <name>
 Extract Location: with broken URL
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1518
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -52,7 +52,7 @@ http://%HOSTIP:%HTTPPORT/1518
 res: 0
 status: 302
 redirects: 0
-effectiveurl: http://%HOSTIP:%HTTPPORT/1518
+effectiveurl: http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 redirecturl: http://1.2 .4.5/test
 </stdout>
 <errorcode>
index 292a49c65923d225ad30935127a951a0c2c2581b..835ef08060af4a34ee07c48934ff98bf70f9ca11 100644 (file)
@@ -36,7 +36,7 @@ lib1518
 Extract Location: with broken absolute URL
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1519
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -52,7 +52,7 @@ http://%HOSTIP:%HTTPPORT/1519
 res: 0
 status: 302
 redirects: 0
-effectiveurl: http://%HOSTIP:%HTTPPORT/1519
+effectiveurl: http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 redirecturl: http://%HOSTIP:%HTTPPORT/h%20ttp://1.2.4.5/test
 </stdout>
 <errorcode>
index 2c48b037952f64d23265b3989d6819315428ddd9..a558ed596b7f45680283ba458a6c1dc1bacdeb96 100644 (file)
@@ -29,14 +29,14 @@ http
 HTTP GET with an error code that might trick authentication and --fail
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/152 --fail
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /152 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 5f9344d94e525f955e38b0538742dde912c853a0..fc031ad00133d9ee4198d9bb863bf0f9cc24bcde 100644 (file)
@@ -13,7 +13,7 @@ SMTP
 smtp
 </server>
 <tool>
-lib1520
+lib%TESTNUMBER
 </tool>
 
  <name>
@@ -32,7 +32,7 @@ To: another
 body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/1520
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -40,7 +40,7 @@ smtp://%HOSTIP:%SMTPPORT/1520
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 1520\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient@example.com>\r
 DATA\r
index 791a50dc825b368bd1f2d61d9e4f879b46ed68cd..f086243e43718584d3097a485a2f5bc16162125a 100644 (file)
@@ -12,7 +12,7 @@ curl_easy_setopt
 none
 </server>
 <tool>
-lib1521
+lib%TESTNUMBER
 </tool>
 
  <name>
index 1b5873a84b3197aa045b68b1accbe4fd01605fa5..07dfb8209da2b2e1a1b0baf9f02fea2437ff909c 100644 (file)
@@ -29,7 +29,7 @@ Funny-head: yesyes
 http
 </server>
 <tool>
-lib1522
+lib%TESTNUMBER
 </tool>
 
 <name>
@@ -37,7 +37,7 @@ CURLINFO_SIZE_UPLOAD with small SO_SNDBUF
 </name>
 
 <command>
-http://%HOSTIP:%HTTPPORT/1522
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
index a6bf1d3f5bc217bd892556f33e24a1f21cda7b00..de31a43c9048879d2dc88d0718db018c6ad511e0 100644 (file)
@@ -27,7 +27,7 @@ writedelay: 1
 http
 </server>
 <tool>
-lib1523
+lib%TESTNUMBER
 </tool>
 
 <name>
@@ -35,7 +35,7 @@ CURLINFO_LOW_SPEED_LIMIT
 </name>
 
 <command>
-http://%HOSTIP:%HTTPPORT/1523
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 <killserver>
 http
index 3490540207cb8214c4187328271579c6df82cab5..39da646f59ac547e8d5a33a4248c0853f87579df 100644 (file)
@@ -11,7 +11,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 303 OK swsclose
-Location: moo.html&testcase=/15240002
+Location: moo.html&testcase=/%TESTNUMBER0002
 Connection: close
 
 </data>
@@ -24,7 +24,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 303 OK swsclose
-Location: moo.html&testcase=/15240002
+Location: moo.html&testcase=/%TESTNUMBER0002
 Connection: close
 
 HTTP/1.1 200 OK swsclose
@@ -45,9 +45,9 @@ http
 HTTP PUT with 303 redirect
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/blah/1524 -L -T log/upload1524.txt
+http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -T log/upload%TESTNUMBER.txt
 </command>
-<file name="log/upload1524.txt">
+<file name="log/upload%TESTNUMBER.txt">
 moo
 </file>
 </client>
@@ -56,7 +56,7 @@ moo
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-PUT /blah/1524 HTTP/1.1\r
+PUT /blah/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -64,7 +64,7 @@ Content-Length: 4
 Expect: 100-continue\r
 \r
 moo
-GET /blah/moo.html&testcase=/15240002 HTTP/1.1\r
+GET /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 396ba5106575885700b73c7d455bcc442cc63b6f..05c686300299e418b0b4646b46bc84e8b609afdd 100644 (file)
@@ -41,13 +41,13 @@ http
 http-proxy
 </server>
 <tool>
-lib1525
+lib%TESTNUMBER
 </tool>
  <name>
 CURLOPT_PROXYHEADER is ignored CURLHEADER_UNIFIED
  </name>
  <command>
- http://the.old.moo.1525:%HTTPPORT/1525 %HOSTIP:%PROXYPORT
+ http://the.old.moo.%TESTNUMBER:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT
 </command>
 <features>
 proxy
@@ -57,15 +57,15 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT the.old.moo.1525:%HTTPPORT HTTP/1.1\r
-Host: the.old.moo.1525:%HTTPPORT\r
+CONNECT the.old.moo.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
+Host: the.old.moo.%TESTNUMBER:%HTTPPORT\r
 Proxy-Connection: Keep-Alive\r
 User-Agent: Http Agent\r
 \r
 </proxy>
 <protocol>
-PUT /1525 HTTP/1.1\r
-Host: the.old.moo.1525:%HTTPPORT\r
+PUT /%TESTNUMBER HTTP/1.1\r
+Host: the.old.moo.%TESTNUMBER:%HTTPPORT\r
 Accept: */*\r
 User-Agent: Http Agent\r
 Content-Length: 13\r
index e0a80fcadf012d0a3446c094de46c1082cceda0b..c1204b97e98cd029924a6dcb7608f96a7bfe527e 100644 (file)
@@ -43,13 +43,13 @@ http
 http-proxy
 </server>
 <tool>
-lib1526
+lib%TESTNUMBER
 </tool>
  <name>
 CURLOPT_PROXYHEADER: separate host/proxy headers
  </name>
  <command>
- http://the.old.moo.1526:%HTTPPORT/1526 %HOSTIP:%PROXYPORT
+ http://the.old.moo.%TESTNUMBER:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT
 </command>
 <features>
 proxy
@@ -59,15 +59,15 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT the.old.moo.1526:%HTTPPORT HTTP/1.1\r
-Host: the.old.moo.1526:%HTTPPORT\r
+CONNECT the.old.moo.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
+Host: the.old.moo.%TESTNUMBER:%HTTPPORT\r
 Proxy-Connection: Keep-Alive\r
 User-Agent: Proxy Agent\r
 \r
 </proxy>
 <protocol>
-PUT /1526 HTTP/1.1\r
-Host: the.old.moo.1526:%HTTPPORT\r
+PUT /%TESTNUMBER HTTP/1.1\r
+Host: the.old.moo.%TESTNUMBER:%HTTPPORT\r
 Accept: */*\r
 User-Agent: Http Agent\r
 Content-Length: 13\r
index 028dc59848e06e8d31a3592af09ce7dbcf0b1e3b..d50df9056a6b2e3f258ae953701dd6c1bdbeb85d 100644 (file)
@@ -42,13 +42,13 @@ http
 http-proxy
 </server>
 <tool>
-lib1527
+lib%TESTNUMBER
 </tool>
  <name>
 Check same headers are generated with CURLOPT_HEADEROPT == CURLHEADER_UNIFIED
  </name>
  <command>
- http://the.old.moo.1527:%HTTPPORT/1527 %HOSTIP:%PROXYPORT
+ http://the.old.moo.%TESTNUMBER:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT
 </command>
 <features>
 proxy
@@ -58,16 +58,16 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT the.old.moo.1527:%HTTPPORT HTTP/1.1\r
-Host: the.old.moo.1527:%HTTPPORT\r
+CONNECT the.old.moo.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
+Host: the.old.moo.%TESTNUMBER:%HTTPPORT\r
 Proxy-Connection: Keep-Alive\r
 User-Agent: Http Agent\r
 Expect: 100-continue\r
 \r
 </proxy>
 <protocol>
-PUT /1527 HTTP/1.1\r
-Host: the.old.moo.1527:%HTTPPORT\r
+PUT /%TESTNUMBER HTTP/1.1\r
+Host: the.old.moo.%TESTNUMBER:%HTTPPORT\r
 Accept: */*\r
 User-Agent: Http Agent\r
 Expect: 100-continue\r
index 502c2c6459a867f89f95f29e56688760c6f5eda4..f6449aefea40ce6d6da0183db8e05eb32df49421 100644 (file)
@@ -35,13 +35,13 @@ http
 http-proxy
 </server>
 <tool>
-lib1528
+lib%TESTNUMBER
 </tool>
  <name>
 Separately specified proxy/server headers sent in a proxy GET
  </name>
  <command>
- http://the.old.moo:%HTTPPORT/1528 %HOSTIP:%PROXYPORT
+ http://the.old.moo:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT
 </command>
 <features>
 proxy
@@ -51,7 +51,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-GET http://the.old.moo:%HTTPPORT/1528 HTTP/1.1\r
+GET http://the.old.moo:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
 Host: the.old.moo:%HTTPPORT\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
index f7be503676ea08dc677aa4a5a3c74cd68e1551a4..68136aae30fc572bb3acafb48bf89290be8edb43 100644 (file)
@@ -23,13 +23,13 @@ http
 http-proxy
 </server>
 <tool>
-lib1529
+lib%TESTNUMBER
 </tool>
  <name>
 HTTP request-injection in URL sent over proxy
  </name>
  <command>
- "http://the.old.moo:%HTTPPORT/1529" %HOSTIP:%PROXYPORT
+ "http://the.old.moo:%HTTPPORT/%TESTNUMBER" %HOSTIP:%PROXYPORT
 </command>
 <features>
 proxy
index a582595aca8db185a1508ff875a1773068eaac1c..c51824fe7b7c64934a9178b674d98463552fbbb6 100644 (file)
@@ -81,7 +81,7 @@ crypto
 HTTP with Digest authorization with stale=true
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1530001 -u testuser:testpass --digest http://%HOSTIP:%HTTPPORT/1530002
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -u testuser:testpass --digest http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002
 </command>
 </client>
 
@@ -91,31 +91,31 @@ http://%HOSTIP:%HTTPPORT/1530001 -u testuser:testpass --digest http://%HOSTIP:%H
 ^Authorization.*cnonce
 </strip>
 <protocol>
-GET /1530001 HTTP/1.1\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /1530001 HTTP/1.1\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/1530001", response="f4f83139396995bac665f24a1f1055c7"\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER0001", response="f4f83139396995bac665f24a1f1055c7"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /1530002 HTTP/1.1\r
+GET /%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /1530002 HTTP/1.1\r
+GET /%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/1530002", response="f84511b014fdd0ba6494f42871079c32"\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER0002", response="f84511b014fdd0ba6494f42871079c32"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /1530002 HTTP/1.1\r
+GET /%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="999999", uri="/1530002", cnonce="MTA4MzIy", nc="00000001", qop="auth", response="25291c357671604a16c0242f56721c07", algorithm=MD5\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="999999", uri="/%TESTNUMBER0002", cnonce="MTA4MzIy", nc="00000001", qop="auth", response="25291c357671604a16c0242f56721c07", algorithm=MD5\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index 8372d29efa648523befc5f47117b8408b7850f83..0fbd21cf07dcd4697000fb0bec13b25601bebc13 100644 (file)
@@ -13,7 +13,7 @@ none
 http
 </features>
 <tool>
-lib1530
+lib%TESTNUMBER
 </tool>
  <name>
 CURLOPT_OPENSOCKETFUNCTION returns bad socket
index d58deb6e0e34d4555cc60ffb312db66bf9bd07bf..e590af08ba33e1a4a9661dc24580d1043af5dfd4 100644 (file)
Binary files a/tests/data/test1531 and b/tests/data/test1531 differ
index 5b2afc71aedd27c490a66eb749ded6e42c3c9b89..582f05a5bc1301f21d61f32fbc39e01ca8db42ec 100644 (file)
@@ -23,13 +23,13 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib1532
+lib%TESTNUMBER
 </tool>
 <name>
 Test CURLINFO_RESPONSE_CODE
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1532
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -37,7 +37,7 @@ http://%HOSTIP:%HTTPPORT/1532
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1532 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
index 617e20e7b2fbf46ea1e9cc008c7851712f1f88ba..7f06d2029dcf2ac539260e449b66cc7992889223 100644 (file)
@@ -27,13 +27,13 @@ Early Response
 http
 </server>
 <tool>
-lib1533
+lib%TESTNUMBER
 </tool>
 <name>
 HTTP with CURLOPT_KEEP_SENDING_ON_ERROR and an early error response
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1533
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -44,25 +44,25 @@ http://%HOSTIP:%HTTPPORT/1533
 120
 </errorcode>
 <protocol nonewline="yes">
-POST /1533 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Content-Length: 3\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-POST /1533 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Content-Length: 3\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-POST /1533 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Content-Length: 3\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-aaaPOST /1533 HTTP/1.1\r
+aaaPOST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Content-Length: 3\r
index 5ebf57d3ab5fa501fa99717428ecbfec9c7b9f2f..4672e0bcb715f8e1526c81879301fbb6a9102afd 100644 (file)
@@ -24,13 +24,13 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib1534
+lib%TESTNUMBER
 </tool>
 <name>
 CURLINFO_FILETIME init and reset
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1534
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/1534
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1534 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
index 226190d056c4ca3bc02007c2cfb57f6ccd8efc4a..477f3fac28957e1f8aa19f20ea1609f592214756 100644 (file)
@@ -24,13 +24,13 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib1535
+lib%TESTNUMBER
 </tool>
 <name>
 Test CURLINFO_RESPONSE_CODE CURLINFO_PROTOCOL
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1535
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/1535
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1535 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
index a6e5a66cb0e7217d2596d5150a4a55035a70b519..ea7ce3966a581cbf4aaf57e1ecbe745bc0899f02 100644 (file)
@@ -24,13 +24,13 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib1536
+lib%TESTNUMBER
 </tool>
 <name>
 Test CURLINFO_RESPONSE_CODE CURLINFO_SCHEME
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1536
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/1536
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1536 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
index 33d8ab3d964dfa7ea9828a13465085bf68994b23..c999e9a6bf8741852908f981461cac001beabbc5 100644 (file)
@@ -16,7 +16,7 @@ URL escape
 none
 </server>
 <tool>
-lib1537
+lib%TESTNUMBER
 </tool>
 
 <name>
index 03481d56e6a9f95aadf6db2c4dea33352d029460..ec86dd075007e79ffcffa3c85e711254cb4dcef4 100644 (file)
@@ -17,7 +17,7 @@ verbose logs
 none
 </server>
 <tool>
-lib1538
+lib%TESTNUMBER
 </tool>
 
 <name>
index b8546f270477f2fa745e51a569b3a5b5ca3e218c..3ef12fe5ee524b3e8b175650d698279764098116 100644 (file)
@@ -24,13 +24,13 @@ Connection: close
 http
 </server>
 <tool>
-lib1539
+lib%TESTNUMBER
 </tool>
 <name>
 HTTP 1.0 POST with read callback and unknown data size
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1539
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
index 616051cbc4d454cd3f6af9ef2bf3a86cf03376ce..c0f76514d750fe61e401b912d6290b729876ef00 100644 (file)
@@ -70,9 +70,9 @@ crypto
 HTTP PUT with --anyauth authorization (picking Digest)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/154 -T log/put154 -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --anyauth
 </command>
-<file name="log/put154">
+<file name="log/put%TESTNUMBER">
 This is data we upload with PUT
 a second line
 line three
@@ -83,16 +83,16 @@ four is the number of lines
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /154 HTTP/1.1\r
+PUT /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 85\r
 Expect: 100-continue\r
 \r
-PUT /154 HTTP/1.1\r
+PUT /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/154", response="b71551e12d1c456e47d8388ecb2edeca"\r
+Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/%TESTNUMBER", response="b71551e12d1c456e47d8388ecb2edeca"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 85\r
index 1c1cf5db5d5b6aa568815fa84ddea964d7991154..818cbb68dcb0ec5e4c7c4c6a24094ef453b7a0c6 100644 (file)
@@ -42,20 +42,20 @@ MyCoolTrailerHeader: amazingtrailer
 http
 </server>
 <tool>
-lib1540
+lib%TESTNUMBER
 </tool>
  <name>
 chunked with trailers and pausing the receive
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1540
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1540 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
index 6e19a4f2621d69738ac62b942624f87a37c2941b..1ff91ca1dfcd2280efe33820210696169dbb94d0 100644 (file)
@@ -93,12 +93,12 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/155 -T log/put155 -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --anyauth
 </command>
 <precheck>
 chkhostname curlhost
 </precheck>
-<file name="log/put155">
+<file name="log/put%TESTNUMBER">
 This is data we upload with PUT
 a second line
 line three
@@ -109,21 +109,21 @@ four is the number of lines
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /155 HTTP/1.1\r
+PUT /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 85\r
 Expect: 100-continue\r
 \r
-PUT /155 HTTP/1.1\r
+PUT /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 0\r
 \r
-PUT /155 HTTP/1.1\r
+PUT /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
 User-Agent: curl/%VERSION\r
index c305dd6f28367d08276b722419b05d3c53e7ec11..bfb80a1cab7a9f079718cd2aa3591b08f8eb7ccb 100644 (file)
@@ -16,14 +16,14 @@ none
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib1550
+lib%TESTNUMBER
 </tool>
 
  <name>
 verify setting pipeling blocklisting options
  </name>
  <command>
-http://%HOSTIP:%NOLISTENPORT/1550
+http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER
 </command>
 </client>
 </testcase>
index 87fe432637cc4f1cfab82ffc9f29a629693fe4f0..4c60db85dff7fde0569d780353276aeb40c7d8f7 100644 (file)
@@ -11,7 +11,7 @@ multi
 HTTP/1.1 302 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 6
-Location: /15510002
+Location: /%TESTNUMBER0002
 
 -foo-
 </data>
@@ -35,32 +35,32 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib1551
+lib%TESTNUMBER
 </tool>
 
  <name>
 re-run redirected transfer without setting URL again
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1551
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 <verify>
 <protocol>
-GET /1551 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
-GET /15510002 HTTP/1.1\r
+GET /%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
-GET /1551 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
-GET /15510002 HTTP/1.1\r
+GET /%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
index 48e55cb514c194c6afe7c262873a34d39f195d72..9468f413385af8724e6a276a14a7571a68a04694 100644 (file)
@@ -36,10 +36,10 @@ IMAP multi transfer error without curl_multi_remove_handle
  </name>
 # tool is what to use instead of 'curl'
 <tool>
-lib1552
+lib%TESTNUMBER
 </tool>
  <command>
-'imap://%HOSTIP:%IMAPPORT/1552/;MAILINDEX=1'
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1'
 </command>
 </client>
 
index 5e793b391964258eba462a183b1957e3a949f117..bc8303211045e0b3e68a14b3debd8fd569c62c7b 100644 (file)
@@ -36,12 +36,12 @@ IMAP cleanup before a connection was created
  </name>
 # tool is what to use instead of 'curl'
 <tool>
-lib1553
+lib%TESTNUMBER
 </tool>
 
 # this MUST use a host name that doesn't resolve
 <command>
-imap://non-existing-host.haxx.se:%IMAPPORT/1553
+imap://non-existing-host.haxx.se:%IMAPPORT/%TESTNUMBER
 </command>
 </client>
 
index 58ec312a71617f0bf3599cb9695b4cc81f9cfd43..c16195c17f5cde31f2b043a13742574f3ade7e7b 100644 (file)
@@ -92,10 +92,10 @@ http
 HTTP with shared connection cache
 </name>
 <tool>
-lib1554
+lib%TESTNUMBER
 </tool>
 <command>
-http://%HOSTIP:%HTTPPORT/1554
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
index 19512c5f58d763cf9b2a1ab481f9f15c049ba349..547ec39e43ebbc5b4781bba9beb21c31605d45df 100644 (file)
@@ -22,7 +22,7 @@ wait 10
 http
 </server>
 <tool>
-lib1555
+lib%TESTNUMBER
 </tool>
  <name>
 verify api is protected against calls from callbacks
@@ -30,7 +30,7 @@ verify api is protected against calls from callbacks
 
 # this server/host won't be used for real
  <command>
-http://%HOSTIP:%HTTPPORT/1555
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
index 0e678bbcbfd14d17b28522920ce43775ae3b7724..40a2e1244e9f05e742034469efdb61f6af5a5549 100644 (file)
@@ -33,13 +33,13 @@ Long: %repeat[100001 x A]%
 http
 </server>
 <tool>
-lib1556
+lib%TESTNUMBER
 </tool>
  <name>
 send long HTTP headers to header callback
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1556
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -47,7 +47,7 @@ http://%HOSTIP:%HTTPPORT/1556
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1556 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
index 16e2a2c47bdf19160b5636e3b5fe95a8a805847c..031809f4e1e509b22d8786d849a7c0f462e3f0e6 100644 (file)
@@ -14,7 +14,7 @@ crash
 none
 </server>
 <tool>
-lib1557
+lib%TESTNUMBER
 </tool>
 
 <name>
index f1538c2a8cc456d579d3d4996d4ff3abe3709b5d..26854c2dde0f2944d7909d115c383f10e635b806 100644 (file)
@@ -17,16 +17,16 @@ none
 file
 </features>
 <tool>
-lib1558
+lib%TESTNUMBER
 </tool>
 
 <name>
 CURLINFO_PROTOCOL for file:// transfer
 </name>
 <command>
-file://%FILE_PWD/log/data1558
+file://%FILE_PWD/log/data%TESTNUMBER
 </command>
-<file name="log/data1558">
+<file name="log/data%TESTNUMBER">
 hello
 </file>
 </client>
index cbed6fbccf3e16a7c38d2a67932d7663102a7c80..41fdf3af798158e6ab6c2f7813c34b84afc6959e 100644 (file)
@@ -18,7 +18,7 @@ none
 http
 </features>
 <tool>
-lib1559
+lib%TESTNUMBER
 </tool>
 
 <name>
index fafedc29930f85170479ba82bf770752bc195b1a..94bb3393f85204861df7cb1908fc7f07838b8d20 100644 (file)
@@ -28,9 +28,9 @@ http
 HTTP PUT with --anyauth (when the server requires none)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/156 -T log/put156 -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --anyauth
 </command>
-<file name="log/put156">
+<file name="log/put%TESTNUMBER">
 This is data we upload with PUT
 a second line
 line three
@@ -41,7 +41,7 @@ four is the number of lines
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /156 HTTP/1.1\r
+PUT /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 0a132a1c1ff60ab70085ad4dddeefddf7ed8acda..e8767b27bfe72466fe90eff7b3b375987bc82866 100644 (file)
@@ -28,7 +28,7 @@ ipv6
 URL API
  </name>
 <tool>
-lib1560
+lib%TESTNUMBER
 </tool>
 </client>
 
index 8d3ea5485b310e288be4fa75c798b2064a9e22a8..b6f8f2b66dfaf7ae88a68ea3b24a5f760e5310ea 100644 (file)
@@ -16,8 +16,8 @@ HTTP replaced headers
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Set-Cookie: super=secret; domain=example.com; path=/1561; secure;
-Set-Cookie: supersuper=secret; domain=example.com; path=/1561/login/; secure;
+Set-Cookie: super=secret; domain=example.com; path=/%TESTNUMBER; secure;
+Set-Cookie: supersuper=secret; domain=example.com; path=/%TESTNUMBER/login/; secure;
 Set-Cookie: __Secure-SID=12345; Domain=example.com
 Set-Cookie: __Secure-SID=12346; Secure; Domain=example.com
 Set-Cookie: supersupersuper=secret; __Secure-SID=12346; Secure; Domain=example.com
@@ -35,13 +35,13 @@ nomnom
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Set-Cookie: super=secret; domain=example.com; path=/1561; httponly;
-Set-Cookie: super=secret; domain=example.com; path=/1561/; httponly;
+Set-Cookie: super=secret; domain=example.com; path=/%TESTNUMBER; httponly;
+Set-Cookie: super=secret; domain=example.com; path=/%TESTNUMBER/; httponly;
 Set-Cookie: super=secret; domain=example.com; path=/15; httponly;
 Set-Cookie: public=yes; domain=example.com; path=/foo;
-Set-Cookie: supersuper=secret; domain=example.com; path=/1561/login/en;
-Set-Cookie: supersuper=secret; domain=example.com; path=/1561/login;
-Set-Cookie: secureoverhttp=yes; domain=example.com; path=/1561; secure;
+Set-Cookie: supersuper=secret; domain=example.com; path=/%TESTNUMBER/login/en;
+Set-Cookie: supersuper=secret; domain=example.com; path=/%TESTNUMBER/login;
+Set-Cookie: secureoverhttp=yes; domain=example.com; path=/%TESTNUMBER; secure;
 Set-Cookie: __Secure-SID=22345; Domain=example.com
 Set-Cookie: __Secure-SID=22346; Secure; Domain=example.com
 Set-Cookie: __Host-SID=32345
@@ -69,23 +69,23 @@ https
 Cookies set over HTTP can't override secure ones
 </name>
 <command>
--k https://%HOSTIP:%HTTPSPORT/15610001 -L -c log/jar1561.txt -H "Host: www.example.com"  http://%HOSTIP:%HTTPPORT/15610002 -L -c log/jar1561.txt -H "Host: www.example.com"
+-k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER0001 -L -c log/jar%TESTNUMBER.txt -H "Host: www.example.com"  http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002 -L -c log/jar%TESTNUMBER.txt -H "Host: www.example.com"
 </command>
 </client>
 <verify>
 <protocol>
-GET /15610001 HTTP/1.1\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: www.example.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /15610002 HTTP/1.1\r
+GET /%TESTNUMBER0002 HTTP/1.1\r
 Host: www.example.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file name="log/jar1561.txt" mode="text">
+<file name="log/jar%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
@@ -94,7 +94,7 @@ Accept: */*
 www.example.com        FALSE   /       TRUE    0       __Host-SID      12346
 .example.com   TRUE    /       TRUE    0       supersupersuper secret
 .example.com   TRUE    /       TRUE    0       __Secure-SID    12346
-.example.com   TRUE    /1561/login/    TRUE    0       supersuper      secret
+.example.com   TRUE    /%TESTNUMBER/login/     TRUE    0       supersuper      secret
 #HttpOnly_.example.com TRUE    /15     FALSE   0       super   secret
 </file>
 
index ee8d81b8e8cb026305ef9e1628003d7278958f5d..b9755aa2488d8ed19245f164055d35ebc38ee9ae 100644 (file)
@@ -44,23 +44,23 @@ https
 Expire secure cookies over HTTPS
 </name>
 <command>
--k https://%HOSTIP:%HTTPSPORT/15620001 -H "Host: www.example.com" https://%HOSTIP:%HTTPSPORT/15620002 -b "non-existing" https://%HOSTIP:%HTTPSPORT/15620001
+-k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER0001 -H "Host: www.example.com" https://%HOSTIP:%HTTPSPORT/%TESTNUMBER0002 -b "non-existing" https://%HOSTIP:%HTTPSPORT/%TESTNUMBER0001
 </command>
 </client>
 <verify>
 <protocol>
-GET /15620001 HTTP/1.1\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: www.example.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /15620002 HTTP/1.1\r
+GET /%TESTNUMBER0002 HTTP/1.1\r
 Host: www.example.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Cookie: foo=123\r
 \r
-GET /15620001 HTTP/1.1\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: www.example.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 56b18c41f73493b07277c74fa4c30c00e00d0404..6bf3ad905b4ecee204f6f9a878f498027c0736b6 100644 (file)
@@ -29,7 +29,7 @@ http
 Make sure redirects to CURLPROTO_GOPHER are forbidden by default
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/15630001 -L -H "Host: www.example.com"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -L -H "Host: www.example.com"
 </command>
 </client>
 <verify>
@@ -37,7 +37,7 @@ http://%HOSTIP:%HTTPPORT/15630001 -L -H "Host: www.example.com"
 1
 </errorcode>
 <protocol>
-GET /15630001 HTTP/1.1\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: www.example.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index c2760e3a0368740b608220964d4697049b00849a..59cef7157bf449a07b082ea98b60735d1fa534a2 100644 (file)
@@ -19,7 +19,7 @@ wakeup
 none
 </server>
 <tool>
-lib1564
+lib%TESTNUMBER
 </tool>
 <name>
 wakeup before poll with no easy handles
index 7a248883d045d4886a356a9a3b14b9a39eccb86a..15374bf7e6231e7492ec1679d97f2077cdd6b191 100644 (file)
@@ -28,7 +28,7 @@ wakeup
 http
 </server>
 <tool>
-lib1565
+lib%TESTNUMBER
 </tool>
 <name>
 wakeup from another thread
index 54226d010685ffdd94d4b92f30d9cad89182c39c..b954c2aeab5d493726eff99552f6538745ba48b3 100644 (file)
@@ -32,12 +32,12 @@ http
 --etag-compare that gets a 304 back shouldn't overwrite the file
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1566 -o log/output1566 --etag-compare log/etag1566
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/output%TESTNUMBER --etag-compare log/etag%TESTNUMBER
 </command>
-<file name="log/etag1566">
+<file name="log/etag%TESTNUMBER">
 "123456"
 </file>
-<file1 name="log/output1566">
+<file1 name="log/output%TESTNUMBER">
 downloaded already
 </file1>
 
@@ -47,7 +47,7 @@ downloaded already
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1566 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -56,7 +56,7 @@ If-None-Match: "123456"
 </protocol>
 
 # verify that the target file is untouched
-<file name="log/output1566">
+<file name="log/output%TESTNUMBER">
 downloaded already
 </file>
 </verify>
index ff779df08d8b10cbc52f2a6b1188b769b7c92dcd..3e6ce8812badf50660315c1df1dd931514176ccd 100644 (file)
@@ -13,7 +13,7 @@ CURLOPT_FOLLOWLOCATION
 <data>
 HTTP/1.1 302 OK
 Content-Length: 6
-Location: /15670002
+Location: /%TESTNUMBER0002
 
 -foo-
 </data>
@@ -36,32 +36,32 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib1567
+lib%TESTNUMBER
 </tool>
 
  <name>
 re-run redirected transfer without setting CURLU URL again
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1567
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 <verify>
 <protocol>
-GET /1567 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
-GET /15670002 HTTP/1.1\r
+GET /%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
-GET /1567 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
-GET /15670002 HTTP/1.1\r
+GET /%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
index 62d1132eb6b28d8aa0f6d936e2e51ed7c896470c..409f11f9201cabc92c83f7deeb5c3f9a160bfa1c 100644 (file)
@@ -61,25 +61,25 @@ crypto
 HTTP with Digest authorization on custom CURLOPT_PORT
 </name>
 <tool>
-lib1568
+lib%TESTNUMBER
 </tool>
 <command>
-http://%HOSTIP/1568 %HTTPPORT
+http://%HOSTIP/%TESTNUMBER %HTTPPORT
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1568 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-User-Agent: lib1568\r
+User-Agent: lib%TESTNUMBER\r
 Accept: */*\r
 \r
-GET /1568 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/1568", response="9cbbd857a37e45f2bcad5c7d088191df"\r
-User-Agent: lib1568\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="9cbbd857a37e45f2bcad5c7d088191df"\r
+User-Agent: lib%TESTNUMBER\r
 Accept: */*\r
 \r
 </protocol>
index 78f1dea268198c6dc4c5a1b9e23682ca4f81bd55..3342f84fc48084df81f5d38be01e75afbff519ca 100644 (file)
@@ -30,10 +30,10 @@ ftp
 FTP first type=A then regular URL
  </name>
 <tool>
-lib1569
+lib%TESTNUMBER
 </tool>
 <command>
-"ftp://%HOSTIP:%FTPPORT/1569;type=A" ftp://%HOSTIP:%FTPPORT/1569
+"ftp://%HOSTIP:%FTPPORT/%TESTNUMBER;type=A" ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 
 </client>
@@ -47,11 +47,11 @@ PWD
 EPSV\r
 PASV\r
 TYPE A\r
-RETR 1569\r
+RETR %TESTNUMBER\r
 PASV\r
 TYPE I\r
-SIZE 1569\r
-RETR 1569\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index fee7a6a4473ba78b5ffc792584736fcbc2f11211..63e611c783ad172bab19ca093d13bf1c0afdf574 100644 (file)
@@ -28,14 +28,14 @@ http
 HTTP GET with --anyauth (when the server requires none)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/157 -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /157 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index fd0c27395c5f4d4a12078a49786667940533dfff..40c87ef4041eba3cbfbf1e158b3022310395682c 100644 (file)
@@ -33,7 +33,7 @@ FTP first type=D then regular URL
 lib1569
 </tool>
 <command>
-"ftp://%HOSTIP:%FTPPORT/1570;type=D" ftp://%HOSTIP:%FTPPORT/1570
+"ftp://%HOSTIP:%FTPPORT/%TESTNUMBER;type=D" ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 
 </client>
@@ -50,8 +50,8 @@ TYPE A
 NLST\r
 PASV\r
 TYPE I\r
-SIZE 1570\r
-RETR 1570\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 238399a05b17307d6c39814d42b67edebfb2ae46..2fbaf65c05a3d7ae238edefd79f797a40313d175 100644 (file)
@@ -24,7 +24,7 @@ http
 HTTP multipart formpost with only a 100 reply
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/158 -F name=daniel
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -F name=daniel
 </command>
 </client>
 
@@ -35,7 +35,7 @@ http://%HOSTIP:%HTTPPORT/158 -F name=daniel
 ^-----------------------.*
 </strip>
 <protocol>
-POST /158 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index bb94583bd9b01593878718e8a71cf2bef7ca5b71..05968eb10ecb76ea13c571bb75b26c6f4fb48c3e 100644 (file)
@@ -60,7 +60,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/159 -u testuser:testpass --ntlm -0
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm -0
 </command>
 <precheck>
 chkhostname curlhost
@@ -70,7 +70,7 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /159 HTTP/1.0\r
+GET /%TESTNUMBER HTTP/1.0\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/%VERSION\r
index b605022affb7f4010750394532ada4f38b576515..bfaa7545c990ffb0a341a7009be86657269863f4 100644 (file)
@@ -41,7 +41,7 @@ lib1553
 
 # it is important this uses a host name that resolves successfully
 <command>
-imap://localhost:%IMAPPORT/1590
+imap://localhost:%IMAPPORT/%TESTNUMBER
 </command>
 </client>
 
index ab19e4e19fb8dd4286ae3069b2823872b070683e..738696db1c7df9569726238e57660977809f6967 100644 (file)
@@ -28,10 +28,10 @@ http
 HTTP PUT with trailers at the end
 </name>
 <tool>
-lib1591
+lib%TESTNUMBER
 </tool>
 <command>
-http://%HOSTIP:%HTTPPORT/bzz/1591
+http://%HOSTIP:%HTTPPORT/bzz/%TESTNUMBER
 </command>
 <stdin>
 more than one byte
@@ -41,7 +41,7 @@ more than one byte
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /bzz/1591 HTTP/1.1\r
+PUT /bzz/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Transfer-Encoding: chunked\r
index d1346e1e3cbec8a69159b39c3e3370243c5fd49c..a2c0f1ca770467174541be5165b5749d130d258e 100644 (file)
@@ -14,14 +14,14 @@ speedcheck
 none
 </server>
 <tool>
-lib1592
+lib%TESTNUMBER
 </tool>
  <name>
 HTTP request, remove handle while resolving, don't block
  </name>
 
  <command>
-http://a-site-never-accessed.example.org/1592
+http://a-site-never-accessed.example.org/%TESTNUMBER
 </command>
 </client>
 
index 6719a3261f540b02390454b1134e7768b32418f3..60d9f0b87d68ff7da4620dcd5e6caf54ef5c8b79 100644 (file)
@@ -27,17 +27,17 @@ http
 HTTP custom header overrides CURLOPT_TIMECONDITION
 </name>
 <tool>
-lib1593
+lib%TESTNUMBER
 </tool>
 <command>
-http://%HOSTIP:%HTTPPORT/1593
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 <verify>
 # Note here the lack of If-Modified-Since
 <protocol>
-GET /1593 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
index f29fdd6871cc046d089f6453bcb2cdd8cdbc0696..5c85050302aa973d7ce43bf828d1d4556f96d624 100644 (file)
@@ -28,16 +28,16 @@ http
 HTTP Retry-After header parsing and extraction
 </name>
 <tool>
-lib1594
+lib%TESTNUMBER
 </tool>
 <command>
-http://%HOSTIP:%HTTPPORT/1594
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 <verify>
 <protocol>
-GET /1594 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
index 0216788e0ba5f72c643415d62988495a840a0a88..bdc6ce24dfc40019310fb910ae50341368763b42 100644 (file)
@@ -30,13 +30,13 @@ HTTP Retry-After header extraction (without header)
 lib1594
 </tool>
 <command>
-http://%HOSTIP:%HTTPPORT/1595
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 <verify>
 <protocol>
-GET /1595 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
index 62ceab4b888c2082086ee87ffe26a117d4ec5308..59121d27e6ba23a25e79fa58b6b35291ba370650 100644 (file)
@@ -28,16 +28,16 @@ http
 HTTP Retry-After header parsing using a date
 </name>
 <tool>
-lib1596
+lib%TESTNUMBER
 </tool>
 <command>
-http://%HOSTIP:%HTTPPORT/1596
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 <verify>
 <protocol>
-GET /1596 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
index 92c95774f9b5b8936573715189269640407e1ea9..240fd379cf1e4b62cc54582504c2150dab8f39c7 100644 (file)
@@ -31,7 +31,7 @@ http
 HTTP with proxy authorization
  </name>
  <command>
- -U fake@user:loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong -x %HOSTIP:%HTTPPORT http://we.want.that.site.com/16
+ -U fake@user:loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong -x %HOSTIP:%HTTPPORT http://we.want.that.site.com/%TESTNUMBER
 </command>
 <features>
 proxy
@@ -41,7 +41,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://we.want.that.site.com/16 HTTP/1.1\r
+GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1\r
 Host: we.want.that.site.com\r
 Proxy-Authorization: Basic ZmFrZUB1c2VyOmxvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29uZw==\r
 User-Agent: curl/%VERSION\r
index 700fc6e176c0b03a0bdea6c315e5dbffd059bcdb..778787e699b7e1d4f1d607e32302c4a682cbba0a 100644 (file)
@@ -37,7 +37,7 @@ http
 HTTP with delayed close, conn reuse, connection reset and retry
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/160 http://%HOSTIP:%HTTPPORT/wantmore/1600001
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/wantmore/%TESTNUMBER0001
 </command>
 </client>
 
@@ -57,12 +57,12 @@ surprise2
 </stdout>
 
 <protocol>
-GET /want/160 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /wantmore/1600001 HTTP/1.1\r
+GET /wantmore/%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 91a3388fc7ecd3fa0760590a12608f73568c1696..53508e4b5f0b63e9e48d23284dae0801374dc74f 100644 (file)
@@ -25,7 +25,7 @@ ftp
 FTP RETR PASV
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/161
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -40,8 +40,8 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 161\r
-RETR 161\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 </protocol>
 # CURLE_PARTIAL_FILE = 18
 <errorcode>
index ae6cab070c3ab0a4ede0201eaceaa3e008461e90..040fae3301f31912a8ccf85b6dd1a178a7068ebf 100644 (file)
@@ -35,7 +35,7 @@ Send "OPTIONS *" with --request-target to a proxy
 proxy
 </features>
 <command>
---request-target '*' -X OPTIONS --proxy http://%HOSTIP:%HTTPPORT/ -H "Testno: 1613" http://www.example.org/
+--request-target '*' -X OPTIONS --proxy http://%HOSTIP:%HTTPPORT/ -H "Testno: %TESTNUMBER" http://www.example.org/
 </command>
 </client>
 
@@ -46,7 +46,7 @@ Host: www.example.org
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
-Testno: 1613\r
+Testno: %TESTNUMBER\r
 \r
 </protocol>
 </verify>
index d15474585d7234d9b03975c97e10874393735816..3fa291de529aac924d3c2ff0d9c631a144ad0e4c 100644 (file)
@@ -38,14 +38,14 @@ http
 HTTP GET asking for --proxy-ntlm when some other authentication is required
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/162 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm --fail
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm --fail
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/162 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/%VERSION\r
index 5d86f11331936843c78c7a71f1986b3bb7c34ada..344f1042d5957542f7bfcc56a8dce373ce6fc57a 100644 (file)
@@ -27,10 +27,10 @@ http
 HTTP multipart formpost with contents from a file
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/163 -F "name=<log/field163" -F tool=curl
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "name=<log/field%TESTNUMBER" -F tool=curl
 </command>
 # We create this file before the command is invoked!
-<file name="log/field163">
+<file name="log/field%TESTNUMBER">
 contents
 from
 a
@@ -49,7 +49,7 @@ yes please
 ^(Content-Type: multipart/form-data;|------------).*
 </strip>
 <protocol>
-POST /we/want/163 HTTP/1.1\r
+POST /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 3b5a2ca5ba782585b619daef4fbac6016e5af734..4a983a9d5885713c277e5e6652f9612bda104082 100644 (file)
@@ -32,7 +32,7 @@ https-proxy
 HTTPS-proxy with Basic auth to HTTP without auth
  </name>
  <command>
- -U fake@user:loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong -x https://%HOSTIP:%HTTPSPROXYPORT http://we.want.that.site.com/1630 --proxy-insecure
+ -U fake@user:loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong -x https://%HOSTIP:%HTTPSPROXYPORT http://we.want.that.site.com/%TESTNUMBER --proxy-insecure
 </command>
 <features>
 proxy
@@ -42,7 +42,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-GET http://we.want.that.site.com/1630 HTTP/1.1\r
+GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1\r
 Host: we.want.that.site.com\r
 Proxy-Authorization: Basic ZmFrZUB1c2VyOmxvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29uZw==\r
 User-Agent: curl/%VERSION\r
index f024864528c367ac1401f6e5a2ee5393bf02a1b9..4c059870638651ee88a746a4c71704c9b40e5cca 100644 (file)
@@ -43,7 +43,7 @@ https-proxy
 FTP through HTTPS-proxy
  </name>
  <command>
--p -x https://%HOSTIP:%HTTPSPROXYPORT ftp://ftp.site.thru.https.proxy:%FTPPORT/1631 --proxy-insecure
+-p -x https://%HOSTIP:%HTTPSPROXYPORT ftp://ftp.site.thru.https.proxy:%FTPPORT/%TESTNUMBER --proxy-insecure
 </command>
 <features>
 http
@@ -78,8 +78,8 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 1631\r
-RETR 1631\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index ace0b4b38d6429e8599befd69653d7a30a75bff0..eceb6c55090c6b453d700c4a7c7fd2c53ba5fadf 100644 (file)
@@ -22,7 +22,7 @@ Content-Length: 0
 
 # This is the FTP server response. The Life and Adventures of Robinson Crusoe
 <data>
-I was born in the year 1632, in the city of York, of a good family, though not
+I was born in the year %TESTNUMBER, in the city of York, of a good family, though not
 of that country, myfather being a foreigner of Bremen, who settled first at
 Hull.  He got a good estate by merchandise,and leaving off his trade, lived
 afterwards at York, from whence he had married my mother, whoserelations were
@@ -52,7 +52,7 @@ https-proxy
 FTP through HTTPS-proxy, with connection re-use
  </name>
  <command>
--p -x https://%HOSTIP:%HTTPSPROXYPORT ftp://ftp.site.thru.https.proxy:%FTPPORT/1632 --proxy-insecure ftp://ftp.site.thru.https.proxy:%FTPPORT/16320002
+-p -x https://%HOSTIP:%HTTPSPROXYPORT ftp://ftp.site.thru.https.proxy:%FTPPORT/%TESTNUMBER --proxy-insecure ftp://ftp.site.thru.https.proxy:%FTPPORT/%TESTNUMBER0002
 </command>
 <features>
 http
@@ -93,11 +93,11 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 1632\r
-RETR 1632\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 EPSV\r
-SIZE 16320002\r
-RETR 16320002\r
+SIZE %TESTNUMBER0002\r
+RETR %TESTNUMBER0002\r
 QUIT\r
 </protocol>
 </verify>
index 9efd90cb232129c459ed6cd400248938ea4608e5..5cf89c2b01d7f9eed8a29bbbad136e9d9f3664a4 100644 (file)
@@ -14,7 +14,7 @@ HTTP/1.1 301 OK
 Accept-Ranges: bytes
 Content-Length: 0
 Connection: close
-Location: /16330002
+Location: /%TESTNUMBER0002
 
 </data>
 <data2>
@@ -30,7 +30,7 @@ HTTP/1.1 301 OK
 Accept-Ranges: bytes
 Content-Length: 0
 Connection: close
-Location: /16330002
+Location: /%TESTNUMBER0002
 
 HTTP/1.1 429 too many requests
 Retry-After: 1
@@ -41,7 +41,7 @@ HTTP/1.1 301 OK
 Accept-Ranges: bytes
 Content-Length: 0
 Connection: close
-Location: /16330002
+Location: /%TESTNUMBER0002
 
 HTTP/1.1 429 too many requests
 Retry-After: 1
@@ -61,7 +61,7 @@ http
 --retry with a 429 response and Retry-After:
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1633 -d moo --retry 1 -L
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -d moo --retry 1 -L
 </command>
 </client>
 
@@ -69,26 +69,26 @@ http://%HOSTIP:%HTTPPORT/1633 -d moo --retry 1 -L
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST /1633 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 3\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-mooGET /16330002 HTTP/1.1\r
+mooGET /%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-POST /1633 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 3\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-mooGET /16330002 HTTP/1.1\r
+mooGET /%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 5c05474ddbfd53da1c42881bbb945fcff3c27877..f8b1b7bc503ed2136d5a148df31ee07ef581ab50 100644 (file)
@@ -47,7 +47,7 @@ http
 --retry with a 429 response and Retry-After: and --fail
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1634 --retry 1  --fail
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 1  --fail
 </command>
 </client>
 
@@ -55,12 +55,12 @@ http://%HOSTIP:%HTTPPORT/1634 --retry 1  --fail
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1634 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /1634 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 97e2c5eac4397e497232be2724fd6c117ec3b51e..09310a0c28dcc30e368c930ceb344fe155a9845e 100644 (file)
@@ -48,14 +48,14 @@ http
 HTTP range with multiple ranges
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/164 -r 0-10,12-15
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -r 0-10,12-15
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/164 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=0-10,12-15\r
 User-Agent: curl/%VERSION\r
index 1e477661af325d5175d239c92f00272db59b49be..dfd21315734eff88360e77bb70bb2675fa29fef3 100644 (file)
@@ -42,7 +42,7 @@ perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(lan
 HTTP over proxy with IDN host name
  </name>
  <command>
-http://www.åäö.se/page/165 -x %HOSTIP:%HTTPPORT http://www.große.de/page/165
+http://www.åäö.se/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT http://www.große.de/page/%TESTNUMBER
 </command>
 </client>
 
@@ -50,13 +50,13 @@ http://www.åäö.se/page/165 -x %HOSTIP:%HTTPPORT http://www.große.de/page/165
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://www.xn--4cab6c.se/page/165 HTTP/1.1\r
+GET http://www.xn--4cab6c.se/page/%TESTNUMBER HTTP/1.1\r
 Host: www.xn--4cab6c.se\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://www.xn--groe-xna.de/page/165 HTTP/1.1\r
+GET http://www.xn--groe-xna.de/page/%TESTNUMBER HTTP/1.1\r
 Host: www.xn--groe-xna.de\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index f8f90f949a6e3466b8c47b42c9d88e0b217f1b8f..ef6657494cf87fa3d8b880c802d274302cd0619d 100644 (file)
@@ -24,9 +24,9 @@ CURL_TIME=1548369261
 alt-svc
 </name>
 <command>
-log/1654
+log/%TESTNUMBER
 </command>
-<file name="log/1654" mode="text">
+<file name="log/%TESTNUMBER" mode="text">
 h2 example.com 443 h3 shiny.example.com 8443 "20191231 00:00:00" 0 1
 # a comment
 h2 foo.example.com 443 h3 shiny.example.com 8443 "20291231 23:30:00" 0 1
@@ -38,7 +38,7 @@ rubbish
 </file>
 </client>
 <verify>
-<file name="log/1654-out" mode="text">
+<file name="log/%TESTNUMBER-out" mode="text">
 # Your alt-svc cache. https://curl.se/docs/alt-svc.html
 # This file was generated by libcurl! Edit at your own risk.
 h2 example.com 443 h3 shiny.example.com 8443 "20191231 00:00:00" 0 1
index 6a5210e00ed66eb523b879c8ad9fded05ae552e4..3ee1d69b60c843ae96a6dc23f39182a57eca9bd5 100644 (file)
@@ -27,10 +27,10 @@ http
 HTTP formpost a file with spaces in name
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/166 -F "name=@log/fie ld 166"
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "name=@log/fie ld %TESTNUMBER"
 </command>
 # We create this file before the command is invoked!
-<file name="log/fie ld 166">
+<file name="log/fie ld %TESTNUMBER">
 data inside the file
 </file>
 </client>
@@ -41,7 +41,7 @@ data inside the file
 ^(Content-Type: multipart/form-data;|------------).*
 </strip>
 <protocol>
-POST /we/want/166 HTTP/1.1\r
+POST /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -49,7 +49,7 @@ Content-Length: 223
 Content-Type: multipart/form-data; boundary=----------------------------b0b3d6d23991\r
 \r
 ------------------------------b0b3d6d23991\r
-Content-Disposition: form-data; name="name"; filename="fie ld 166"\r
+Content-Disposition: form-data; name="name"; filename="fie ld %TESTNUMBER"\r
 Content-Type: application/octet-stream\r
 \r
 data inside the file
index 0e081d7c066dc252c80a7809535349a12808db16..76df04f1e2cc588ec9a0e1cc2cc58f463072b5c7 100644 (file)
@@ -15,7 +15,7 @@ unittest
 HSTS
 </features>
 
-<file name="log/input1660">
+<file name="log/input%TESTNUMBER">
 # Your HSTS cache. https://curl.se/docs/hsts.html
 # This file was generated by libcurl! Edit at your own risk.
 .readfrom.example "20211001 04:47:41"
@@ -71,7 +71,7 @@ expire.example [expire.example]: 1548369268
 'expire.example' is not HSTS
 'expire.example' is not HSTS
 </stdout>
-<file name="log/hsts1660">
+<file name="log/hsts%TESTNUMBER">
 # Your HSTS cache. https://curl.se/docs/hsts.html
 # This file was generated by libcurl! Edit at your own risk.
 .example.com "20191001 04:47:41"
index 5067e779a4313107e5bda150bbe8ec088cb5d1f4..832cc35a6e80cc81ac85b059082695453b597ad1 100644 (file)
@@ -51,24 +51,24 @@ proxy
 HTTP with proxy-requiring-Basic to site-requiring-Digest
  </name>
  <command>
-http://data.from.server.requiring.digest.hohoho.com/167 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --digest --user digest:alot
+http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --digest --user digest:alot
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://data.from.server.requiring.digest.hohoho.com/167 HTTP/1.1\r
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1\r
 Host: data.from.server.requiring.digest.hohoho.com\r
 Proxy-Authorization: Basic Zm9vOmJhcg==\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://data.from.server.requiring.digest.hohoho.com/167 HTTP/1.1\r
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1\r
 Host: data.from.server.requiring.digest.hohoho.com\r
 Proxy-Authorization: Basic Zm9vOmJhcg==\r
-Authorization: Digest username="digest", realm="weirdorealm", nonce="12345", uri="/167", response="13c7c02a252cbe1c46d8669898a3be26"\r
+Authorization: Digest username="digest", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="13c7c02a252cbe1c46d8669898a3be26"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
index ddad8bb7794be35b88409a2175341291c7f9adf4..d552a71336453bc93c2596c922234a4d585621b0 100644 (file)
@@ -65,30 +65,30 @@ proxy
 HTTP with proxy-requiring-Digest to site-requiring-Digest
  </name>
  <command>
-http://data.from.server.requiring.digest.hohoho.com/168 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-digest --digest --user digest:alot
+http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-digest --digest --user digest:alot
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://data.from.server.requiring.digest.hohoho.com/168 HTTP/1.1\r
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1\r
 Host: data.from.server.requiring.digest.hohoho.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://data.from.server.requiring.digest.hohoho.com/168 HTTP/1.1\r
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1\r
 Host: data.from.server.requiring.digest.hohoho.com\r
-Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/168", response="fb8608e00ad9239a3dedb14bc8575976"\r
+Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="fb8608e00ad9239a3dedb14bc8575976"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://data.from.server.requiring.digest.hohoho.com/168 HTTP/1.1\r
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1\r
 Host: data.from.server.requiring.digest.hohoho.com\r
-Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/168", response="fb8608e00ad9239a3dedb14bc8575976"\r
-Authorization: Digest username="digest", realm="realmweirdo", nonce="123456", uri="/168", response="ca87f2d768a231e2d637a55698d5c416"\r
+Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="fb8608e00ad9239a3dedb14bc8575976"\r
+Authorization: Digest username="digest", realm="realmweirdo", nonce="123456", uri="/%TESTNUMBER", response="ca87f2d768a231e2d637a55698d5c416"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
index 6d30b2aded177c49efd8615bfa2ac5827b8d1036..adc7e9b1f0147618093f5a692772ebd84583d0d3 100644 (file)
@@ -92,7 +92,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://data.from.server.requiring.digest.hohoho.com/169 --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-ntlm --digest --user digest:alot
+http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-ntlm --digest --user digest:alot
 </command>
 <precheck>
 chkhostname curlhost
@@ -102,23 +102,23 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://data.from.server.requiring.digest.hohoho.com/169 HTTP/1.1\r
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1\r
 Host: data.from.server.requiring.digest.hohoho.com\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://data.from.server.requiring.digest.hohoho.com/169 HTTP/1.1\r
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1\r
 Host: data.from.server.requiring.digest.hohoho.com\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://data.from.server.requiring.digest.hohoho.com/169 HTTP/1.1\r
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1\r
 Host: data.from.server.requiring.digest.hohoho.com\r
-Authorization: Digest username="digest", realm="r e a l m", nonce="abcdef", uri="/169", response="95d48591985a03c4b49cb962aa7bd3e6"\r
+Authorization: Digest username="digest", realm="r e a l m", nonce="abcdef", uri="/%TESTNUMBER", response="95d48591985a03c4b49cb962aa7bd3e6"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
index fe423b334ae9d25c04ed1abed232e33c1e3fcc61..8e5bf826774225d77a5739783b4d5cccc9d7f2b1 100644 (file)
@@ -37,14 +37,14 @@ request MOOO
 --max-time 180
  </stdin>
  <command>
--K - %HOSTIP:%HTTPPORT/that.site.com/17
+-K - %HOSTIP:%HTTPPORT/that.site.com/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-MOOO /that.site.com/17 HTTP/1.1\r
+MOOO /that.site.com/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: agent007 license to drill  \r
 Accept: */*\r
index 58c2a3fe154cbc21d7d7f40d085577220992d6ef..28874a92e4919773f5974a37f14afc3d4ee5683b 100644 (file)
@@ -27,14 +27,14 @@ proxy
 HTTP POST with --proxy-ntlm and no SSL with no response
  </name>
  <command>
-http://a.galaxy.far.far.away/170 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm -F "dummy=value"
+http://a.galaxy.far.far.away/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm -F "dummy=value"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST http://a.galaxy.far.far.away/170 HTTP/1.1\r
+POST http://a.galaxy.far.far.away/%TESTNUMBER HTTP/1.1\r
 Host: a.galaxy.far.far.away\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/%VERSION\r
index a9f9ae8d0c99b26103739d223ca4ce0f26cf0046..9cf873928549e4f6f0510b483660ee8403a2f468 100644 (file)
@@ -46,7 +46,7 @@ http/2
 HTTP/2 GET with Upgrade:
  </name>
  <command>
-http://%HOSTIP:%HTTP2PORT/1700 --http2 http://%HOSTIP:%HTTP2PORT/17000001
+http://%HOSTIP:%HTTP2PORT/%TESTNUMBER --http2 http://%HOSTIP:%HTTP2PORT/%TESTNUMBER0001
 </command>
 </client>
 
@@ -58,12 +58,12 @@ http://%HOSTIP:%HTTP2PORT/1700 --http2 http://%HOSTIP:%HTTP2PORT/17000001
 ^Via:.*
 </strip>
 <protocol>
-GET /1700 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTP2PORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /17000001 HTTP/1.1\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTP2PORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 50ebd65e0d00e4bedb3ba306e83a3b54d2c518bb..c4687d9117ec4b63f5354d92e3b2cfc977c14743 100644 (file)
@@ -37,7 +37,7 @@ http/2
 HTTP/2 POST with Upgrade:
  </name>
  <command>
-http://%HOSTIP:%HTTP2PORT/1701 --http2 -d "datatosend"
+http://%HOSTIP:%HTTP2PORT/%TESTNUMBER --http2 -d "datatosend"
 </command>
 </client>
 
@@ -49,7 +49,7 @@ http://%HOSTIP:%HTTP2PORT/1701 --http2 -d "datatosend"
 ^Via:.*
 </strip>
 <protocol nonewline="yes">
-POST /1701 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTP2PORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index c17f5a7cd7fe9175638041bc2b3163fcf022153f..b679c7bca1d23d9c7fc94cb9f6dcece9841e60ff 100644 (file)
@@ -36,7 +36,7 @@ http/2
 HTTP/2 HEAD with Upgrade:
  </name>
  <command>
-http://%HOSTIP:%HTTP2PORT/1702 --http2 --head
+http://%HOSTIP:%HTTP2PORT/%TESTNUMBER --http2 --head
 </command>
 </client>
 
@@ -48,7 +48,7 @@ http://%HOSTIP:%HTTP2PORT/1702 --http2 --head
 ^Via:.*
 </strip>
 <protocol>
-HEAD /1702 HTTP/1.1\r
+HEAD /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTP2PORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index ab4f0280f0654407e1f69bc281ffd4059c04dd4c..a6a4d9fe15b7c1b1dacfe91809dc9905885f5873 100644 (file)
@@ -28,9 +28,9 @@ win32
 basic file:// file with UTF-8 characters
 </name>
 <command option="no-include">
-file://localhost%FILE_PWD/log/%E3%83%86%E3%82%B9%E3%83%881703.txt
+file://localhost%FILE_PWD/log/%E3%83%86%E3%82%B9%E3%83%88%TESTNUMBER.txt
 </command>
-<file name="log/テスト1703.txt">
+<file name="log/テスト%TESTNUMBER.txt">
 foo
    bar
 bar
index e79e8e03dd0e3c87f005eb9c7051835eaa6e4f04..c4f5b6c40fffd39643e2f7aabae0443d373d965d 100644 (file)
@@ -31,7 +31,7 @@ http
 HTTP, get cookie with dot prefixed full domain
  </name>
  <command>
--c log/jar171 -x %HOSTIP:%HTTPPORT http://z.x.com/171
+-c log/jar%TESTNUMBER -x %HOSTIP:%HTTPPORT http://z.x.com/%TESTNUMBER
 </command>
 <features>
 proxy
@@ -41,14 +41,14 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://z.x.com/171 HTTP/1.1\r
+GET http://z.x.com/%TESTNUMBER HTTP/1.1\r
 Host: z.x.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
-<file name="log/jar171" mode="text">
+<file name="log/jar%TESTNUMBER" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
index ca6d3cd730460ea8b0b9647fe2812d35a2ddb312..9dbe64c23edf5036f9a0690620587398a27033f9 100644 (file)
@@ -27,9 +27,9 @@ http
 HTTP with cookies file and custom added cookie
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/172 -b log/jar172.txt -b "tool=curl; name=fool"
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b log/jar%TESTNUMBER.txt -b "tool=curl; name=fool"
 </command>
-<file name="log/jar172.txt">
+<file name="log/jar%TESTNUMBER.txt">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
@@ -43,7 +43,7 @@ http://%HOSTIP:%HTTPPORT/we/want/172 -b log/jar172.txt -b "tool=curl; name=fool"
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/172 HTTP/1.1\r
+GET /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index b1d01c06c6ccb9f019db13a5bd8e84195e66928e..0968616230632df1abc590d1a7540e5cac5ea36f 100644 (file)
@@ -28,7 +28,7 @@ http
 HTTP RFC1867-formpost a file from stdin with "faked" filename
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/173 -F field1=contents1 -F "fileupload=@-;filename=/dev/null;type=text/x-null;format=x-curl"
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F field1=contents1 -F "fileupload=@-;filename=/dev/null;type=text/x-null;format=x-curl"
 </command>
 
 <stdin>
@@ -49,7 +49,7 @@ line8
 ^(Content-Type: multipart/form-data;|------------).*
 </strip>
 <protocol>
-POST /we/want/173 HTTP/1.1\r
+POST /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index e5a9d6fcb2c60fc25eecfd39c433750767210e2d..d8090c5d5f1e7c87eca2d482119cb93cd7557f3c 100644 (file)
@@ -29,14 +29,14 @@ http
 HTTP POST --anyauth to server not requiring any auth at all
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/174 -u testuser:testpass --anyauth -d "junkelijunk"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth -d "junkelijunk"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /174 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 8b49a32b55c89f47166523a21b5f3dbbaf5f45e2..5385434486e0c7a7c953475ffde00f5a0a47921f 100644 (file)
@@ -56,21 +56,21 @@ crypto
 HTTP POST --digest to server not requiring any auth at all
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/175 -u auser:apasswd --digest -d "junkelijunk"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -d "junkelijunk"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /175 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-POST /175 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 5fe310facc4c52f91fc42519946e149dff9b1f8a..07ace476d6f3dc65fbb4cea4d58cfc7580c4fb64 100644 (file)
@@ -58,14 +58,14 @@ http
 HTTP POST --ntlm to server not requiring any auth at all
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/176 -u auser:apasswd --ntlm -d "junkelijunk"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --ntlm -d "junkelijunk"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /176 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/%VERSION\r
@@ -73,7 +73,7 @@ Accept: */*
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-POST /176 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index e31f1b7fa2ed9f11213695771c0f7383e6802f2a..c190f0523f09d3a3bb62e1d0731db542eafeecfd 100644 (file)
@@ -13,7 +13,7 @@ followlocation
 <data>
 HTTP/1.1 302 *MOVED* swsclose swsbounce\r
 Server: Microsoft-IIS/6.0\r
-Location: /mooooo/177\r
+Location: /mooooo/%TESTNUMBER\r
 Content-Type: text/html; charset=iso-8859-1\r
 \r
 </data>
@@ -32,14 +32,14 @@ crypto
 HTTP POST --digest to server doing a 302-location response
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/177 -u auser:apasswd --digest -d "junkelijunk"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -d "junkelijunk"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST /177 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index f479a6e4f22a921c8e97c2012f2f08edf22c0a35..67c68b0a92b1d4f161e024e66fcb61165d41bff0 100644 (file)
@@ -34,7 +34,7 @@ http
 HTTP response with negative Content-Length
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/178
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -42,7 +42,7 @@ http://%HOSTIP:%HTTPPORT/178
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /178 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index f1f380fbe34142591ba976e9809113d051fdf4bd..b5aaec2f46e0c1c2893e46c3f6a8e7ff3c5f529c 100644 (file)
@@ -31,9 +31,9 @@ http
 HTTP using proxy and cookies with path checks
  </name>
  <command>
-http://supertrooper.fake/c/179 -b log/injar179 -x %HOSTIP:%HTTPPORT
+http://supertrooper.fake/c/%TESTNUMBER -b log/injar%TESTNUMBER -x %HOSTIP:%HTTPPORT
 </command>
-<file name="log/injar179">
+<file name="log/injar%TESTNUMBER">
 supertrooper.fake      FALSE   /a      FALSE   2139150993      mooo    indeed
 supertrooper.fake      FALSE   /b      FALSE   0               moo1    indeed
 supertrooper.fake      FALSE   /c      FALSE   2139150993      moo2    indeed
@@ -46,7 +46,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://supertrooper.fake/c/179 HTTP/1.1\r
+GET http://supertrooper.fake/c/%TESTNUMBER HTTP/1.1\r
 Host: supertrooper.fake\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 0fe92f79b8b3b40e2cc5d92ded985da75f4de149..11b953ea67b06ca685d820f2767569cf25d08bfc 100644 (file)
@@ -41,43 +41,43 @@ http
 multiple requests using {} in URL
  </name>
  <command>
-"%HOSTIP:%HTTPPORT/{18,180002,180003}"
+"%HOSTIP:%HTTPPORT/{%TESTNUMBER,%TESTNUMBER0002,%TESTNUMBER0003}"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /18 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /180002 HTTP/1.1\r
+GET /%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /180003 HTTP/1.1\r
+GET /%TESTNUMBER0003 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 <stdout>
---_curl_--%HOSTIP:%HTTPPORT/18
+--_curl_--%HOSTIP:%HTTPPORT/%TESTNUMBER
 HTTP/1.1 200 OK\r
 Funny-head: yesyes\r
 Content-Length: 4\r
 \r
 moo
---_curl_--%HOSTIP:%HTTPPORT/180002
+--_curl_--%HOSTIP:%HTTPPORT/%TESTNUMBER0002
 HTTP/1.1 200 OK\r
 Funny-head: yesyes\r
 Content-Length: 4\r
 \r
 foo
---_curl_--%HOSTIP:%HTTPPORT/180003
+--_curl_--%HOSTIP:%HTTPPORT/%TESTNUMBER0003
 HTTP/1.1 200 OK\r
 Funny-head: yesyes\r
 Content-Length: 4\r
index 395f750e2232df9e64da8b5ac52b33d14158ac62..32ecd00a9a17ebe80d484167736d5e73197c57a5 100644 (file)
@@ -27,9 +27,9 @@ http
 HTTP 1.0 PUT
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/180 -T log/test180.txt --http1.0
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T log/test%TESTNUMBER.txt --http1.0
 </command>
-<file name="log/test180.txt">
+<file name="log/test%TESTNUMBER.txt">
 Weird
      file
          to
@@ -45,7 +45,7 @@ the
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /we/want/180 HTTP/1.0\r
+PUT /we/want/%TESTNUMBER HTTP/1.0\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 0f24c849499ad86b7a41df6d1d3510aa3afe4845..85e247c3cb9b4141e2f0578ad3fec53afc56d404 100644 (file)
@@ -33,14 +33,14 @@ http/2
 HTTP/2 upgrade refused
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1800 --http2
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http2
 </command>
 
 </client>
 
 <verify>
 <protocol>
-GET /1800 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 285eed53968de5dcbc023046ef1bd0ba0fc313b5..9494e92d8aaf93aa089281fe84039ec34f0d7427 100644 (file)
@@ -43,14 +43,14 @@ http/2
 HTTP/2 upgrade with lying server
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1801 --http2
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http2
 </command>
 
 </client>
 
 <verify>
 <protocol>
-GET /1801 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index df1ffccbf6addc0e92037c47225770c8cf6f584f..f496c29469a415e4406f6aa248390aa07118ae4a 100644 (file)
@@ -27,9 +27,9 @@ http
 HTTP 1.0 POST
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/181 --data-binary @log/test181.txt --http1.0
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --data-binary @log/test%TESTNUMBER.txt --http1.0
 </command>
-<file name="log/test181.txt">
+<file name="log/test%TESTNUMBER.txt">
 Weird
      file
          to
@@ -45,7 +45,7 @@ the
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST /we/want/181 HTTP/1.0\r
+POST /we/want/%TESTNUMBER HTTP/1.0\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index f640a0e1a95e0eac4d84cf7fb3145e7cd6e94e02..cb1e4f0c200e71c84839e6d54cddc1a85768198c 100644 (file)
@@ -23,7 +23,7 @@ ftp
 FTP download an empty file
 </name>
 <command>
-ftp://%HOSTIP:%FTPPORT/182
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -35,8 +35,8 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 182\r
-RETR 182\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 19184415737b60d1d5f3147b0adb7274eaa1d652..77d9d04f7d80e9ad76f329e82d1f686dff6415cd 100644 (file)
@@ -28,7 +28,7 @@ http
 HTTP GET two URLs over a single proxy with persistent connection
  </name>
  <command>
-http://deathstar.another.galaxy/183 http://a.galaxy.far.far.away/183 --proxy http://%HOSTIP:%HTTPPORT
+http://deathstar.another.galaxy/%TESTNUMBER http://a.galaxy.far.far.away/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -38,13 +38,13 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://deathstar.another.galaxy/183 HTTP/1.1\r
+GET http://deathstar.another.galaxy/%TESTNUMBER HTTP/1.1\r
 Host: deathstar.another.galaxy\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://a.galaxy.far.far.away/183 HTTP/1.1\r
+GET http://a.galaxy.far.far.away/%TESTNUMBER HTTP/1.1\r
 Host: a.galaxy.far.far.away\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index d6c396b02b582727fd25b5e9e7d9b98cc1e80248..9c795a28832c130a8a3372a6660697f75b8aeb40 100644 (file)
@@ -14,7 +14,7 @@ followlocation
 HTTP/1.1 301 OK swsbounce\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Content-Length: 4\r
-Location: http://yet.another.host/184
+Location: http://yet.another.host/%TESTNUMBER
 \r
 moo
 </data>
@@ -29,7 +29,7 @@ moo
 HTTP/1.1 301 OK swsbounce\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Content-Length: 4\r
-Location: http://yet.another.host/184
+Location: http://yet.another.host/%TESTNUMBER
 \r
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
@@ -48,7 +48,7 @@ http
 HTTP replace Host: when following Location: to new host
  </name>
  <command>
-http://deathstar.another.galaxy/184 -L -H "Host: another.visitor.stay.a.while.stay.foreeeeeever" --proxy http://%HOSTIP:%HTTPPORT
+http://deathstar.another.galaxy/%TESTNUMBER -L -H "Host: another.visitor.stay.a.while.stay.foreeeeeever" --proxy http://%HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -58,13 +58,13 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://deathstar.another.galaxy/184 HTTP/1.1\r
+GET http://deathstar.another.galaxy/%TESTNUMBER HTTP/1.1\r
 Host: another.visitor.stay.a.while.stay.foreeeeeever\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://yet.another.host/184 HTTP/1.1\r
+GET http://yet.another.host/%TESTNUMBER HTTP/1.1\r
 Host: yet.another.host\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 83b66d977b20dadf965746b46f7546368a45f27a..d614c1040606c451e259cb0c9926e4ff67131d5d 100644 (file)
@@ -14,7 +14,7 @@ followlocation
 HTTP/1.1 301 OK swsbounce\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Content-Length: 4\r
-Location: go/west/185\r
+Location: go/west/%TESTNUMBER\r
 \r
 moo
 </data>
@@ -29,7 +29,7 @@ moo
 HTTP/1.1 301 OK swsbounce\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Content-Length: 4\r
-Location: go/west/185\r
+Location: go/west/%TESTNUMBER\r
 \r
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
@@ -48,7 +48,7 @@ http
 HTTP replace Host: when following Location: on the same host
  </name>
  <command>
-http://deathstar.another.galaxy/185 -L -H "Host: another.visitor.stay.a.while.stay.foreeeeeever" --proxy http://%HOSTIP:%HTTPPORT
+http://deathstar.another.galaxy/%TESTNUMBER -L -H "Host: another.visitor.stay.a.while.stay.foreeeeeever" --proxy http://%HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -58,13 +58,13 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://deathstar.another.galaxy/185 HTTP/1.1\r
+GET http://deathstar.another.galaxy/%TESTNUMBER HTTP/1.1\r
 Host: another.visitor.stay.a.while.stay.foreeeeeever\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://deathstar.another.galaxy/go/west/185 HTTP/1.1\r
+GET http://deathstar.another.galaxy/go/west/%TESTNUMBER HTTP/1.1\r
 Host: another.visitor.stay.a.while.stay.foreeeeeever\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index f559819a0393580f7d29666813625e2431cb8d1d..35232b82cc4e188f7f4bdb8a9745afb2e8ee6ba4 100644 (file)
@@ -28,7 +28,7 @@ http
 HTTP RFC1867-type formposting with types on text fields
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/186 -F "name=daniel;type=moo/foo" -F "html= <body>hello</body>;type=text/html;charset=verymoo"
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "name=daniel;type=moo/foo" -F "html= <body>hello</body>;type=text/html;charset=verymoo"
 </command>
 # We create this file before the command is invoked!
 </client>
@@ -39,7 +39,7 @@ http://%HOSTIP:%HTTPPORT/we/want/186 -F "name=daniel;type=moo/foo" -F "html= <bo
 ^(Content-Type: multipart/form-data;|------------).*
 </strip>
 <protocol>
-POST /we/want/186 HTTP/1.1\r
+POST /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 2619d157a5b14cdcd76de64796a5a612bd8f0f74..2d5d0a883cc7b950fa4084c120ff3ad84aeb9572 100644 (file)
@@ -13,7 +13,7 @@ followlocation
 HTTP/1.1 301 This is a weirdo text message
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: /root/1870002.txt?coolsite=yes
+Location: /root/%TESTNUMBER0002.txt?coolsite=yes
 Connection: close
 
 This server reply is for testing a simple Location: following
@@ -32,7 +32,7 @@ If this is received, the location following worked
 HTTP/1.1 301 This is a weirdo text message
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: /root/1870002.txt?coolsite=yes
+Location: /root/%TESTNUMBER0002.txt?coolsite=yes
 Connection: close
 
 HTTP/1.1 200 Followed here fine swsclose
@@ -54,19 +54,19 @@ http
 HTTP redirect with bad host name separation and slash in parameters
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT?oh=what-weird=test/187 -L
+http://%HOSTIP:%HTTPPORT?oh=what-weird=test/%TESTNUMBER -L
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /?oh=what-weird=test/187 HTTP/1.1\r
+GET /?oh=what-weird=test/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /root/1870002.txt?coolsite=yes HTTP/1.1\r
+GET /root/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 14e95c8e865c392f717c55297fef24950a8b3469..8e8848e65a568b99a4ca6bad14c00548a74fa62b 100644 (file)
@@ -13,7 +13,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 301 OK swsbounce
-Location: /188
+Location: /%TESTNUMBER
 Content-Length: 3
 
 OK
@@ -29,7 +29,7 @@ Actual content
 
 <datacheck>
 HTTP/1.1 301 OK swsbounce
-Location: /188
+Location: /%TESTNUMBER
 Content-Length: 3
 
 HTTP/1.1 200 OK 
@@ -51,20 +51,20 @@ http
 HTTP GET with resume and redirect
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/188 -C 50 -L
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 50 -L
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /188 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=50-\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /188 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=50-\r
 User-Agent: curl/%VERSION\r
index 3435a52bed6bfc3a093e8746653ab02c35a5e9ef..e747d35268b706a6995d99e6c7fb8527abd04bd3 100644 (file)
@@ -10,7 +10,7 @@ HTTP GET
 <reply>
 <data>
 HTTP/1.1 301 OK swsbounce
-Location: /189
+Location: /%TESTNUMBER
 Content-Length: 3
 
 OK
@@ -25,7 +25,7 @@ Actual content
 
 <datacheck>
 HTTP/1.1 301 OK swsbounce
-Location: /189
+Location: /%TESTNUMBER
 Content-Length: 3
 
 HTTP/1.1 200 OK 
@@ -45,20 +45,20 @@ http
 HTTP GET with resume and redirect (to a page that doesn't resume)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/189 -C 50 -L
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 50 -L
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /189 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=50-\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /189 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=50-\r
 User-Agent: curl/%VERSION\r
index 6f5d66adf9f3dd049cb4a288d6b8734dbb5e0472..3a20ba26a3bbf7618bdfb4653060c00f01012d4f 100644 (file)
@@ -24,7 +24,7 @@ ftp
 FTP download with strict timeout and slow CWD
  </name>
  <command timeout="1">
-ftp://%HOSTIP:%FTPPORT/path/to/file/190 -m %FTPTIME2
+ftp://%HOSTIP:%FTPPORT/path/to/file/%TESTNUMBER -m %FTPTIME2
 </command>
 </client>
 
index f10814239c9ee8e83c6613a0caf1dc7a606ac0a5..5254c6379dd76f2db366d7f260b2b21c897f6e59 100644 (file)
@@ -51,7 +51,7 @@ http-proxy
 HTTP CONNECT with 204 response
  </name>
  <command>
-http://test.1904:%HTTPPORT/we/want/that/page/1904 -p --proxy %HOSTIP:%PROXYPORT
+http://test.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -p --proxy %HOSTIP:%PROXYPORT
 </command>
 <features>
 proxy
@@ -62,15 +62,15 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT test.1904:%HTTPPORT HTTP/1.1\r
-Host: test.1904:%HTTPPORT\r
+CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
+Host: test.%TESTNUMBER:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>
-GET /we/want/that/page/1904 HTTP/1.1\r
-Host: test.1904:%HTTPPORT\r
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1\r
+Host: test.%TESTNUMBER:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index 50354a971cfce3b183433acc84b823ef20bbd8a1..4d04f8183b7833935fb48a8c8d93cf779ac0ebeb 100644 (file)
@@ -30,22 +30,22 @@ http
 CURLOPT_COOKIELIST set to "FLUSH" of a shared cookie object
  </name>
 <tool>
-lib1905
+lib%TESTNUMBER
 </tool>
 <command>
-http://%HOSTIP:%HTTPPORT/we/want/1905
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/1905 HTTP/1.1\r
+GET /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
 </protocol>
-<file name="log/cookies1905" mode="text">
+<file name="log/cookies%TESTNUMBER" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
index 68f0ed5d018a576671c0ae578cd0755f44ad2c36..c43b0a9be4fcdfdc0b7a7690abc77ad76554c191 100644 (file)
@@ -27,20 +27,20 @@ http
 CURLOPT_CURLU and CURLOPT_PORT
  </name>
 <tool>
-lib1906
+lib%TESTNUMBER
 </tool>
 
 # The tool does two requesets, the first sets CURLOPT_PORT to 1
 # the second resets the port again and expects that request to work.
 <command>
-http://%HOSTIP:%HTTPPORT/1906
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1906 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
index a26cb6f7f2d6e87bf5432d3eb39bcd72a76c22b9..8536addde4ce00273230e1e4e0e0a574993c947c 100644 (file)
@@ -27,24 +27,24 @@ http
 CURLINFO_EFFECTIVE_URL with non-scheme URL
  </name>
 <tool>
-lib1907
+lib%TESTNUMBER
 </tool>
 
 <command>
-%HOSTIP:%HTTPPORT/hello/../1907
+%HOSTIP:%HTTPPORT/hello/../%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1907 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
 </protocol>
 <stdout>
-Effective URL: http://%HOSTIP:%HTTPPORT/1907
+Effective URL: http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </stdout>
 </verify>
 </testcase>
index a1f725fe637d8d835f5c02e0dfb0c08426b07bbf..0ac0e8626f65a6d4899785708f14fe70af8459c7 100644 (file)
@@ -47,22 +47,22 @@ alt-svc cache save after resetting the handle
 CURL_ALTSVC_HTTP="yeah"
 </setenv>
 <tool>
-lib1908
+lib%TESTNUMBER
 </tool>
 
 <command>
-%HOSTIP:%HTTPPORT/1908
+%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1908 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
-GET /1908 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
@@ -72,7 +72,7 @@ Accept: */*
 # matches
 s/\"([^\"]*)\"/TIMESTAMP/
 </stripfile>
-<file name="log/altsvc-1908" mode="text">
+<file name="log/altsvc-%TESTNUMBER" mode="text">
 # Your alt-svc cache. https://curl.se/docs/alt-svc.html
 # This file was generated by libcurl! Edit at your own risk.
 h1 127.0.0.1 %HTTPPORT h2 3dbbdetxoyw4nsp6c3cc456oj2ays6s43ezxzsfxxri3h5xqd.example 443 TIMESTAMP 1 0
index ba082529ae1a944a611a15268f8b813224505bd7..64e7b0526e6d60c14529b3c4520a84c06165951a 100644 (file)
@@ -36,7 +36,7 @@ http
 HTTP GET --retry-all-errors to overcome partial transfer
  </name>
  <command option="no-output,no-include">
---retry 1 --retry-all-errors -o log/outfile1909 http://%HOSTIP:%HTTPPORT/1909
+--retry 1 --retry-all-errors -o log/outfile%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -44,19 +44,19 @@ HTTP GET --retry-all-errors to overcome partial transfer
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1909 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /1909 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 
-<file1 name="log/outfile1909">
+<file1 name="log/outfile%TESTNUMBER">
 data
 </file1>
 
index 86fa29f932ed8b310b617e41994dde81a3936a8a..1fde7687349fe71aba6ce292ad86e365fd0bff5d 100644 (file)
@@ -21,7 +21,7 @@ ftp
 FTP URL with ?-letters in username and password 
  </name>
  <command>
-"ftp://use%3fr:pass%3fword@%HOSTIP:%FTPPORT/191"
+"ftp://use%3fr:pass%3fword@%HOSTIP:%FTPPORT/%TESTNUMBER"
 </command>
 </client>
 
@@ -33,8 +33,8 @@ PASS pass?word
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 191\r
-RETR 191\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index d6ec28fadaec6d6d303ff1261493788086b8a913..67dfff9a9797d3a5de87c039a20fa8b9cb2d8b24 100644 (file)
@@ -15,7 +15,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Type: text/html
 Content-Length: 0
-Location: /19100002
+Location: /%TESTNUMBER0002
 
 </data>
 <data2>
@@ -39,23 +39,23 @@ http
 HTTP credentials with newline and redirect
 </name>
 <tool>
-lib1910
+lib%TESTNUMBER
 </tool>
 
 <command>
-%HOSTIP:%HTTPPORT/1910
+%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1910 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dXNlcgpuYW1lOnBhc3MKd29yZA==\r
 Accept: */*\r
 \r
-GET /19100002 HTTP/1.1\r
+GET /%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dXNlcgpuYW1lOnBhc3MKd29yZA==\r
 Accept: */*\r
index ec5f531af917b173606a51847bd8b55e774deeca..07e87a64c885b163c6fd3de881e7f331714bb703 100644 (file)
@@ -18,7 +18,7 @@ none
 verify that curl_easy_setopt() rejects too long string inputs
 </name>
 <tool>
-lib1911
+lib%TESTNUMBER
 </tool>
 
 </client>
index ed6b27b5b869699790437855b53cd716720495f3..85dca0d6b63c2e77d3986afb3cef3f47f291b4d7 100644 (file)
@@ -19,7 +19,7 @@ none
 Cross validate that gcc-typecheck macros match the option types.
 </name>
 <tool>
-lib1912
+lib%TESTNUMBER
 </tool>
 
 </client>
index daf749025ab183e45383498d3370c9d1b6655dcf..b9ac2cbdfe93dab76a85144b497dd63efc8c664e 100644 (file)
@@ -24,11 +24,11 @@ ftp
 FTP with NOBODY set, getting a missing file
 </name>
 <tool>
-lib1913
+lib%TESTNUMBER
 </tool>
 
 <command>
-ftp://%HOSTIP:%FTPPORT/not-there/1913
+ftp://%HOSTIP:%FTPPORT/not-there/%TESTNUMBER
 </command>
 </client>
 
index 85021393053efa5ca7b7a3fc6088186d2a307442..c47840adf6b4b66e9fa5dcce588426539332094c 100644 (file)
@@ -26,11 +26,11 @@ none
 HSTS read/write callbacks
 </name>
 <tool>
-lib1915
+lib%TESTNUMBER
 </tool>
 
 <command>
-http://%HOSTIP:%NOLISTENPORT/not-there/1915
+http://%HOSTIP:%NOLISTENPORT/not-there/%TESTNUMBER
 </command>
 </client>
 
index e3b87bcd4217c76ec4f02f587f539ad6d66f3429..2e495f1d0366950e2f0bab9f1a0dace77baeabe2 100644 (file)
@@ -30,7 +30,7 @@ mqtt
 MQTT PUBLISH with no POSTFIELDSIZE set
 </name>
 <tool>
-lib1916
+lib%TESTNUMBER
 </tool>
 <command option="binary-trace">
 "mqtt://%HOSTIP:%MQTTPORT/ "
index f125c46db97208bb68dbdc14189c2e00ff24adff..22b981a7de9d71eee4598f57940fae91cde96113 100644 (file)
@@ -33,7 +33,7 @@ mqtt
 MQTT PUBLISH with CURLOPT_POST set (no payload)
 </name>
 <tool>
-lib1917
+lib%TESTNUMBER
 </tool>
 <command option="binary-trace">
 "mqtt://%HOSTIP:%MQTTPORT/ "
index 32fc393365a9e1e3b70fd6ebac53fdd022b1c843..e9fe441402fbd1759a2b8dc9c58bbe7b4b79bae7 100644 (file)
@@ -20,7 +20,7 @@ none
 curl_easy_option_by_name() and curl_easy_option_by_id()
 </name>
 <tool>
-lib1918
+lib%TESTNUMBER
 </tool>
 
 </client>
index 175a5453af1c488c954f46dd095e36bbb71316dc..7edf316867db8b8eee9ea7aa770aca541592618f 100644 (file)
@@ -29,7 +29,7 @@ http
 HTTP GET -w num_connects with one simple connect
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/192 -w "%{num_connects}\n"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n"
 </command>
 </client>
 
@@ -37,7 +37,7 @@ http://%HOSTIP:%HTTPPORT/192 -w "%{num_connects}\n"
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /192 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index ddf4ab46c74ed992caf7dcddadd0fbc995a1117d..4403b2c5e9757fb0b9c7a8892360abe1cb215652 100644 (file)
@@ -16,7 +16,7 @@ HTTP/1.1 302 OK swsbounce swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 8
 Connection: close
-Location: ./193
+Location: ./%TESTNUMBER
 
 monster
 </data>
@@ -41,7 +41,7 @@ http
 HTTP GET -w num_connects with redirected fetch (2 connects)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/193 -w "%{num_connects}\n" -L
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n" -L
 </command>
 </client>
 
@@ -49,12 +49,12 @@ http://%HOSTIP:%HTTPPORT/193 -w "%{num_connects}\n" -L
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /193 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /193 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -66,7 +66,7 @@ HTTP/1.1 302 OK swsbounce swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 8
 Connection: close
-Location: ./193
+Location: ./%TESTNUMBER
 
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
index bc259b9c03b260aa72b2b1c26c555f1df6f7bac0..69bcbca42b1863430bd11b826a8866c2a166f820 100644 (file)
@@ -14,7 +14,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Type: text/html
 Content-Length: 0
-Location: /19330002
+Location: /%TESTNUMBER0002
 
 </data>
 <data2>
@@ -43,11 +43,11 @@ crypto
 HTTP AWS_SIGV4 with one provider and auth cred via URL
 </name>
 <tool>
-lib1933
+lib%TESTNUMBER
 </tool>
 
 <command>
-http://xxx:yyy@%HOSTIP:%HTTPPORT/1933/testapi/test
+http://xxx:yyy@%HOSTIP:%HTTPPORT/%TESTNUMBER/testapi/test
 </command>
 </client>
 
@@ -59,7 +59,7 @@ http://xxx:yyy@%HOSTIP:%HTTPPORT/1933/testapi/test
 ^Accept:.*
 </strip>
 <protocol>
-GET /1933/testapi/test HTTP/1.1\r
+GET /%TESTNUMBER/testapi/test HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/0/127/xxx4_request, SignedHeaders=content-type;host;x-xxx-date, Signature=d2c2dff48c59ec49dc31ef94f18c5dc1ac3eae2a70d51633a4342dadc0683664\r
 X-Xxx-Date: 19700101T000000Z\r
index 15bb926907aa1708396c95de0cc4b01621bd48d8..a73d7b0ff23e3a9a39f8c2f9dd5547a14f2f4a64 100644 (file)
@@ -14,7 +14,7 @@ Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Type: text/html
 Content-Length: 0
-Location: /19340002
+Location: /%TESTNUMBER0002
 
 </data>
 <data2>
@@ -43,11 +43,11 @@ crypto
 HTTP AWS_SIGV4 with two providers
 </name>
 <tool>
-lib1934
+lib%TESTNUMBER
 </tool>
 
 <command>
-http://%HOSTIP:%HTTPPORT/1934/testapi/test
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER/testapi/test
 </command>
 </client>
 
@@ -59,7 +59,7 @@ http://%HOSTIP:%HTTPPORT/1934/testapi/test
 ^Accept:.*
 </strip>
 <protocol>
-GET /1934/testapi/test HTTP/1.1\r
+GET /%TESTNUMBER/testapi/test HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/0/127/xxx4_request, SignedHeaders=content-type;host;x-yyy-date, Signature=938937ca7da6bb3dbf15e30928265ec6f061532d035d2afda92fa7cb10feb196\r
 X-Yyy-Date: 19700101T000000Z\r
index 3744a32d52468fe20af69486b97dfea6c597c3b0..b27f0cdbd549474d4c2840a6a80559db85d4ccaa 100644 (file)
@@ -14,7 +14,7 @@ Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Type: text/html
 Content-Length: 0
-Location: /19350002
+Location: /%TESTNUMBER0002
 
 </data>
 <data2>
@@ -43,11 +43,11 @@ crypto
 HTTP AWS_SIGV4 with two providers and region
 </name>
 <tool>
-lib1935
+lib%TESTNUMBER
 </tool>
 
 <command>
-http://%HOSTIP:%HTTPPORT/1935/testapi/test
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER/testapi/test
 </command>
 </client>
 
@@ -59,7 +59,7 @@ http://%HOSTIP:%HTTPPORT/1935/testapi/test
 ^Accept:.*
 </strip>
 <protocol>
-GET /1935/testapi/test HTTP/1.1\r
+GET /%TESTNUMBER/testapi/test HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/rrr/127/xxx4_request, SignedHeaders=content-type;host;x-yyy-date, Signature=240750deb9263d4c8ece71c016f3919b56e518249390ef075740f94ef8df846f\r
 X-Yyy-Date: 19700101T000000Z\r
index 61a52db9d0c0195b3487cd3ef4da9d28001060a1..7265e33d16edf3c6eaa40a58aa33f5135226df7c 100644 (file)
@@ -14,7 +14,7 @@ Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Type: text/html
 Content-Length: 0
-Location: /19360002
+Location: /%TESTNUMBER0002
 
 </data>
 <data2>
@@ -43,11 +43,11 @@ crypto
 HTTP AWS_SIGV4 with two providers, region and service
 </name>
 <tool>
-lib1936
+lib%TESTNUMBER
 </tool>
 
 <command>
-http://%HOSTIP:%HTTPPORT/1936/testapi/test
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER/testapi/test
 </command>
 </client>
 
@@ -59,7 +59,7 @@ http://%HOSTIP:%HTTPPORT/1936/testapi/test
 ^Accept:.*
 </strip>
 <protocol>
-GET /1936/testapi/test HTTP/1.1\r
+GET /%TESTNUMBER/testapi/test HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/rrr/sss/xxx4_request, SignedHeaders=content-type;host;x-yyy-date, Signature=f32cf87977cea5d3274b524b53e5d28f4aac54c372f710ae0cc3a9ececaf169f\r
 X-Yyy-Date: 19700101T000000Z\r
index 8c2b863a031eb32c36d6a08734fb109677d7e262..924e9a940bfacad6d95bd07669f97fe6feebe9d6 100644 (file)
@@ -50,14 +50,14 @@ http
 HTTP resume transfer with the whole file already downloaded and --fail
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/194 -C 87 --fail
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -C 87 --fail
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/194 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=87-\r
 User-Agent: curl/%VERSION\r
index 3059e8d959df23ed33d1a6791435f8a470043fb3..920ab8af32f2edcd15cf4b5527d42271a98db07e 100644 (file)
@@ -21,7 +21,7 @@ ftp
 FTP response 530 after PASS, temporarily not allowed access
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/195
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
index 31f724b84274fee61064169e41ebe3a4337126fa..715a6ce675ab4be9f22ab3f019addf258b13e218 100644 (file)
@@ -22,7 +22,7 @@ ftp
 FTP transient error, retry request once
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/196 --retry 1
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --retry 1
 </command>
 </client>
 
index b3e931efaefbc7ce6c83ce7c303834e2c06a0ddf..70198732a6261a2126ba4a4143d58dddcff6c4bc 100644 (file)
@@ -37,7 +37,7 @@ http
 HTTP GET --retry on 503 error with output to stdout
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/197 --retry 1000
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 1000
 </command>
 </client>
 
@@ -45,12 +45,12 @@ http://%HOSTIP:%HTTPPORT/197 --retry 1000
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /197 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /197 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 18ed14e4f66a8454ebcd17aa0b50a7f5f33bad0d..08fafde6cd746507621fb065515b844bb98c0300 100644 (file)
@@ -46,7 +46,7 @@ http
 HTTP GET --retry on 503 error with output to file
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/198 --retry 1000
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 1000
 </command>
 </client>
 
@@ -54,12 +54,12 @@ http://%HOSTIP:%HTTPPORT/198 --retry 1000
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /198 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /198 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 40d9f9bf33102f49b71c54ecea276d50e363ded4..b997c5c4bb6bdc1fdfda213ce71e6db655302a38 100644 (file)
@@ -35,7 +35,7 @@ http
 HTTP with -d, -G and {}
  </name>
  <command>
--d "foo=moo&moo=poo" "http://%HOSTIP:%HTTPPORT/{199,199}" -G
+-d "foo=moo&moo=poo" "http://%HOSTIP:%HTTPPORT/{%TESTNUMBER,%TESTNUMBER}" -G
 </command>
 </client>
 
@@ -43,12 +43,12 @@ HTTP with -d, -G and {}
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /199?foo=moo&moo=poo HTTP/1.1\r
+GET /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /199?foo=moo&moo=poo HTTP/1.1\r
+GET /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 8d2cf87d8a162fe6b369519e5583f186d532d01f..80e47b082af7edee4924b04b738a4065c2afc111 100644 (file)
@@ -29,7 +29,7 @@ http
 HTTP GET with user and password
  </name>
  <command>
- -u fake:user http://%HOSTIP:%HTTPPORT/2
+ -u fake:user http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -37,15 +37,12 @@ HTTP GET with user and password
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic ZmFrZTp1c2Vy\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<data>
-[insert full protocol verifiction dump here]
-</data>
 </verify>
 </testcase>
index d8adda7d817ebc1d5eb13d9939feaa19b8fccf51..e7c5146f7711709871d330fd782b77ae91e9ec26 100644 (file)
@@ -24,9 +24,9 @@ file
 basic file:// file
  </name>
 <command option="no-include">
-file://localhost%FILE_PWD/log/test200.txt
+file://localhost%FILE_PWD/log/test%TESTNUMBER.txt
 </command>
-<file name="log/test200.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo
    bar
 bar
index a91dcd2c762c704cd8534581e7c359ff18578a09..32604c6f31b617cdf9461f6eaa3fcd43e56f548e 100644 (file)
@@ -32,9 +32,9 @@ file
 FTP RETR followed by FILE
  </name>
 <command option="no-include">
-ftp://%HOSTIP:%FTPPORT/2000 file://localhost%FILE_PWD/log/test2000.txt
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER file://localhost%FILE_PWD/log/test%TESTNUMBER.txt
 </command>
-<file name="log/test2000.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo
    bar
 bar
@@ -52,8 +52,8 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 2000\r
-RETR 2000\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 <stdout>
index 9646465798b09c5cad16c85c94a58a19c67a095f..e85fd1ffc2540e728aa528c39449ab3a5895e005 100644 (file)
@@ -49,9 +49,9 @@ file
 HTTP GET followed by FTP RETR followed by FILE
  </name>
 <command option="no-include">
-http://%HOSTIP:%HTTPPORT/20010001 ftp://%HOSTIP:%FTPPORT/20010002 file://localhost%FILE_PWD/log/test2001.txt
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt
 </command>
-<file name="log/test2001.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo
    bar
 bar
@@ -64,7 +64,7 @@ moo
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /20010001 HTTP/1.1\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -74,8 +74,8 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 20010002\r
-RETR 20010002\r
+SIZE %TESTNUMBER0002\r
+RETR %TESTNUMBER0002\r
 QUIT\r
 </protocol>
 <stdout>
index bbdafe152e3db999d929ecb334b286f287703cb9..68144f8cf477563700366801995b1ce114d303b9 100644 (file)
@@ -58,9 +58,9 @@ tftp
 HTTP GET followed by FTP RETR followed by FILE followed by TFTP RRQ
  </name>
 <command option="no-include">
-http://%HOSTIP:%HTTPPORT/20020001 ftp://%HOSTIP:%FTPPORT/20020002 file://localhost%FILE_PWD/log/test2002.txt tftp://%HOSTIP:%TFTPPORT//20020003
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER0003
 </command>
-<file name="log/test2002.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo
    bar
 bar
@@ -73,7 +73,7 @@ moo
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /20020001 HTTP/1.1\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -83,14 +83,14 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 20020002\r
-RETR 20020002\r
+SIZE %TESTNUMBER0002\r
+RETR %TESTNUMBER0002\r
 opcode: 1
 mode: octet
 tsize: 0
 blksize: 512
 timeout: 6
-filename: /20020003
+filename: /%TESTNUMBER0003
 QUIT\r
 </protocol>
 <stdout>
index 1ae68f9829252d995f5dd0e01bc0e9b12abbf97a..76d85211ac15449faf1bd2d6e9d61b564c2147a6 100644 (file)
@@ -58,9 +58,9 @@ tftp
 HTTP GET followed by FTP RETR followed by FILE followed by TFTP RRQ then again in reverse order
  </name>
 <command option="no-include">
-http://%HOSTIP:%HTTPPORT/20030001 ftp://%HOSTIP:%FTPPORT/20030002 file://localhost%FILE_PWD/log/test2003.txt tftp://%HOSTIP:%TFTPPORT//20030003 tftp://%HOSTIP:%TFTPPORT//20030003 file://localhost%FILE_PWD/log/test2003.txt ftp://%HOSTIP:%FTPPORT/20030002 http://%HOSTIP:%HTTPPORT/20030001
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER0003 tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER0003 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002 http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001
 </command>
-<file name="log/test2003.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo
    bar
 bar
@@ -73,7 +73,7 @@ moo
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /20030001 HTTP/1.1\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -83,24 +83,24 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 20030002\r
-RETR 20030002\r
+SIZE %TESTNUMBER0002\r
+RETR %TESTNUMBER0002\r
 opcode: 1
 mode: octet
 tsize: 0
 blksize: 512
 timeout: 6
-filename: /20030003
+filename: /%TESTNUMBER0003
 opcode: 1
 mode: octet
 tsize: 0
 blksize: 512
 timeout: 6
-filename: /20030003
+filename: /%TESTNUMBER0003
 EPSV\r
-SIZE 20030002\r
-RETR 20030002\r
-GET /20030001 HTTP/1.1\r
+SIZE %TESTNUMBER0002\r
+RETR %TESTNUMBER0002\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index f9add83d5699c169ff5a94a81e2b65d2bb3ad9df..6ef9c6cfd3865830e2007a8bdbbe66f8a5470b53 100644 (file)
@@ -30,9 +30,9 @@ sftp
 TFTP RRQ followed by SFTP retrieval followed by FILE followed by SCP retrieval then again in reverse order
  </name>
 <command option="no-include">
---key curl_client_key --pubkey curl_client_key.pub -u %USER: tftp://%HOSTIP:%TFTPPORT//2004 sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test2004.txt file://localhost%FILE_PWD/log/test2004.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/log/test2004.txt file://localhost%FILE_PWD/log/test2004.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test2004.txt tftp://%HOSTIP:%TFTPPORT//2004 --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.txt file://localhost%FILE_PWD/log/test%TESTNUMBER.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.txt file://localhost%FILE_PWD/log/test%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --insecure
 </command>
-<file name="log/test2004.txt">
+<file name="log/test%TESTNUMBER.txt">
 This is test data
 for several protocols
 </file>
@@ -47,13 +47,13 @@ mode: octet
 tsize: 0
 blksize: 512
 timeout: 6
-filename: /2004
+filename: /%TESTNUMBER
 opcode: 1
 mode: octet
 tsize: 0
 blksize: 512
 timeout: 6
-filename: /2004
+filename: /%TESTNUMBER
 </protocol>
 <stdout>
 Test data file
index f26bf239a2951bdbc06652d850db386c97f8f093..bbc321b52dd71967725095376ebdf44e8aea67c0 100644 (file)
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 37
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2005; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Data delivered from an HTTP resource
@@ -38,26 +38,26 @@ Metalink
 Metalink local XML file, HTTP resource
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2005.metalink
+--metalink file://%PWD/log/test%TESTNUMBER.metalink
 </command>
 # local metalink file written before test command runs
-<file name="log/test2005.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="log/download2005">
+  <file name="log/download%TESTNUMBER">
    <verification>
     <hash type="sha256">a430d26389c69b7a245a9ad692cf20b4dc026fb7c2ff8a2c164c49a77130d6d9</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2005</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2005 log/name2005
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -65,24 +65,24 @@ perl %SRCDIR/libtest/notexists.pl log/2005 log/name2005
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2005 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file1 name="log/download2005">
+<file1 name="log/download%TESTNUMBER">
 Data delivered from an HTTP resource
 </file1>
-<file2 name="log/stdout2005">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
-<file3 name="log/stderr2005" mode="text">
-Metalink: parsing (file://%PWD/log/test2005.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2005.metalink) OK
-Metalink: fetching (log/download2005) from (http://%HOSTIP:%HTTPPORT/2005)...
-Metalink: fetching (log/download2005) from (http://%HOSTIP:%HTTPPORT/2005) OK
-Metalink: validating (log/download2005)...
-Metalink: validating (log/download2005) [sha-256] OK
+<file3 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) OK
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER)...
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER) OK
+Metalink: validating (log/download%TESTNUMBER)...
+Metalink: validating (log/download%TESTNUMBER) [sha-256] OK
 </file3>
 <stripfile3>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
index addf86f014df58fce044499fe1c90778cb5486de..d4091b48b18ff32dade73740727175190ff9b697 100644 (file)
@@ -18,7 +18,7 @@ Server: test-server/fake
 Content-Length: 42
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2006; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Some data delivered from an HTTP resource
@@ -46,27 +46,27 @@ Metalink local XML file, HTTP resource, using -O -D file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2006.metalink -O -D log/heads2006
+--metalink file://%PWD/log/test%TESTNUMBER.metalink -O -D log/heads%TESTNUMBER
 </command>
 # local metalink file written before test command runs
-<file name="log/test2006.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="log/download2006">
+  <file name="log/download%TESTNUMBER">
    <verification>
     <hash type="md5">we-only-check-the-strongest-hash-provided</hash>
     <hash type="sha256">319cb6be756734b7ff689628ca3265580cdae6a0e38f42d4ac612ff4fba143b0</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2006</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2006 log/name2006
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -74,13 +74,13 @@ perl %SRCDIR/libtest/notexists.pl log/2006 log/name2006
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2006 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file1 name="log/download2006">
+<file1 name="log/download%TESTNUMBER">
 Some data delivered from an HTTP resource
 </file1>
 
@@ -90,7 +90,7 @@ Some data delivered from an HTTP resource
 s/Last-Modified:.*//
 s/Content-Length: 49[67]/Content-Length: yeps/
 </stripfile2>
-<file2 name="log/heads2006">
+<file2 name="log/heads%TESTNUMBER">
 Content-Length: yeps\r
 Accept-ranges: bytes\r
 
@@ -101,19 +101,19 @@ Server: test-server/fake
 Content-Length: 42
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2006; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 </file2>
-<file3 name="log/stdout2006">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
-<file4 name="log/stderr2006" mode="text">
-Metalink: parsing (file://%PWD/log/test2006.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2006.metalink) OK
-Metalink: fetching (log/download2006) from (http://%HOSTIP:%HTTPPORT/2006)...
-Metalink: fetching (log/download2006) from (http://%HOSTIP:%HTTPPORT/2006) OK
-Metalink: validating (log/download2006)...
-Metalink: validating (log/download2006) [sha-256] OK
+<file4 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) OK
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER)...
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER) OK
+Metalink: validating (log/download%TESTNUMBER)...
+Metalink: validating (log/download%TESTNUMBER) [sha-256] OK
 </file4>
 <stripfile4>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
index 4c456151a3db4e1ea0437136e7e89965a2d04430..679de26e1e57d8df12b7090fa970da38524ca2ed 100644 (file)
@@ -19,7 +19,7 @@ Server: test-server/fake
 Content-Length: 42
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2007; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Something delivered from an HTTP resource
@@ -47,27 +47,27 @@ Metalink local XML file, HTTP resource, using -O -J -D file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2007.metalink -J -O -D log/heads2007
+--metalink file://%PWD/log/test%TESTNUMBER.metalink -J -O -D log/heads%TESTNUMBER
 </command>
 # local metalink file written before test command runs
-<file name="log/test2007.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="log/download2007">
+  <file name="log/download%TESTNUMBER">
    <verification>
     <hash type="md5">we-only-check-the-strongest-hash-provided</hash>
     <hash type="sha256">52899e30f80e3490632d505653204e1fb5b02bda141048704ce9a0ed00b8a3f5</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2007</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2007 log/name2007
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -75,13 +75,13 @@ perl %SRCDIR/libtest/notexists.pl log/2007 log/name2007
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2007 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file1 name="log/download2007">
+<file1 name="log/download%TESTNUMBER">
 Something delivered from an HTTP resource
 </file1>
 # The Content-Length replace here is to handle with 4/5 digit port number in
@@ -90,7 +90,7 @@ Something delivered from an HTTP resource
 s/Last-Modified:.*//
 s/Content-Length: 49[67]/Content-Length: yeps/
 </stripfile2>
-<file2 name="log/heads2007">
+<file2 name="log/heads%TESTNUMBER">
 Content-Length: yeps\r
 Accept-ranges: bytes\r
 
@@ -101,19 +101,19 @@ Server: test-server/fake
 Content-Length: 42
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2007; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 </file2>
-<file3 name="log/stdout2007">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
-<file4 name="log/stderr2007" mode="text">
-Metalink: parsing (file://%PWD/log/test2007.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2007.metalink) OK
-Metalink: fetching (log/download2007) from (http://%HOSTIP:%HTTPPORT/2007)...
-Metalink: fetching (log/download2007) from (http://%HOSTIP:%HTTPPORT/2007) OK
-Metalink: validating (log/download2007)...
-Metalink: validating (log/download2007) [sha-256] OK
+<file4 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) OK
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER)...
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER) OK
+Metalink: validating (log/download%TESTNUMBER)...
+Metalink: validating (log/download%TESTNUMBER) [sha-256] OK
 </file4>
 <stripfile4>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
index ec41adb35d75c88663cd5f81f4b4efe34fc61a6c..75ed402c7ffb73bb30d0baaa738a17c690e9712d 100644 (file)
@@ -18,7 +18,7 @@ Server: test-server/fake
 Content-Length: 43
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2008; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Some stuff delivered from an HTTP resource
@@ -39,27 +39,27 @@ http
 Metalink local XML file, HTTP resource, using -o fname -D file
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2008.metalink -o log/outfile2008 -D log/heads2008
+--metalink file://%PWD/log/test%TESTNUMBER.metalink -o log/outfile%TESTNUMBER -D log/heads%TESTNUMBER
 </command>
 # local metalink file written before test command runs
-<file name="log/test2008.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="log/download2008">
+  <file name="log/download%TESTNUMBER">
    <verification>
     <hash type="md5">we-only-check-the-strongest-hash-provided</hash>
     <hash type="sha256">711b1b566b536c5baae9b36f2f5c1830a7c8ff126d1afa2febc5b59f8d0aab54</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2008</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2008 log/name2008 log/outfile2008
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER log/outfile%TESTNUMBER
 </postcheck>
 </client>
 
@@ -67,13 +67,13 @@ perl %SRCDIR/libtest/notexists.pl log/2008 log/name2008 log/outfile2008
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2008 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file1 name="log/download2008">
+<file1 name="log/download%TESTNUMBER">
 Some stuff delivered from an HTTP resource
 </file1>
 # The Content-Length replace here is to handle with 4/5 digit port number in
@@ -82,7 +82,7 @@ Some stuff delivered from an HTTP resource
 s/Last-Modified:.*//
 s/Content-Length: 49[67]/Content-Length: yeps/
 </stripfile2>
-<file2 name="log/heads2008">
+<file2 name="log/heads%TESTNUMBER">
 Content-Length: yeps\r
 Accept-ranges: bytes\r
 
@@ -93,19 +93,19 @@ Server: test-server/fake
 Content-Length: 43
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2008; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 </file2>
-<file3 name="log/stdout2008">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
-<file4 name="log/stderr2008" mode="text">
-Metalink: parsing (file://%PWD/log/test2008.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2008.metalink) OK
-Metalink: fetching (log/download2008) from (http://%HOSTIP:%HTTPPORT/2008)...
-Metalink: fetching (log/download2008) from (http://%HOSTIP:%HTTPPORT/2008) OK
-Metalink: validating (log/download2008)...
-Metalink: validating (log/download2008) [sha-256] OK
+<file4 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) OK
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER)...
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER) OK
+Metalink: validating (log/download%TESTNUMBER)...
+Metalink: validating (log/download%TESTNUMBER) [sha-256] OK
 </file4>
 <stripfile4>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
index aa71a0ac1f75ac32ec4d9269c3c309eb4d0cdadf..443559a976b87029d638ed7f483b34098545b506 100644 (file)
@@ -19,7 +19,7 @@ Server: test-server/fake
 Content-Length: 46
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2009; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Some contents delivered from an HTTP resource
@@ -40,27 +40,27 @@ http
 Metalink local XML file, HTTP resource, using -o fname -J -D file
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2009.metalink -J -o log/outfile2009 -D log/heads2009
+--metalink file://%PWD/log/test%TESTNUMBER.metalink -J -o log/outfile%TESTNUMBER -D log/heads%TESTNUMBER
 </command>
 # local metalink file written before test command runs
-<file name="log/test2009.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="log/download2009">
+  <file name="log/download%TESTNUMBER">
    <verification>
     <hash type="md5">we-only-check-the-strongest-hash-provided</hash>
     <hash type="sha256">e4c5b83384ba7d5f8e201d61747a14f29baacd7dfadce0fbd56661db4bba72b2</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2009</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2009 log/name2009 log/outfile2009
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER log/outfile%TESTNUMBER
 </postcheck>
 </client>
 
@@ -68,13 +68,13 @@ perl %SRCDIR/libtest/notexists.pl log/2009 log/name2009 log/outfile2009
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2009 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file1 name="log/download2009">
+<file1 name="log/download%TESTNUMBER">
 Some contents delivered from an HTTP resource
 </file1>
 # The Content-Length replace here is to handle with 4/5 digit port number in
@@ -83,7 +83,7 @@ Some contents delivered from an HTTP resource
 s/Last-Modified:.*//
 s/Content-Length: 49[67]/Content-Length: yeps/
 </stripfile2>
-<file2 name="log/heads2009">
+<file2 name="log/heads%TESTNUMBER">
 Content-Length: yeps\r
 Accept-ranges: bytes\r
 
@@ -94,19 +94,19 @@ Server: test-server/fake
 Content-Length: 46
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2009; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 </file2>
-<file3 name="log/stdout2009">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
-<file4 name="log/stderr2009" mode="text">
-Metalink: parsing (file://%PWD/log/test2009.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2009.metalink) OK
-Metalink: fetching (log/download2009) from (http://%HOSTIP:%HTTPPORT/2009)...
-Metalink: fetching (log/download2009) from (http://%HOSTIP:%HTTPPORT/2009) OK
-Metalink: validating (log/download2009)...
-Metalink: validating (log/download2009) [sha-256] OK
+<file4 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) OK
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER)...
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER) OK
+Metalink: validating (log/download%TESTNUMBER)...
+Metalink: validating (log/download%TESTNUMBER) [sha-256] OK
 </file4>
 <stripfile4>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
index cd0c4835457794def224a23982c43f88b33aa05e..11affe9a112cf9cbd6c3f32b0340b34aee9087e2 100644 (file)
@@ -18,7 +18,7 @@ Server: test-server/fake
 Content-Length: 41
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2010; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Contents delivered from an HTTP resource
@@ -39,27 +39,27 @@ http
 Metalink local XML file, HTTP resource, using -o fname -D file
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2010.metalink -o log/outfile2010 -D log/heads2010
+--metalink file://%PWD/log/test%TESTNUMBER.metalink -o log/outfile%TESTNUMBER -D log/heads%TESTNUMBER
 </command>
 # local metalink file written before test command runs
-<file name="log/test2010.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="log/download2010">
+  <file name="log/download%TESTNUMBER">
    <verification>
     <hash type="md5">we-only-check-the-strongest-hash-provided</hash>
     <hash type="sha256">19dcb4e2a99b9cd02c30b1ed6c55869b7ef8cda9f985648909c48a6dbb54356c</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2010</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2010 log/name2010 log/outfile2010
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER log/outfile%TESTNUMBER
 </postcheck>
 </client>
 
@@ -67,13 +67,13 @@ perl %SRCDIR/libtest/notexists.pl log/2010 log/name2010 log/outfile2010
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2010 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file1 name="log/download2010">
+<file1 name="log/download%TESTNUMBER">
 Contents delivered from an HTTP resource
 </file1>
 # The Content-Length replace here is to handle with 4/5 digit port number in
@@ -82,7 +82,7 @@ Contents delivered from an HTTP resource
 s/Last-Modified:.*//
 s/Content-Length: 49[67]/Content-Length: yeps/
 </stripfile2>
-<file2 name="log/heads2010">
+<file2 name="log/heads%TESTNUMBER">
 Content-Length: yeps\r
 Accept-ranges: bytes\r
 
@@ -93,19 +93,19 @@ Server: test-server/fake
 Content-Length: 41
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2010; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 </file2>
-<file3 name="log/stdout2010">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
-<file4 name="log/stderr2010" mode="text">
-Metalink: parsing (file://%PWD/log/test2010.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2010.metalink) OK
-Metalink: fetching (log/download2010) from (http://%HOSTIP:%HTTPPORT/2010)...
-Metalink: fetching (log/download2010) from (http://%HOSTIP:%HTTPPORT/2010) OK
-Metalink: validating (log/download2010)...
-Metalink: validating (log/download2010) [sha-256] OK
+<file4 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) OK
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER)...
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER) OK
+Metalink: validating (log/download%TESTNUMBER)...
+Metalink: validating (log/download%TESTNUMBER) [sha-256] OK
 </file4>
 <stripfile4>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
index 1d081afcbfdfab1ca6a9f6856220f63b60c78bfd..78169781188f69b376b39f5e0ecf6ce6c82508d5 100644 (file)
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 37
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2011; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Data delivered from an HTTP resource
@@ -38,26 +38,26 @@ Metalink
 Metalink local XML file, HTTP resource, hash mismatch
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2011.metalink
+--metalink file://%PWD/log/test%TESTNUMBER.metalink
 </command>
 # local metalink file written before test command runs
-<file name="log/test2011.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="log/download2011">
+  <file name="log/download%TESTNUMBER">
    <verification>
     <hash type="sha256">badbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadb</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2011</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2011 log/name2011
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -65,24 +65,24 @@ perl %SRCDIR/libtest/notexists.pl log/2011 log/name2011
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2011 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file1 name="log/download2011">
+<file1 name="log/download%TESTNUMBER">
 Data delivered from an HTTP resource
 </file1>
-<file2 name="log/stdout2011">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
-<file3 name="log/stderr2011" mode="text">
-Metalink: parsing (file://%PWD/log/test2011.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2011.metalink) OK
-Metalink: fetching (log/download2011) from (http://%HOSTIP:%HTTPPORT/2011)...
-Metalink: fetching (log/download2011) from (http://%HOSTIP:%HTTPPORT/2011) OK
-Metalink: validating (log/download2011)...
-Metalink: validating (log/download2011) [sha-256] FAILED (digest mismatch)
+<file3 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) OK
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER)...
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER) OK
+Metalink: validating (log/download%TESTNUMBER)...
+Metalink: validating (log/download%TESTNUMBER) [sha-256] FAILED (digest mismatch)
 </file3>
 <stripfile3>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
index ae627a9af993f4588d8fc559bccf4ee8145c1edc..b3cfd614686626cbfbc4fe54c0519400763c1c33 100644 (file)
@@ -12,12 +12,12 @@ HTTP GET
 <reply>
 <data nocheck="yes">
 HTTP/1.1 200 OK
-Date: Wed, 20 Jun 2012 14:49:00 GMT
+Date: Wed, 20 Jun %TESTNUMBER 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 46
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2012; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Some contents delivered from an HTTP resource
@@ -38,25 +38,25 @@ Metalink
 Metalink local XML file, HTTP resource, without hash
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2012.metalink
+--metalink file://%PWD/log/test%TESTNUMBER.metalink
 </command>
 # local metalink file written before test command runs
-<file name="log/test2012.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="log/download2012">
+  <file name="log/download%TESTNUMBER">
    <verification>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2012</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2012 log/name2012
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -64,24 +64,24 @@ perl %SRCDIR/libtest/notexists.pl log/2012 log/name2012
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2012 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file1 name="log/download2012">
+<file1 name="log/download%TESTNUMBER">
 Some contents delivered from an HTTP resource
 </file1>
-<file2 name="log/stdout2012">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
-<file3 name="log/stderr2012" mode="text">
-Metalink: parsing (file://%PWD/log/test2012.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2012.metalink) WARNING (digest missing)
-Metalink: fetching (log/download2012) from (http://%HOSTIP:%HTTPPORT/2012)...
-Metalink: fetching (log/download2012) from (http://%HOSTIP:%HTTPPORT/2012) OK
-Metalink: validating (log/download2012)...
-Metalink: validating (log/download2012) FAILED (digest missing)
+<file3 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (digest missing)
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER)...
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER) OK
+Metalink: validating (log/download%TESTNUMBER)...
+Metalink: validating (log/download%TESTNUMBER) FAILED (digest missing)
 </file3>
 <stripfile3>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
index f4d0c2475c7afc848ff988ba5b25db6c60fdc066..016a9a4b2c0441e2cc80801c16436c5625d7c0bd 100644 (file)
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 56
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2013; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Data that should not be delivered from an HTTP resource
@@ -38,38 +38,38 @@ Metalink
 Metalink local XML file, attempt Unix absolute path
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2013.metalink
+--metalink file://%PWD/log/test%TESTNUMBER.metalink
 </command>
 # local metalink file written before test command runs
-<file name="log/test2013.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="/tmp/download2013">
+  <file name="/tmp/download%TESTNUMBER">
    <verification>
     <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2013</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2013 log/name2013 /tmp/download2013
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER /tmp/download%TESTNUMBER
 </postcheck>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file1 name="log/stdout2013">
+<file1 name="log/stdout%TESTNUMBER">
 </file1>
-<file2 name="log/stderr2013" mode="text">
-Metalink: parsing (file://%PWD/log/test2013.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2013.metalink) WARNING (missing or invalid file name)
-Metalink: parsing (file://%PWD/log/test2013.metalink) FAILED
+<file2 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name)
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED
 </file2>
 <stripfile2>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
index 65d2ec76609e9db30151326381214f295b67e7be..895c9c9c83abaded88f6b297b10df5379b6f885d 100644 (file)
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 56
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2014; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Data that should not be delivered from an HTTP resource
@@ -38,38 +38,38 @@ Metalink
 Metalink local XML file, attempt Unix path relative to current
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2014.metalink
+--metalink file://%PWD/log/test%TESTNUMBER.metalink
 </command>
 # local metalink file written before test command runs
-<file name="log/test2014.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="./log/download2014">
+  <file name="./log/download%TESTNUMBER">
    <verification>
     <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2014</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2014 log/name2014 log/download2014
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER log/download%TESTNUMBER
 </postcheck>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file1 name="log/stdout2014">
+<file1 name="log/stdout%TESTNUMBER">
 </file1>
-<file2 name="log/stderr2014" mode="text">
-Metalink: parsing (file://%PWD/log/test2014.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2014.metalink) WARNING (missing or invalid file name)
-Metalink: parsing (file://%PWD/log/test2014.metalink) FAILED
+<file2 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name)
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED
 </file2>
 <stripfile2>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
index d356f88bca2518dc91d83cd4bbff7245c837a05a..a35564703d6a868e745ba959910169df47ec9033 100644 (file)
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 56
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2015; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Data that should not be delivered from an HTTP resource
@@ -38,38 +38,38 @@ Metalink
 Metalink local XML file, attempt Unix path relative to upper
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2015.metalink
+--metalink file://%PWD/log/test%TESTNUMBER.metalink
 </command>
 # local metalink file written before test command runs
-<file name="log/test2015.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="../tests/log/download2015">
+  <file name="../tests/log/download%TESTNUMBER">
    <verification>
     <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2015</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2015 log/name2015 log/download2015
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER log/download%TESTNUMBER
 </postcheck>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file1 name="log/stdout2015">
+<file1 name="log/stdout%TESTNUMBER">
 </file1>
-<file2 name="log/stderr2015" mode="text">
-Metalink: parsing (file://%PWD/log/test2015.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2015.metalink) WARNING (missing or invalid file name)
-Metalink: parsing (file://%PWD/log/test2015.metalink) FAILED
+<file2 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name)
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED
 </file2>
 <stripfile2>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
index ff2862d51d098a6ccfb591462151c3893a0845d7..51b687f9a1849f9551a64d4731c92406219cb762 100644 (file)
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 56
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2016; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Data that should not be delivered from an HTTP resource
@@ -38,38 +38,38 @@ Metalink
 Metalink local XML file, attempt Unix path traversal
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2016.metalink
+--metalink file://%PWD/log/test%TESTNUMBER.metalink
 </command>
 # local metalink file written before test command runs
-<file name="log/test2016.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="log/../log/download2016">
+  <file name="log/../log/download%TESTNUMBER">
    <verification>
     <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2016</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2016 log/name2016 log/download2016
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER log/download%TESTNUMBER
 </postcheck>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file1 name="log/stdout2016">
+<file1 name="log/stdout%TESTNUMBER">
 </file1>
-<file2 name="log/stderr2016" mode="text">
-Metalink: parsing (file://%PWD/log/test2016.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2016.metalink) WARNING (missing or invalid file name)
-Metalink: parsing (file://%PWD/log/test2016.metalink) FAILED
+<file2 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name)
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED
 </file2>
 <stripfile2>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
index 11c71c3dbf0cd95f639b7e78913013873520a14f..4937c2802904f1b83bd7b4d765eda56cdf1ff11d 100644 (file)
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 56
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2017; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Data that should not be delivered from an HTTP resource
@@ -38,38 +38,38 @@ Metalink
 Metalink local XML file, attempt Unix home path traversal
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2017.metalink
+--metalink file://%PWD/log/test%TESTNUMBER.metalink
 </command>
 # local metalink file written before test command runs
-<file name="log/test2017.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="~/download2017">
+  <file name="~/download%TESTNUMBER">
    <verification>
     <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2017</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2017 log/name2017
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file1 name="log/stdout2017">
+<file1 name="log/stdout%TESTNUMBER">
 </file1>
-<file2 name="log/stderr2017" mode="text">
-Metalink: parsing (file://%PWD/log/test2017.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2017.metalink) WARNING (missing or invalid file name)
-Metalink: parsing (file://%PWD/log/test2017.metalink) FAILED
+<file2 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name)
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED
 </file2>
 <stripfile2>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
index 9fb433d944ab58ed127dcd28a5f53db2b5316497..f43f8c4b5cb26466b4b8d0fd59fb8ab0b40c6aad 100644 (file)
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 56
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2018; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Data that should not be delivered from an HTTP resource
@@ -38,38 +38,38 @@ Metalink
 Metalink local XML file, attempt Unix questionable file name I
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2018.metalink
+--metalink file://%PWD/log/test%TESTNUMBER.metalink
 </command>
 # local metalink file written before test command runs
-<file name="log/test2018.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="log/.download2018">
+  <file name="log/.download%TESTNUMBER">
    <verification>
     <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2018</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2018 log/name2018 log/.download2018
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER log/.download%TESTNUMBER
 </postcheck>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file1 name="log/stdout2018">
+<file1 name="log/stdout%TESTNUMBER">
 </file1>
-<file2 name="log/stderr2018" mode="text">
-Metalink: parsing (file://%PWD/log/test2018.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2018.metalink) WARNING (missing or invalid file name)
-Metalink: parsing (file://%PWD/log/test2018.metalink) FAILED
+<file2 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name)
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED
 </file2>
 <stripfile2>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
index abd8cad9a4cec329d646fd3fc49858df4702e4e0..7123ab37644c8b47d6905681dec4e46bc858c82a 100644 (file)
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 56
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2019; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Data that should not be delivered from an HTTP resource
@@ -38,10 +38,10 @@ Metalink
 Metalink local XML file, attempt Unix questionable file name II
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2019.metalink
+--metalink file://%PWD/log/test%TESTNUMBER.metalink
 </command>
 # local metalink file written before test command runs
-<file name="log/test2019.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
@@ -50,26 +50,26 @@ Metalink local XML file, attempt Unix questionable file name II
     <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2019</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2019 log/name2019
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file1 name="log/stdout2019">
+<file1 name="log/stdout%TESTNUMBER">
 </file1>
-<file2 name="log/stderr2019" mode="text">
-Metalink: parsing (file://%PWD/log/test2019.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2019.metalink) WARNING (missing or invalid file name)
-Metalink: parsing (file://%PWD/log/test2019.metalink) FAILED
+<file2 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name)
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED
 </file2>
 <stripfile2>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
index ad9d854d54f4d815d526c79914460a9992e9bc2c..f5efc07328f2bfabc062247488f3672ef09a90eb 100644 (file)
@@ -20,9 +20,9 @@ file
 two file:// URLs to stdout
  </name>
 <command option="no-include">
-file://localhost%FILE_PWD/log/test202.txt FILE://localhost%FILE_PWD/log/test202.txt
+file://localhost%FILE_PWD/log/test%TESTNUMBER.txt FILE://localhost%FILE_PWD/log/test%TESTNUMBER.txt
 </command>
-<file name="log/test202.txt">
+<file name="log/test%TESTNUMBER.txt">
 contents in a single file
 </file>
 </client>
index 584f6df3b403d106057120f8024c509b9616ac1a..8fd95543ec057c223715a0dbbcc1aa74cef836dc 100644 (file)
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 56
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2020; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Data that should not be delivered from an HTTP resource
@@ -38,10 +38,10 @@ Metalink
 Metalink local XML file, attempt Unix questionable file name III
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2020.metalink
+--metalink file://%PWD/log/test%TESTNUMBER.metalink
 </command>
 # local metalink file written before test command runs
-<file name="log/test2020.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
@@ -50,26 +50,26 @@ Metalink local XML file, attempt Unix questionable file name III
     <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2020</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2020 log/name2020
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file1 name="log/stdout2020">
+<file1 name="log/stdout%TESTNUMBER">
 </file1>
-<file2 name="log/stderr2020" mode="text">
-Metalink: parsing (file://%PWD/log/test2020.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2020.metalink) WARNING (missing or invalid file name)
-Metalink: parsing (file://%PWD/log/test2020.metalink) FAILED
+<file2 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name)
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED
 </file2>
 <stripfile2>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
index b0921d48a0b949adb7196a92a7e51cb074b515b5..4919cab590ba01afad79a742a41f389a7c494cca 100644 (file)
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 56
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2021; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Data that should not be delivered from an HTTP resource
@@ -38,38 +38,38 @@ Metalink
 Metalink local XML file, attempt Unix questionable file name IV
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2021.metalink
+--metalink file://%PWD/log/test%TESTNUMBER.metalink
 </command>
 # local metalink file written before test command runs
-<file name="log/test2021.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="log/download2021 >/dev/null">
+  <file name="log/download%TESTNUMBER >/dev/null">
    <verification>
     <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2021</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2021 log/name2021 log/download2021
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER log/download%TESTNUMBER
 </postcheck>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file1 name="log/stdout2021">
+<file1 name="log/stdout%TESTNUMBER">
 </file1>
-<file2 name="log/stderr2021" mode="text">
-Metalink: parsing (file://%PWD/log/test2021.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2021.metalink) WARNING (missing or invalid file name)
-Metalink: parsing (file://%PWD/log/test2021.metalink) FAILED
+<file2 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name)
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED
 </file2>
 <stripfile2>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
index e9044732a1f0660bfd8999cfecaaf9b84382a4f6..84735c93c574e7b9b91511a0d9d573bff2fa0914 100644 (file)
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 56
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2022; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Data that should not be delivered from an HTTP resource
@@ -38,38 +38,38 @@ Metalink
 Metalink local XML file, attempt Unix questionable file name V
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2022.metalink
+--metalink file://%PWD/log/test%TESTNUMBER.metalink
 </command>
 # local metalink file written before test command runs
-<file name="log/test2022.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="log/download2022 |/dev/null">
+  <file name="log/download%TESTNUMBER |/dev/null">
    <verification>
     <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2022</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2022 log/name2022 log/download2022
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER log/download%TESTNUMBER
 </postcheck>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file1 name="log/stdout2022">
+<file1 name="log/stdout%TESTNUMBER">
 </file1>
-<file2 name="log/stderr2022" mode="text">
-Metalink: parsing (file://%PWD/log/test2022.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2022.metalink) WARNING (missing or invalid file name)
-Metalink: parsing (file://%PWD/log/test2022.metalink) FAILED
+<file2 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name)
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED
 </file2>
 <stripfile2>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
index 0b155b2d2ecd3099c4e9d82b32a9619da525799b..08fb5cc008388d52f60872813da71ac56f7ef041 100644 (file)
@@ -119,7 +119,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/2023 basic basic
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER basic basic
 </command>
 <precheck>
 chkhostname curlhost
@@ -129,27 +129,27 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /20230100 HTTP/1.1\r
+GET /%TESTNUMBER0100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dGVzdHVzZXI6d3JvbmdwYXNz\r
 Accept: */*\r
 \r
-GET /20230200 HTTP/1.1\r
+GET /%TESTNUMBER0200 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=\r
 Accept: */*\r
 \r
-GET /20230300 HTTP/1.1\r
+GET /%TESTNUMBER0300 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dGVzdHVzZXI6d3JvbmdwYXNz\r
 Accept: */*\r
 \r
-GET /20230400 HTTP/1.1\r
+GET /%TESTNUMBER0400 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dGVzdHVzZXI6d3JvbmdwYXNz\r
 Accept: */*\r
 \r
-GET /20230500 HTTP/1.1\r
+GET /%TESTNUMBER0500 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=\r
 Accept: */*\r
index c062b4c0f882037e9ecff34761d1b6547ada438d..d371e5dcbe9ee5c08b92214232ca19e5f59bf639 100644 (file)
@@ -133,7 +133,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/2024 basic digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER basic digest
 </command>
 <precheck>
 chkhostname curlhost
@@ -143,29 +143,29 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /20240100 HTTP/1.1\r
+GET /%TESTNUMBER0100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dGVzdHVzZXI6d3JvbmdwYXNz\r
 Accept: */*\r
 \r
-GET /20240200 HTTP/1.1\r
+GET /%TESTNUMBER0200 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/20240200", response="ed646c565f79e2dd9fa37cb5a621213c"\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER0200", response="ed646c565f79e2dd9fa37cb5a621213c"\r
 Accept: */*\r
 \r
-GET /20240300 HTTP/1.1\r
+GET /%TESTNUMBER0300 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dGVzdHVzZXI6d3JvbmdwYXNz\r
 Accept: */*\r
 \r
-GET /20240400 HTTP/1.1\r
+GET /%TESTNUMBER0400 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/20240400", response="9741ced8caacc6124770187b36f007c5"\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/%TESTNUMBER0400", response="9741ced8caacc6124770187b36f007c5"\r
 Accept: */*\r
 \r
-GET /20240500 HTTP/1.1\r
+GET /%TESTNUMBER0500 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="3", uri="/20240500", response="5bc77ec8c2d443b27a1b55f1fd8fbb13"\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="3", uri="/%TESTNUMBER0500", response="5bc77ec8c2d443b27a1b55f1fd8fbb13"\r
 Accept: */*\r
 \r
 </protocol>
index 7a8fff15277bdbe468edf9234d289f79e6dbd917..5ab8b858220be084a84ec4c1d3bd296286a23672 100644 (file)
@@ -215,7 +215,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/2025 basic ntlm
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER basic ntlm
 </command>
 <precheck>
 chkhostname curlhost
@@ -225,42 +225,42 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /20250100 HTTP/1.1\r
+GET /%TESTNUMBER0100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dGVzdHVzZXI6d3JvbmdwYXNz\r
 Accept: */*\r
 \r
-GET /20250200 HTTP/1.1\r
+GET /%TESTNUMBER0200 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 Accept: */*\r
 \r
-GET /20250200 HTTP/1.1\r
+GET /%TESTNUMBER0200 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyY3VybGhvc3Q=\r
 Accept: */*\r
 \r
-GET /20250300 HTTP/1.1\r
+GET /%TESTNUMBER0300 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dGVzdHVzZXI6d3JvbmdwYXNz\r
 Accept: */*\r
 \r
-GET /20250400 HTTP/1.1\r
+GET /%TESTNUMBER0400 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 Accept: */*\r
 \r
-GET /20250400 HTTP/1.1\r
+GET /%TESTNUMBER0400 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyY3VybGhvc3Q=\r
 Accept: */*\r
 \r
-GET /20250500 HTTP/1.1\r
+GET /%TESTNUMBER0500 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 Accept: */*\r
 \r
-GET /20250500 HTTP/1.1\r
+GET /%TESTNUMBER0500 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyY3VybGhvc3Q=\r
 Accept: */*\r
index a505737d732fd40ee0bde944d20a3806356a7fe6..963587ef2e4314a6548a7a624045442226cb142f 100644 (file)
@@ -169,7 +169,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/2026 digest basic
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER digest basic
 </command>
 <precheck>
 chkhostname curlhost
@@ -179,35 +179,35 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /20260100 HTTP/1.1\r
+GET /%TESTNUMBER0100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
-GET /20260100 HTTP/1.1\r
+GET /%TESTNUMBER0100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/20260100", response="5f992a2e761ab926256419f7c685f85b"\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER0100", response="5f992a2e761ab926256419f7c685f85b"\r
 Accept: */*\r
 \r
-GET /20260200 HTTP/1.1\r
+GET /%TESTNUMBER0200 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=\r
 Accept: */*\r
 \r
-GET /20260300 HTTP/1.1\r
+GET /%TESTNUMBER0300 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
-GET /20260300 HTTP/1.1\r
+GET /%TESTNUMBER0300 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="3", uri="/20260300", response="132242e602882251929be93228c830ae"\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="3", uri="/%TESTNUMBER0300", response="132242e602882251929be93228c830ae"\r
 Accept: */*\r
 \r
-GET /20260400 HTTP/1.1\r
+GET /%TESTNUMBER0400 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dGVzdHVzZXI6d3JvbmdwYXNz\r
 Accept: */*\r
 \r
-GET /20260500 HTTP/1.1\r
+GET /%TESTNUMBER0500 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=\r
 Accept: */*\r
index 3983e8854866ef09b3faccc37fa5d3b094b740a1..ecc5a63d87d0ddb8dc4ce8f39904e24650982fe5 100644 (file)
@@ -192,7 +192,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/2027 digest digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER digest digest
 </command>
 <precheck>
 chkhostname curlhost
@@ -202,42 +202,42 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /20270100 HTTP/1.1\r
+GET /%TESTNUMBER0100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
-GET /20270100 HTTP/1.1\r
+GET /%TESTNUMBER0100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/20270100", response="f7fd60eefaff5225971bf9b3d80d6ba6"\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER0100", response="f7fd60eefaff5225971bf9b3d80d6ba6"\r
 Accept: */*\r
 \r
-GET /20270200 HTTP/1.1\r
+GET /%TESTNUMBER0200 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/20270200", response="785ca3ef511999f7e9c178195f5b388c"\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/%TESTNUMBER0200", response="785ca3ef511999f7e9c178195f5b388c"\r
 Accept: */*\r
 \r
-GET /20270300 HTTP/1.1\r
+GET /%TESTNUMBER0300 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
-GET /20270300 HTTP/1.1\r
+GET /%TESTNUMBER0300 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="4", uri="/20270300", response="4c735d2360fd6848e7cb32a11ae3612b"\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="4", uri="/%TESTNUMBER0300", response="4c735d2360fd6848e7cb32a11ae3612b"\r
 Accept: */*\r
 \r
-GET /20270400 HTTP/1.1\r
+GET /%TESTNUMBER0400 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/20270400", response="f5906785511fb60a2af8b1cd53008ead"\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/%TESTNUMBER0400", response="f5906785511fb60a2af8b1cd53008ead"\r
 Accept: */*\r
 \r
-GET /20270400 HTTP/1.1\r
+GET /%TESTNUMBER0400 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/20270400", response="f5906785511fb60a2af8b1cd53008ead"\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/%TESTNUMBER0400", response="f5906785511fb60a2af8b1cd53008ead"\r
 Accept: */*\r
 \r
-GET /20270500 HTTP/1.1\r
+GET /%TESTNUMBER0500 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="7", uri="/20270500", response="8ef4d935fd964a46c3965c0863b52cf1"\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="7", uri="/%TESTNUMBER0500", response="8ef4d935fd964a46c3965c0863b52cf1"\r
 Accept: */*\r
 \r
 </protocol>
index c7b70c8f2126fbedfa32db67ec876b6c26650a3e..8895612524147a25561b62f0a868b37c7668fc7c 100644 (file)
@@ -251,7 +251,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/2028 digest ntlm
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER digest ntlm
 </command>
 <precheck>
 chkhostname curlhost
@@ -261,50 +261,50 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /20280100 HTTP/1.1\r
+GET /%TESTNUMBER0100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
-GET /20280100 HTTP/1.1\r
+GET /%TESTNUMBER0100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/20280100", response="53c80666f5e3a4a55f92a66aaf0078bb"\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER0100", response="53c80666f5e3a4a55f92a66aaf0078bb"\r
 Accept: */*\r
 \r
-GET /20280200 HTTP/1.1\r
+GET /%TESTNUMBER0200 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 Accept: */*\r
 \r
-GET /20280200 HTTP/1.1\r
+GET /%TESTNUMBER0200 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyY3VybGhvc3Q=\r
 Accept: */*\r
 \r
-GET /20280300 HTTP/1.1\r
+GET /%TESTNUMBER0300 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
-GET /20280300 HTTP/1.1\r
+GET /%TESTNUMBER0300 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="4", uri="/20280300", response="1aa5d90da9803ca12d04b24e0f19476e"\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="4", uri="/%TESTNUMBER0300", response="1aa5d90da9803ca12d04b24e0f19476e"\r
 Accept: */*\r
 \r
-GET /20280400 HTTP/1.1\r
+GET /%TESTNUMBER0400 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 Accept: */*\r
 \r
-GET /20280400 HTTP/1.1\r
+GET /%TESTNUMBER0400 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyY3VybGhvc3Q=\r
 Accept: */*\r
 \r
-GET /20280500 HTTP/1.1\r
+GET /%TESTNUMBER0500 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 Accept: */*\r
 \r
-GET /20280500 HTTP/1.1\r
+GET /%TESTNUMBER0500 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyY3VybGhvc3Q=\r
 Accept: */*\r
index 67313c414f39a94b8709fbb1a4a84d2670d673c2..53b433e83a667cb59068d74cf3fbe6c9939a336b 100644 (file)
@@ -188,7 +188,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/2029 ntlm basic
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER ntlm basic
 </command>
 <precheck>
 chkhostname curlhost
@@ -198,37 +198,37 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /20290100 HTTP/1.1\r
+GET /%TESTNUMBER0100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 Accept: */*\r
 \r
-GET /20290100 HTTP/1.1\r
+GET /%TESTNUMBER0100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyY3VybGhvc3Q=\r
 Accept: */*\r
 \r
-GET /20290200 HTTP/1.1\r
+GET /%TESTNUMBER0200 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=\r
 Accept: */*\r
 \r
-GET /20290300 HTTP/1.1\r
+GET /%TESTNUMBER0300 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 Accept: */*\r
 \r
-GET /20290300 HTTP/1.1\r
+GET /%TESTNUMBER0300 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyY3VybGhvc3Q=\r
 Accept: */*\r
 \r
-GET /20290400 HTTP/1.1\r
+GET /%TESTNUMBER0400 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dGVzdHVzZXI6d3JvbmdwYXNz\r
 Accept: */*\r
 \r
-GET /20290500 HTTP/1.1\r
+GET /%TESTNUMBER0500 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=\r
 Accept: */*\r
index ee850cb1c64462aa8ce908ed0f254c823a0ece24..d1935638413613bdbe0a1b0b4580bc28b8f0ac9b 100644 (file)
@@ -29,9 +29,9 @@ file:/path URL with a single slash
 MSYS2_ARG_CONV_EXCL=file:
 </setenv>
 <command option="no-include">
-file:%FILE_PWD/log/test203.txt
+file:%FILE_PWD/log/test%TESTNUMBER.txt
 </command>
-<file name="log/test203.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo
    bar
 bar
index 1d281ab9f940381ffb0c69ea4b404de7e571f5fa..dc3dfe855e54fe401367bf5354285a3d3b2322b4 100644 (file)
@@ -240,7 +240,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/2030 ntlm digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER ntlm digest
 </command>
 <precheck>
 chkhostname curlhost
@@ -250,44 +250,44 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /20300100 HTTP/1.1\r
+GET /%TESTNUMBER0100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 Accept: */*\r
 \r
-GET /20300100 HTTP/1.1\r
+GET /%TESTNUMBER0100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyY3VybGhvc3Q=\r
 Accept: */*\r
 \r
-GET /20300200 HTTP/1.1\r
+GET /%TESTNUMBER0200 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/20300200", response="2f2d784ba53a0a307758a90e98d25c27"\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/%TESTNUMBER0200", response="2f2d784ba53a0a307758a90e98d25c27"\r
 Accept: */*\r
 \r
-GET /20300300 HTTP/1.1\r
+GET /%TESTNUMBER0300 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 Accept: */*\r
 \r
-GET /20300300 HTTP/1.1\r
+GET /%TESTNUMBER0300 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyY3VybGhvc3Q=\r
 Accept: */*\r
 \r
-GET /20300400 HTTP/1.1\r
+GET /%TESTNUMBER0400 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/20300400", response="d6262e9147db08c62ff2f53b515861e8"\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/%TESTNUMBER0400", response="d6262e9147db08c62ff2f53b515861e8"\r
 Accept: */*\r
 \r
-GET /20300400 HTTP/1.1\r
+GET /%TESTNUMBER0400 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/20300400", response="d6262e9147db08c62ff2f53b515861e8"\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/%TESTNUMBER0400", response="d6262e9147db08c62ff2f53b515861e8"\r
 Accept: */*\r
 \r
-GET /20300500 HTTP/1.1\r
+GET /%TESTNUMBER0500 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="7", uri="/20300500", response="198757e61163a779cf24ed4c49c1ad7d"\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="7", uri="/%TESTNUMBER0500", response="198757e61163a779cf24ed4c49c1ad7d"\r
 Accept: */*\r
 \r
 </protocol>
index dabba374908ad8692c71521354a5e32b22cf3fb2..6a8399546f3ea15558e0d5b0515fc4d435105e89 100644 (file)
@@ -254,7 +254,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/2031 ntlm ntlm
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER ntlm ntlm
 </command>
 <precheck>
 chkhostname curlhost
@@ -264,52 +264,52 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /20310100 HTTP/1.1\r
+GET /%TESTNUMBER0100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 Accept: */*\r
 \r
-GET /20310100 HTTP/1.1\r
+GET /%TESTNUMBER0100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyY3VybGhvc3Q=\r
 Accept: */*\r
 \r
-GET /20310200 HTTP/1.1\r
+GET /%TESTNUMBER0200 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 Accept: */*\r
 \r
-GET /20310200 HTTP/1.1\r
+GET /%TESTNUMBER0200 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyY3VybGhvc3Q=\r
 Accept: */*\r
 \r
-GET /20310300 HTTP/1.1\r
+GET /%TESTNUMBER0300 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 Accept: */*\r
 \r
-GET /20310300 HTTP/1.1\r
+GET /%TESTNUMBER0300 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyY3VybGhvc3Q=\r
 Accept: */*\r
 \r
-GET /20310400 HTTP/1.1\r
+GET /%TESTNUMBER0400 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 Accept: */*\r
 \r
-GET /20310400 HTTP/1.1\r
+GET /%TESTNUMBER0400 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyY3VybGhvc3Q=\r
 Accept: */*\r
 \r
-GET /20310500 HTTP/1.1\r
+GET /%TESTNUMBER0500 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 Accept: */*\r
 \r
-GET /20310500 HTTP/1.1\r
+GET /%TESTNUMBER0500 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyY3VybGhvc3Q=\r
 Accept: */*\r
index 52574fe77ab64a6d1805822547d3db471fdae5c8..08ac715154a39a6be2a20b9e671ff9876d95cb5c 100644 (file)
@@ -86,7 +86,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/2032
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 <precheck>
 chkhostname curlhost
@@ -96,22 +96,22 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /20320100 HTTP/1.1\r
+GET /%TESTNUMBER0100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=\r
 Accept: */*\r
 \r
-GET /20320100 HTTP/1.1\r
+GET /%TESTNUMBER0100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=\r
 Accept: */*\r
 \r
-GET /20320200 HTTP/1.1\r
+GET /%TESTNUMBER0200 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 Accept: */*\r
 \r
-GET /20320200 HTTP/1.1\r
+GET /%TESTNUMBER0200 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyY3VybGhvc3Q=\r
 Accept: */*\r
index 91551b4894bce9af8b35946d3ca3f3151ab78b40..3ddd42024f9af8ae9ff28529bc35c59378386ddf 100644 (file)
@@ -34,7 +34,7 @@ https Server-localhost-sv.pem
 simple HTTPS GET with DER public key pinning
  </name>
  <command>
---cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost-sv.pub.der https://localhost:%HTTPSPORT/2034
+--cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost-sv.pub.der https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name
 <precheck>
@@ -46,7 +46,7 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2034 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: localhost:%HTTPSPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 7002a5b8ec3d32a8995c788eeb09da7ce8ff0477..8380022aae276050a56bab45a4a87257878d63d3 100644 (file)
@@ -26,7 +26,7 @@ https Server-localhost-sv.pem
 HTTPS wrong DER pinnedpubkey but right CN
  </name>
  <command>
---cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost-sv.der https://localhost:%HTTPSPORT/2035
+--cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost-sv.der https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name
 <precheck>
index 8bbed5e716bfa52863ee7d7e5efd4c4093c44353..3f0fbf3f338157abf54bc40c7addf816ce72cb74 100644 (file)
@@ -34,7 +34,7 @@ https Server-localhost-sv.pem
 simple HTTPS GET with PEM public key pinning
  </name>
  <command>
---cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost-sv.pub.pem https://localhost:%HTTPSPORT/2037
+--cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost-sv.pub.pem https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name
 <precheck>
@@ -47,7 +47,7 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0
 <verify>
 </strip>
 <protocol>
-GET /2037 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: localhost:%HTTPSPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 63d935addeb9558c15144850b032178f61d418c2..d9bf7c6434f9e4ed03168b2302c4a7582836da1a 100644 (file)
@@ -26,7 +26,7 @@ https Server-localhost-sv.pem
 HTTPS wrong PEM pinnedpubkey but right CN
  </name>
  <command>
---cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost-sv.pem https://localhost:%HTTPSPORT/2038
+--cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost-sv.pem https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name
 <precheck>
index 1595ded05371fad1f44b2e787a33336702badecb..a10852a7fc5853e065c11e0d96f66d37f1a0524f 100644 (file)
@@ -37,9 +37,9 @@ ftp
 FTP (optional .netrc with 'default' override; no user/pass) dir list PASV
  </name>
  <command>
---netrc-optional --netrc-file log/netrc2039 ftp://%HOSTIP:%FTPPORT/
+--netrc-optional --netrc-file log/netrc%TESTNUMBER ftp://%HOSTIP:%FTPPORT/
 </command>
-<file name="log/netrc2039" >
+<file name="log/netrc%TESTNUMBER" >
 # the following two lines were created while testing curl
 default login userdef password passwddef
 machine %HOSTIP login user1 password passwd1
index 5dad0149ca6055d1e61276d731b2de97533174d5..dcf0bb5bda67ce0e2750ea50233644c1f4ed4328 100644 (file)
@@ -16,9 +16,9 @@ file
 "upload" with file://
  </name>
 <command option="no-include">
-file://localhost%FILE_PWD/log/result204.txt -T log/upload204.txt
+file://localhost%FILE_PWD/log/result%TESTNUMBER.txt -T log/upload%TESTNUMBER.txt
 </command>
-<file name="log/upload204.txt">
+<file name="log/upload%TESTNUMBER.txt">
 data
 in
 file
@@ -29,7 +29,7 @@ write
 
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/result204.txt">
+<file name="log/result%TESTNUMBER.txt">
 data
 in
 file
index cec8a6bcc8bbff3332e40f057b6e507a6f70ecc3..56a6179095971222746cdcd79f49870a4af0f95f 100644 (file)
@@ -41,20 +41,20 @@ http
 HTTP Basic authorization, then without authorization
 </name>
 <command option="no-output,no-include">
--u testuser:testpass http://%HOSTIP:%HTTPPORT/20400100 --next --no-basic http://%HOSTIP:%HTTPPORT/20400200
+-u testuser:testpass http://%HOSTIP:%HTTPPORT/%TESTNUMBER0100 --next --no-basic http://%HOSTIP:%HTTPPORT/%TESTNUMBER0200
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /20400100 HTTP/1.1\r
+GET /%TESTNUMBER0100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /20400200 HTTP/1.1\r
+GET /%TESTNUMBER0200 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 14fab52b0adc3dcabfd746be8c51ed869d30ff3f..e4a2391e81ea8b3f2d431cc6b3e6b8cb71ab3700 100644 (file)
@@ -34,7 +34,7 @@ https Server-localhost-sv.pem
 simple HTTPS GET with base64-sha256 public key pinning
  </name>
  <command>
---cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey sha256//+JYNkp2GTGRgrvZMUkOxbFJQQqYpwNE6toGmBjz00D8= https://localhost:%HTTPSPORT/2041
+--cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey sha256//+JYNkp2GTGRgrvZMUkOxbFJQQqYpwNE6toGmBjz00D8= https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name
 <precheck>
@@ -46,7 +46,7 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2041 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: localhost:%HTTPSPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 2181e5322138988fd6848d48d0dd6ca9665d9b03..b6b9bcc5aea89970baf3975bc15d75185d4c636b 100644 (file)
@@ -26,7 +26,7 @@ https Server-localhost-sv.pem
 HTTPS wrong base64-sha256 pinnedpubkey but right CN
  </name>
  <command>
---cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey sha256//bSIggTf+ikMG0CtmDlpMVBd7yi7H1md4URogRPqerso= https://localhost:%HTTPSPORT/2042
+--cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey sha256//bSIggTf+ikMG0CtmDlpMVBd7yi7H1md4URogRPqerso= https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name
 <precheck>
index e86320d1e2797f4ea5f44d177cbbc09b0ce9be84..8845326e8eb271c6d5f918dce31c387b276d6208 100644 (file)
@@ -18,7 +18,7 @@ HTTP/1.1 302 OK swsbounce
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 9
 Content-Type: text/plain
-Location: ./20460001
+Location: ./%TESTNUMBER0001
 
 redirect
 </data>
@@ -53,7 +53,7 @@ Connection re-use with IDN host name
  </name>
 
  <command>
-http://åäö.se:%HTTPPORT/2046 --resolve xn--4cab6c.se:%HTTPPORT:%HOSTIP -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L
+http://åäö.se:%HTTPPORT/%TESTNUMBER --resolve xn--4cab6c.se:%HTTPPORT:%HOSTIP -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L
 </command>
 </client>
 
@@ -61,12 +61,12 @@ http://åäö.se:%HTTPPORT/2046 --resolve xn--4cab6c.se:%HTTPPORT:%HOSTIP -w "%{
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2046 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: xn--4cab6c.se:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /20460001 HTTP/1.1\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: xn--4cab6c.se:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -78,7 +78,7 @@ HTTP/1.1 302 OK swsbounce
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 9
 Content-Type: text/plain
-Location: ./20460001
+Location: ./%TESTNUMBER0001
 
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -89,7 +89,7 @@ OK
 1
 1
 3
-http://åäö.se:%HTTPPORT/20460001
+http://åäö.se:%HTTPPORT/%TESTNUMBER0001
 text/plain; charset=us-ascii
 200
 </stdout>
index cab3f5108e01d6cb1d5811bd727970829af3abe8..a4ab3911d9b9dbc0d3c36f1b2f6676322384114c 100644 (file)
@@ -18,7 +18,7 @@ HTTP/1.1 302 OK swsbounce
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 9
 Content-Type: text/plain
-Location: ./20470001
+Location: ./%TESTNUMBER0001
 
 redirect
 </data>
@@ -54,7 +54,7 @@ Connection re-use with IDN host name over HTTP proxy
  </name>
 
  <command>
-http://åäö.se/2047 -x %HOSTIP:%HTTPPORT -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L
+http://åäö.se/%TESTNUMBER -x %HOSTIP:%HTTPPORT -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L
 </command>
 </client>
 
@@ -62,13 +62,13 @@ http://åäö.se/2047 -x %HOSTIP:%HTTPPORT -w "%{num_connects}\n%{num_redirects}
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://xn--4cab6c.se/2047 HTTP/1.1\r
+GET http://xn--4cab6c.se/%TESTNUMBER HTTP/1.1\r
 Host: xn--4cab6c.se\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://xn--4cab6c.se/20470001 HTTP/1.1\r
+GET http://xn--4cab6c.se/%TESTNUMBER0001 HTTP/1.1\r
 Host: xn--4cab6c.se\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -81,7 +81,7 @@ HTTP/1.1 302 OK swsbounce
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 9
 Content-Type: text/plain
-Location: ./20470001
+Location: ./%TESTNUMBER0001
 
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -92,7 +92,7 @@ OK
 1
 1
 3
-http://åäö.se/20470001
+http://åäö.se/%TESTNUMBER0001
 text/plain; charset=us-ascii
 200
 </stdout>
index 787f584ef8dc5c866951b6d61ca2c82349857270..f14c8fbe8244bd16821ba82a4a476e565f993ea6 100644 (file)
@@ -26,7 +26,7 @@ https Server-localhost-sv.pem
 pinnedpubkey no-match must fail even when insecure
 </name>
 <command>
---insecure --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost.nn-sv.pub.der https://localhost:%HTTPSPORT/2048
+--insecure --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost.nn-sv.pub.der https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 </client>
 
index b6158c4bb67db95474e63490635f35c262453e87..2b0c64508d55f6d8bb4ea6822f0ddff51ab86e03 100644 (file)
@@ -31,7 +31,7 @@ Connect to specific host
  </name>
 
  <command>
-http://www1.example.com:8081/2049 --connect-to ::%HOSTIP:%HTTPPORT --next http://www2.example.com:8082/2049 --connect-to :8082:%HOSTIP:%HTTPPORT --next http://www3.example.com:8083/2049 --connect-to www3.example.com::%HOSTIP:%HTTPPORT --next http://www4.example.com:8084/2049 --connect-to www4.example.com:8084:%HOSTIP:%HTTPPORT
+http://www1.example.com:8081/%TESTNUMBER --connect-to ::%HOSTIP:%HTTPPORT --next http://www2.example.com:8082/%TESTNUMBER --connect-to :8082:%HOSTIP:%HTTPPORT --next http://www3.example.com:8083/%TESTNUMBER --connect-to www3.example.com::%HOSTIP:%HTTPPORT --next http://www4.example.com:8084/%TESTNUMBER --connect-to www4.example.com:8084:%HOSTIP:%HTTPPORT
 </command>
 </client>
 
@@ -39,22 +39,22 @@ http://www1.example.com:8081/2049 --connect-to ::%HOSTIP:%HTTPPORT --next http:/
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2049 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: www1.example.com:8081\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /2049 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: www2.example.com:8082\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /2049 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: www3.example.com:8083\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /2049 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: www4.example.com:8084\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index f83c5315781f1eed6c71cb9883b515ab91846dbb..de04997c3f47a5ef79c4a0c2e2e4c42fee268be3 100644 (file)
@@ -17,9 +17,9 @@ file
 "upload" with file://
  </name>
 <command option="no-include">
-file://localhost/%PWD/log/nonexisting/result205.txt -T log/upload205.txt
+file://localhost/%PWD/log/nonexisting/result%TESTNUMBER.txt -T log/upload%TESTNUMBER.txt
 </command>
-<file name="log/upload205.txt">
+<file name="log/upload%TESTNUMBER.txt">
 data
 in
 file
index 180ca0a0d119bcb0f8801a85a1e500a3dea81f4a..8d63a8d4b15f2ff9648d02c117fa76e064f1c5a9 100644 (file)
@@ -51,7 +51,7 @@ Connect to specific host via HTTP proxy (switch to tunnel mode automatically)
  </name>
 
  <command>
-http://www.example.com.2050/2050 --connect-to ::connect.example.com.2050:%HTTPPORT -x %HOSTIP:%PROXYPORT
+http://www.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.com.%TESTNUMBER:%HTTPPORT -x %HOSTIP:%PROXYPORT
 </command>
 <features>
 proxy
@@ -62,15 +62,15 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT connect.example.com.2050:%HTTPPORT HTTP/1.1\r
-Host: connect.example.com.2050:%HTTPPORT\r
+CONNECT connect.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
+Host: connect.example.com.%TESTNUMBER:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>
-GET /2050 HTTP/1.1\r
-Host: www.example.com.2050\r
+GET /%TESTNUMBER HTTP/1.1\r
+Host: www.example.com.%TESTNUMBER\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index 38a0781bca7a9037ee3560b47efb08c584a1026d..bd823bfffa1fdc967ef4a4e1591d4d4d4914448a 100644 (file)
@@ -31,7 +31,7 @@ Connect to specific host: Re-use existing connections if possible
  </name>
 
  <command>
-http://%HOSTIP:%HTTPPORT/2051 -w "%{num_connects}\n" --next --connect-to ::%HOSTIP:%HTTPPORT http://%HOSTIP:%HTTPPORT/2051 -w "%{num_connects}\n" --next http://%HOSTIP:%HTTPPORT/2051 -w "%{num_connects}\n"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n" --next --connect-to ::%HOSTIP:%HTTPPORT http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n" --next http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n"
 </command>
 </client>
 
@@ -39,17 +39,17 @@ http://%HOSTIP:%HTTPPORT/2051 -w "%{num_connects}\n" --next --connect-to ::%HOST
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2051 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /2051 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /2051 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 7dae17b96931be8a9d09fa5f81219692c1add071..dd04f3260775df2266cc1e435685e7eb8e688236 100644 (file)
@@ -32,7 +32,7 @@ Connect to specific host: Do not mix connections with and without a "connect to
  </name>
 
  <command>
-http://www.example.com:%HTTPPORT/2052 --resolve www.example.com:%HTTPPORT:%HOSTIP -w "%{num_connects}\n" --next --resolve -www.example.com:%HTTPPORT --connect-to ::%HOSTIP:%HTTPPORT http://www.example.com:%HTTPPORT/2052 -w "%{num_connects}\n"
+http://www.example.com:%HTTPPORT/%TESTNUMBER --resolve www.example.com:%HTTPPORT:%HOSTIP -w "%{num_connects}\n" --next --resolve -www.example.com:%HTTPPORT --connect-to ::%HOSTIP:%HTTPPORT http://www.example.com:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n"
 </command>
 </client>
 
@@ -40,12 +40,12 @@ http://www.example.com:%HTTPPORT/2052 --resolve www.example.com:%HTTPPORT:%HOSTI
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2052 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: www.example.com:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /2052 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: www.example.com:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 05b8050a22c3c11aa054727e2f026240c73ef11b..41035eb5948e44c3af67ca08b3c9e4fbe8035020 100644 (file)
@@ -31,7 +31,7 @@ Connect to specific host with IP addresses
  </name>
 
  <command>
-http://10.0.0.1:8081/2053 --connect-to 10.0.0.1:8081:%HOSTIP:%HTTPPORT --next http://[fc00::1]:8082/2053 --connect-to [fc00::1]:8082:%HOSTIP:%HTTPPORT
+http://10.0.0.1:8081/%TESTNUMBER --connect-to 10.0.0.1:8081:%HOSTIP:%HTTPPORT --next http://[fc00::1]:8082/%TESTNUMBER --connect-to [fc00::1]:8082:%HOSTIP:%HTTPPORT
 </command>
 </client>
 
@@ -39,12 +39,12 @@ http://10.0.0.1:8081/2053 --connect-to 10.0.0.1:8081:%HOSTIP:%HTTPPORT --next ht
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2053 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: 10.0.0.1:8081\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /2053 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: [fc00::1]:8082\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 50fff5482ef81ffd7599e34ca99c975ac1552a23..022d13229854ccaf3bca56a735ff81506d67233d 100644 (file)
@@ -31,7 +31,7 @@ Connect to specific host: use the first "connect-to" string that matches
  </name>
 
  <command>
-http://%HOSTIP:%HTTPPORT/2054 --connect-to foo::bar: --connect-to :123::456 --next http://www.example.com:%HTTPPORT/2054 --connect-to www.example.com::%HOSTIP: --connect-to www.example.com::foo: --next http://%HOSTIP:8083/2054 --connect-to :8083::%HTTPPORT --connect-to :8083::123 --next http://www.example.com:8084/2054 --connect-to www.example.com:8084:%HOSTIP:%HTTPPORT --connect-to www.example.com:8084:foo:123
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --connect-to foo::bar: --connect-to :123::456 --next http://www.example.com:%HTTPPORT/%TESTNUMBER --connect-to www.example.com::%HOSTIP: --connect-to www.example.com::foo: --next http://%HOSTIP:8083/%TESTNUMBER --connect-to :8083::%HTTPPORT --connect-to :8083::123 --next http://www.example.com:8084/%TESTNUMBER --connect-to www.example.com:8084:%HOSTIP:%HTTPPORT --connect-to www.example.com:8084:foo:123
 </command>
 </client>
 
@@ -39,22 +39,22 @@ http://%HOSTIP:%HTTPPORT/2054 --connect-to foo::bar: --connect-to :123::456 --ne
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2054 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /2054 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: www.example.com:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /2054 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:8083\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /2054 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: www.example.com:8084\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 2fd89dc11626eff6f1b5c7560593c9aa90613b0d..2c62b259b1738bb070bfc6a3379f463bd16d5964 100644 (file)
@@ -55,7 +55,7 @@ Connect to specific host via SOCKS proxy and HTTP proxy (switch to tunnel mode a
 proxy
 </features>
  <command>
-http://www.example.com.2055/2055 --connect-to ::connect.example.com.2055:%HTTPPORT -x %HOSTIP:%PROXYPORT --preproxy socks5://%HOSTIP:%SOCKSPORT
+http://www.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.com.%TESTNUMBER:%HTTPPORT -x %HOSTIP:%PROXYPORT --preproxy socks5://%HOSTIP:%SOCKSPORT
 </command>
 </client>
 
@@ -63,15 +63,15 @@ http://www.example.com.2055/2055 --connect-to ::connect.example.com.2055:%HTTPPO
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT connect.example.com.2055:%HTTPPORT HTTP/1.1\r
-Host: connect.example.com.2055:%HTTPPORT\r
+CONNECT connect.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
+Host: connect.example.com.%TESTNUMBER:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>
-GET /2055 HTTP/1.1\r
-Host: www.example.com.2055\r
+GET /%TESTNUMBER HTTP/1.1\r
+Host: www.example.com.%TESTNUMBER\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index fc3d14773d9dcf6c047af292873176216744fa30..d262e097da561e66a547c0c5095aa77ebf705b5d 100644 (file)
@@ -47,14 +47,14 @@ LD_PRELOAD=%PWD/libtest/.libs/libstubgss.so
 CURL_STUB_GSS_CREDS="KRB5_Alice"
 </setenv>
 <command>
--u: --negotiate http://%HOSTIP:%HTTPPORT/2056
+-u: --negotiate http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2056 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Negotiate IktSQjVfQWxpY2UiOkhUVFBAMTI3LjAuMC4xOjE6QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQQ==\r
 User-Agent: curl/%VERSION\r
index f9c379076ddd1542031f28f8f6610359e5413e7f..c5443cc60131499fb4398858692116263dfa25df 100644 (file)
@@ -63,20 +63,20 @@ LD_PRELOAD=%PWD/libtest/.libs/libstubgss.so
 CURL_STUB_GSS_CREDS="NTLM_Alice"
 </setenv>
 <command>
--u: --negotiate http://%HOSTIP:%HTTPPORT/2057
+-u: --negotiate http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2057 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Negotiate Ik5UTE1fQWxpY2UiOkhUVFBAMTI3LjAuMC4xOjI6QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQQ==\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /2057 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Negotiate Ik5UTE1fQWxpY2UiOkhUVFBAMTI3LjAuMC4xOjM6QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQQ==\r
 User-Agent: curl/%VERSION\r
index e1a80146669dd222d821b1de485c76e545d64933..daff038d7c09d42fa3a5600d9fe0a9c4ade0fd63 100644 (file)
@@ -72,9 +72,9 @@ proxy
 HTTP POST --digest with PUT, resumed upload, modified method and SHA-256
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/2058 -u auser:apasswd --digest -T log/2058 -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -T log/%TESTNUMBER -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET
 </command>
-<file name="log/2058">
+<file name="log/%TESTNUMBER">
 test
 </file>
 </client>
@@ -82,7 +82,7 @@ test
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/2058 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Content-Range: bytes 2-4/5\r
 User-Agent: curl/%VERSION\r
@@ -90,9 +90,9 @@ Accept: */*
 Proxy-Connection: Keep-Alive\r
 Content-Length: 0\r
 \r
-GET http://%HOSTIP:%HTTPPORT/2058 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/2058", response="fbed69f9f3fd304c8f1acb1a43eb32688b933c0e28055c16b926cbcec070aeed", algorithm=SHA-256\r
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="fbed69f9f3fd304c8f1acb1a43eb32688b933c0e28055c16b926cbcec070aeed", algorithm=SHA-256\r
 Content-Range: bytes 2-4/5\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 4b3ed0f502813410740296e398bc5db12566723e..7ce80a3844e141e285ec0df57381bcf507ab1b84 100644 (file)
@@ -72,9 +72,9 @@ proxy
 HTTP POST --digest with PUT, resumed upload, modified method, SHA-512-256 and userhash=true
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/2059 -u auser:apasswd --digest -T log/2059 -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -T log/%TESTNUMBER -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET
 </command>
-<file name="log/2059">
+<file name="log/%TESTNUMBER">
 test
 </file>
 </client>
@@ -82,7 +82,7 @@ test
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/2059 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Content-Range: bytes 2-4/5\r
 User-Agent: curl/%VERSION\r
@@ -90,9 +90,9 @@ Accept: */*
 Proxy-Connection: Keep-Alive\r
 Content-Length: 0\r
 \r
-GET http://%HOSTIP:%HTTPPORT/2059 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="fddc3bc7b753b73ab0848fd83cb20cbbca971258eb8d20c941dd5e0b010d66be", realm="testrealm", nonce="1053604144", uri="/2059", response="fc09be8192851e284e73e8b719b32a2f6f91cca0594e68713da8c49dc2c1656e", algorithm=SHA-512-256, userhash=true\r
+Authorization: Digest username="fddc3bc7b753b73ab0848fd83cb20cbbca971258eb8d20c941dd5e0b010d66be", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="fc09be8192851e284e73e8b719b32a2f6f91cca0594e68713da8c49dc2c1656e", algorithm=SHA-512-256, userhash=true\r
 Content-Range: bytes 2-4/5\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index c3ac6421c0dd1362d3828652bde14398275ba71b..f92ff835731db7ad953aeda0f4de624297f19ad0 100644 (file)
@@ -79,26 +79,26 @@ proxy
 HTTP proxy CONNECT auth Digest
  </name>
  <command>
-http://test.remote.haxx.se.206:8990/path/2060002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
+http://test.remote.haxx.se.%TESTNUMBER:8990/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-CONNECT test.remote.haxx.se.206:8990 HTTP/1.1\r
-Host: test.remote.haxx.se.206:8990\r
+CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1\r
+Host: test.remote.haxx.se.%TESTNUMBER:8990\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
-CONNECT test.remote.haxx.se.206:8990 HTTP/1.1\r
-Host: test.remote.haxx.se.206:8990\r
-Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.206:8990", response="003e36decb4dbf6366b3ecb9b87c24ec"\r
+CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1\r
+Host: test.remote.haxx.se.%TESTNUMBER:8990\r
+Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.%TESTNUMBER:8990", response="003e36decb4dbf6366b3ecb9b87c24ec"\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET /path/2060002 HTTP/1.1\r
-Host: test.remote.haxx.se.206:8990\r
+GET /path/%TESTNUMBER0002 HTTP/1.1\r
+Host: test.remote.haxx.se.%TESTNUMBER:8990\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index dfb4bd5b364e46179b290d03a7bff2fec0f6c4fc..e0b4505ef3ad62057622f298ddb67b5e1f9f3613 100644 (file)
@@ -72,9 +72,9 @@ proxy
 HTTP POST --digest with PUT, resumed upload, modified method, SHA-512-256 and userhash=false
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/2060 -u auser:apasswd --digest -T log/2060 -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -T log/%TESTNUMBER -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET
 </command>
-<file name="log/2060">
+<file name="log/%TESTNUMBER">
 test
 </file>
 </client>
@@ -82,7 +82,7 @@ test
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/2060 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Content-Range: bytes 2-4/5\r
 User-Agent: curl/%VERSION\r
@@ -90,9 +90,9 @@ Accept: */*
 Proxy-Connection: Keep-Alive\r
 Content-Length: 0\r
 \r
-GET http://%HOSTIP:%HTTPPORT/2060 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/2060", response="3ce1e25ffa611bdbe90e2ab367b9602fa223db9f6de76ac667f0d6157e2178a6", algorithm=SHA-512-256\r
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="3ce1e25ffa611bdbe90e2ab367b9602fa223db9f6de76ac667f0d6157e2178a6", algorithm=SHA-512-256\r
 Content-Range: bytes 2-4/5\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 6953423a3622a223f9728ae26540018c6bd7d83d..702bc64dd9270a77b2a4f8463fceb96b8ee3b9f6 100644 (file)
@@ -59,21 +59,21 @@ crypto
 HTTP with RFC7616 SHA256 Digest authorization
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/2061 -u testuser:testpass --digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2061 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /2061 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/2061", response="9dc55255f1a2537b838311674b621d45346b862a81631bb20e4ce356ef25062d", algorithm=SHA-256\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="9dc55255f1a2537b838311674b621d45346b862a81631bb20e4ce356ef25062d", algorithm=SHA-256\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index 6075263de39b3a625763965419f769ab87c71f85..e05a42f66fc7ad9584554b6eb3e55fef68a572d8 100644 (file)
@@ -59,21 +59,21 @@ crypto
 HTTP with RFC7616 SHA-512-256 Digest authorization and userhash=false
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/2062 -u testuser:testpass --digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2062 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /2062 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/2062", response="2af735ec3508f4dff99248ffbbe9de9002bfd7cc770cfa2b026cb334042a54e3", algorithm=SHA-512-256\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="2af735ec3508f4dff99248ffbbe9de9002bfd7cc770cfa2b026cb334042a54e3", algorithm=SHA-512-256\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index 557e593613059d46ec76f256ada9e70dba906094..0854c8061043ad4a4ef789e811e7c058e97527d1 100644 (file)
@@ -59,21 +59,21 @@ crypto
 HTTP with RFC7616 SHA-512-256 Digest authorization and userhash=true
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/2063 -u testuser:testpass --digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2063 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /2063 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="75af8a3500f771e58a52093a25e7905d6e428a511285c12ea1420c73078dfd61", realm="testrealm", nonce="1053604145", uri="/2063", response="43f7ab531dff687b5dc75617daa59d1fd67d648341d6d2655ca65ef5064cfb51", algorithm=SHA-512-256, userhash=true\r
+Authorization: Digest username="75af8a3500f771e58a52093a25e7905d6e428a511285c12ea1420c73078dfd61", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="43f7ab531dff687b5dc75617daa59d1fd67d648341d6d2655ca65ef5064cfb51", algorithm=SHA-512-256, userhash=true\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index fc196f25834e253dfa9bcb0c6bf6d7b9ce65d32e..77810ec1dd861e750c79bb83ef971b4be567f5eb 100644 (file)
@@ -59,21 +59,21 @@ crypto
 HTTP with RFC7616 Digest authorization with bad password and SHA256
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/2064 -u testuser:test2pass --digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:test2pass --digest
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2064 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /2064 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/2064", response="a9c3ec1036068b336cbabefe9dfcad52ee8b89bc7c91ddbb5bb415c6acdf38a5", algorithm=SHA-256\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/%TESTNUMBER", response="a9c3ec1036068b336cbabefe9dfcad52ee8b89bc7c91ddbb5bb415c6acdf38a5", algorithm=SHA-256\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index f352e6bcc27c43faa9a7703d69bf38e59192cb2d..3d7afea2509f8def51ea5bb04b405da7b6c850a3 100644 (file)
@@ -59,21 +59,21 @@ crypto
 HTTP with RFC7616 Digest authorization with bad password, SHA-512-256 and userhash=false
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/2065 -u testuser:test2pass --digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:test2pass --digest
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2065 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /2065 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/2065", response="5a5f20b0e601aeddc6f96422c2332d49ff431c49ab143b5f836ef76e9ac78f5e", algorithm=SHA-512-256\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/%TESTNUMBER", response="5a5f20b0e601aeddc6f96422c2332d49ff431c49ab143b5f836ef76e9ac78f5e", algorithm=SHA-512-256\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index 31a143d696755f8cb28416e29b88ad1cd02bec17..1f8d1982dc9dded7a3680fc3eb31f8c46cf8b2eb 100644 (file)
@@ -59,21 +59,21 @@ crypto
 HTTP with RFC7616 Digest authorization with bad password, SHA-512-256 and userhash=true
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/2066 -u testuser:test2pass --digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:test2pass --digest
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2066 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /2066 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="75af8a3500f771e58a52093a25e7905d6e428a511285c12ea1420c73078dfd61", realm="testrealm", nonce="2053604145", uri="/2066", response="a2e2ae589f575fb132991d6f550ef14bf7ef697d2fef1242d2498f07eafc77dc", algorithm=SHA-512-256, userhash=true\r
+Authorization: Digest username="75af8a3500f771e58a52093a25e7905d6e428a511285c12ea1420c73078dfd61", realm="testrealm", nonce="2053604145", uri="/%TESTNUMBER", response="a2e2ae589f575fb132991d6f550ef14bf7ef697d2fef1242d2498f07eafc77dc", algorithm=SHA-512-256, userhash=true\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index 0ae407606f7e1a6a5148e6c3b275e8e1764e4bc5..4fdd4dcbb056cec2b4df66ced6c16e7ea3648bc8 100644 (file)
@@ -60,23 +60,23 @@ HTTP POST --digest with SHA256 and user-specified Content-Length header
 # even when there is a user-specified Content-Length header.
 # https://github.com/curl/curl/pull/1242
 <command>
--H "Content-Length: 11" -u auser:apasswd --digest -d "junkelijunk" http://%HOSTIP:%HTTPPORT/2067
+-H "Content-Length: 11" -u auser:apasswd --digest -d "junkelijunk" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /2067 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-POST /2067 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/2067", response="67b97af219c92fa7e8685e5bebb8e74892f6c6792e911c52bd2dfbf0b49272eb", algorithm=SHA-256\r
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="67b97af219c92fa7e8685e5bebb8e74892f6c6792e911c52bd2dfbf0b49272eb", algorithm=SHA-256\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 11\r
index 21003bdb26e66f7ce56e1eec50da30da7f8a5138..429e5d5660545354f712a3c26179b3929d2cf3b1 100644 (file)
@@ -60,23 +60,23 @@ HTTP POST --digest with SHA-512-256, userhash=false and user-specified Content-L
 # even when there is a user-specified Content-Length header.
 # https://github.com/curl/curl/pull/1242
 <command>
--H "Content-Length: 11" -u auser:apasswd --digest -d "junkelijunk" http://%HOSTIP:%HTTPPORT/2068
+-H "Content-Length: 11" -u auser:apasswd --digest -d "junkelijunk" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /2068 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-POST /2068 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/2068", response="4bc9c97a72f1856bcec9b0e1518c6b7ee28773f91357d56840bdc30bd89ca68f", algorithm=SHA-512-256\r
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="4bc9c97a72f1856bcec9b0e1518c6b7ee28773f91357d56840bdc30bd89ca68f", algorithm=SHA-512-256\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 11\r
index fb3d15dcd0750356b8dad4f19f57079c80c2e3e9..41a0c744d423704507a29680adbcfafd71efe46c 100644 (file)
@@ -60,23 +60,23 @@ HTTP POST --digest with SHA-512-256, userhash=true and user-specified Content-Le
 # even when there is a user-specified Content-Length header.
 # https://github.com/curl/curl/pull/1242
 <command>
--H "Content-Length: 11" -u auser:apasswd --digest -d "junkelijunk" http://%HOSTIP:%HTTPPORT/2069
+-H "Content-Length: 11" -u auser:apasswd --digest -d "junkelijunk" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /2069 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-POST /2069 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="fddc3bc7b753b73ab0848fd83cb20cbbca971258eb8d20c941dd5e0b010d66be", realm="testrealm", nonce="1053604144", uri="/2069", response="ff13d977110a471f30de75e747976e4de78d7a3d2425cd23ff46e67f4bc9ead7", algorithm=SHA-512-256, userhash=true\r
+Authorization: Digest username="fddc3bc7b753b73ab0848fd83cb20cbbca971258eb8d20c941dd5e0b010d66be", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="ff13d977110a471f30de75e747976e4de78d7a3d2425cd23ff46e67f4bc9ead7", algorithm=SHA-512-256, userhash=true\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 11\r
index 1ce2338a3d7001eb7638bacfbeadd5a911adca01..73d363c6e0b75c4ec1d5a20ce0eb8d591178b36a 100644 (file)
@@ -41,7 +41,7 @@ http
 HTTP GET with chunked Transfer-Encoding closed prematurely
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/207
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -49,7 +49,7 @@ http://%HOSTIP:%HTTPPORT/207
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /207 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index c359b1cd501833732fd26cc53c61c714c26a1891..7258638f7dc0b2064080e9b3e3e26f15478bacec 100644 (file)
@@ -38,7 +38,7 @@ Ignore certificate revocation "best effort" strategy
 CURL_SSL_BACKEND=schannel
  </setenv>
  <command>
---cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --ssl-revoke-best-effort https://localhost:%HTTPSPORT/2070
+--cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --ssl-revoke-best-effort https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name
 <precheck>
@@ -50,7 +50,7 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2070 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: localhost:%HTTPSPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 1bab15888733ef1042fe029046bb07eec96a01f1..179167068ea9afdf6ffde71957783151ca5165e7 100644 (file)
@@ -24,12 +24,12 @@ file
 file:// with unix path resolution behavior for the case of extra slashes
 </name>
 <command option="no-include">
-file:////%PWD/log/test2072.txt
+file:////%PWD/log/test%TESTNUMBER.txt
 </command>
 <precheck>
 perl -e "print 'Test requires a unix system' if ( $^O eq 'MSWin32' || $^O eq 'cygwin' || $^O eq 'dos' || $^O eq 'msys');"
 </precheck>
-<file name="log/test2072.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo
    bar
 bar
index 94e1372353b0f82802ea8600fed240ad6c2693ff..dd3641546f5e85210ef3c35c6737848f83e0974f 100644 (file)
@@ -34,7 +34,7 @@ http
 HTTP form posts with handle reset
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/2073 -F 'name=a;filename=a.pdf' --next http://%HOSTIP:%HTTPPORT/2073 -F 'name=b;filename=b.jpg'
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -F 'name=a;filename=a.pdf' --next http://%HOSTIP:%HTTPPORT/%TESTNUMBER -F 'name=b;filename=b.jpg'
 </command>
 </client>
 
@@ -45,7 +45,7 @@ http://%HOSTIP:%HTTPPORT/2073 -F 'name=a;filename=a.pdf' --next http://%HOSTIP:%
 ^(Content-Type: multipart/form-data;|------------).*
 </strip>
 <protocol>
-POST /2073 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -55,7 +55,7 @@ Content-Disposition: form-data; name="name"; filename="a.pdf"
 Content-Type: application/pdf\r
 \r
 a\r
-POST /2073 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 786091c78460c5edc4c1f83b197e6651d1585161..e7b600338178422c214193b40f719f86319a6053 100644 (file)
@@ -36,7 +36,7 @@ http
 HTTP GET
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/2074 --oauth2-bearer mF_9.B5f-4.1JqM
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 </client>
 
@@ -44,7 +44,7 @@ http://%HOSTIP:%HTTPPORT/2074 --oauth2-bearer mF_9.B5f-4.1JqM
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2074 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Bearer mF_9.B5f-4.1JqM\r
 User-Agent: curl/%VERSION\r
index 5974286f688ec5c0512458483ce19937e11f8c08..646b7dfc856cdcf90709ca8d4dff9cb4f0d39fc7 100644 (file)
@@ -51,21 +51,21 @@ crypto
 HTTP with digest auth and URI contains query
 </name>
 <command>
-"http://%HOSTIP:%HTTPPORT/2076?query" -u testuser:testpass --digest
+"http://%HOSTIP:%HTTPPORT/%TESTNUMBER?query" -u testuser:testpass --digest
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2076?query HTTP/1.1\r
+GET /%TESTNUMBER?query HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /2076?query HTTP/1.1\r
+GET /%TESTNUMBER?query HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/2076?query", response="5758bd3bbde7f33236e6ccd278eb59af"\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER?query", response="5758bd3bbde7f33236e6ccd278eb59af"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index 0c600f5c38352ee650a4145083895680693ff4b0..44a197481ad5466146c6468e3a4df444b571c080 100644 (file)
@@ -29,7 +29,7 @@ GSS-API
 curl --fail --negotiate to unauthenticated service fails
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/2077 -u : --fail --negotiate
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u : --fail --negotiate
 </command>
 </client>
 
index c881b0499f3d8e52faf212084daea6501461b929..387352afa94de3b9367f087af4f6f6d5098fb058 100644 (file)
@@ -29,7 +29,7 @@ GSS-API
 curl --negotiate should not send empty POST request only
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/2078 -u : --negotiate --data name=value
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u : --negotiate --data name=value
 </command>
 </client>
 
@@ -39,7 +39,7 @@ http://%HOSTIP:%HTTPPORT/2078 -u : --negotiate --data name=value
 0
 </errorcode>
 <protocol nonewline="yes">
-POST /2078 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 19199e29b1dbdad5a744202a24e00a958ba9c5ad..d081b5131f74f93251f411619bdbe1851e2905ac 100644 (file)
@@ -33,9 +33,9 @@ proxy
 HTTP PUT to a FTP URL with username+password - over HTTP proxy
  </name>
  <command>
--x http://%HOSTIP:%HTTPPORT ftp://daniel:mysecret@host.com/we/want/208 -T log/test208.txt
+-x http://%HOSTIP:%HTTPPORT ftp://daniel:mysecret@host.com/we/want/%TESTNUMBER -T log/test%TESTNUMBER.txt
 </command>
-<file name="log/test208.txt">
+<file name="log/test%TESTNUMBER.txt">
 Weird
      file
          to
@@ -51,7 +51,7 @@ the
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT ftp://daniel:mysecret@host.com/we/want/208 HTTP/1.1\r
+PUT ftp://daniel:mysecret@host.com/we/want/%TESTNUMBER HTTP/1.1\r
 Host: host.com:21\r
 Authorization: Basic ZGFuaWVsOm15c2VjcmV0\r
 User-Agent: curl/%VERSION\r
index 47e376ecb5d7879c0a98e392bff48ccc52e9db0a..9a337031d694d2d224afc63ceaedaf800ed811e0 100644 (file)
Binary files a/tests/data/test2080 and b/tests/data/test2080 differ
index e849869cf36efc183dcddb74bb6fe3fddffb3f9c..dcead8513615862d4f9fc62a6b62049cb829e5a7 100644 (file)
@@ -92,7 +92,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://test.remote.example.com.209:%HTTPPORT/path/2090002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-ntlm --proxytunnel
+http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-ntlm --proxytunnel
 </command>
 <precheck>
 chkhostname curlhost
@@ -102,20 +102,20 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-CONNECT test.remote.example.com.209:%HTTPPORT HTTP/1.1\r
-Host: test.remote.example.com.209:%HTTPPORT\r
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
-CONNECT test.remote.example.com.209:%HTTPPORT HTTP/1.1\r
-Host: test.remote.example.com.209:%HTTPPORT\r
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET /path/2090002 HTTP/1.1\r
-Host: test.remote.example.com.209:%HTTPPORT\r
+GET /path/%TESTNUMBER0002 HTTP/1.1\r
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index c6fb7030939630d78d7c89fae3bce1003d684a13..170316425b0f5aec6ad6a75cff2fb25072ed4d64 100644 (file)
@@ -23,7 +23,7 @@ ftp
 Get two FTP files from the same remote dir: no second CWD
  </name>
 <command option="no-include">
-ftp://%HOSTIP:%FTPPORT/a/path/210 ftp://%HOSTIP:%FTPPORT/a/path/210
+ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER
 </command>
 <stdout>
 data blobb
@@ -41,11 +41,11 @@ CWD a
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE 210\r
-RETR 210\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 EPSV\r
-SIZE 210\r
-RETR 210\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 07b4a7a9d3dcd61057c7ac01f1bbd3c49ce7caa3..39ba19106d887264ff14d3142d4f5da6ac5031bc 100644 (file)
Binary files a/tests/data/test2100 and b/tests/data/test2100 differ
index 96d0573f22a55a6ed6e0491bc318a56a365d82cc..0fe6e6f96ed609c7a0e1c9f7e652ec941c876c37 100644 (file)
@@ -24,7 +24,7 @@ ftp
 Get two FTP files with no remote EPSV support
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/a/path/211 ftp://%HOSTIP:%FTPPORT/a/path/211
+ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER
 </command>
 <stdout>
 data blobb
@@ -43,11 +43,11 @@ CWD path
 EPSV\r
 PASV\r
 TYPE I\r
-SIZE 211\r
-RETR 211\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 PASV\r
-SIZE 211\r
-RETR 211\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 444525f182c63621a0eb4409fb3ea05a2df905d3..175759a86537dd7f936bf3fc3c773fe35df72315 100644 (file)
@@ -29,7 +29,7 @@ ipv6
 Get two FTP files with no remote EPRT support
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/a/path/212 ftp://%HOSTIP:%FTPPORT/a/path/212 -P -
+ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER -P -
 </command>
 <stdout>
 data blobb
@@ -53,11 +53,11 @@ CWD path
 EPRT |1|\r
 PORT \r
 TYPE I\r
-SIZE 212\r
-RETR 212\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 PORT \r
-SIZE 212\r
-RETR 212\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index da40b8ce7091a239fa87b93c6b8e616ed9f70334..994c4026d28543e2c2d4c6f919a8836e4e4743f5 100644 (file)
@@ -92,7 +92,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://test.remote.example.com.213:%HTTPPORT/path/2130002 --proxy1.0 http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-ntlm --proxytunnel -d "postit"
+http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER0002 --proxy1.0 http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-ntlm --proxytunnel -d "postit"
 </command>
 <precheck>
 chkhostname curlhost
@@ -102,20 +102,20 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-CONNECT test.remote.example.com.213:%HTTPPORT HTTP/1.0\r
-Host: test.remote.example.com.213:%HTTPPORT\r
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.0\r
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
-CONNECT test.remote.example.com.213:%HTTPPORT HTTP/1.0\r
-Host: test.remote.example.com.213:%HTTPPORT\r
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.0\r
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
-POST /path/2130002 HTTP/1.1\r
-Host: test.remote.example.com.213:%HTTPPORT\r
+POST /path/%TESTNUMBER0002 HTTP/1.1\r
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 6\r
index ef0a1d897aac1aaeb7213bb7e852871dd372adba..bb3390f611be337fa19857e9eed20dd3f4721684 100644 (file)
@@ -29,7 +29,7 @@ http
 HTTP URL with escaped { and }
  </name>
 <command>
-"http://%HOSTIP:%HTTPPORT/\{\}\/214"
+"http://%HOSTIP:%HTTPPORT/\{\}\/%TESTNUMBER"
 </command>
 <setenv>
 # Needed for MSYS2 to not convert all backslashes to forward slashes
@@ -41,7 +41,7 @@ MSYS2_ARG_CONV_EXCL=http://
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /{}\/214 HTTP/1.1\r
+GET /{}\/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 987fd990aa23a8a37d065d93fb48d40130a0ad1b..5fd8fc656b687d51955a86147d46199981398d79 100644 (file)
@@ -34,7 +34,7 @@ ftp
 Get two FTP dir listings from the same remote dir: no second CWD
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/a/path/215/ ftp://%HOSTIP:%FTPPORT/a/path/215/
+ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER/ ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER/
 </command>
 </client>
 
@@ -46,7 +46,7 @@ PASS ftp@example.com
 PWD\r
 CWD a\r
 CWD path\r
-CWD 215\r
+CWD %TESTNUMBER\r
 EPSV\r
 TYPE A\r
 LIST\r
index 404e9c98a3108bf1c0e983e49205ca22dcc37e32..0e74110b19b10963d0a5442f4ca8cc6049e867be 100644 (file)
@@ -18,9 +18,9 @@ ftp
 FTP upload two files to the same dir
  </name>
  <command>
--T log/upload.216 ftp://%HOSTIP:%FTPPORT/a/path/216/ -T log/upload.216 ftp://%HOSTIP:%FTPPORT/a/path/216/%2e%2eanotherup.216
+-T log/upload.%TESTNUMBER ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER/ -T log/upload.%TESTNUMBER ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER/%2e%2eanotherup.%TESTNUMBER
 </command>
-<file name="log/upload.216">
+<file name="log/upload.%TESTNUMBER">
 upload this file twice
 </file>
 </client>
@@ -33,12 +33,12 @@ PASS ftp@example.com
 PWD\r
 CWD a\r
 CWD path\r
-CWD 216\r
+CWD %TESTNUMBER\r
 EPSV\r
 TYPE I\r
-STOR upload.216\r
+STOR upload.%TESTNUMBER\r
 EPSV\r
-STOR ..anotherup.216\r
+STOR ..anotherup.%TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index b06734473a7eb8dae64b962fb63703419eff1bcb..d791416b03da837ae5e3427b1b3394fd85bf9f71 100644 (file)
@@ -32,7 +32,7 @@ http
 HTTP proxy CONNECT to proxy returning 405
  </name>
  <command>
-http://test.remote.example.com.217:%HTTPPORT/path/2170002 --proxy http://%HOSTIP:%HTTPPORT --proxytunnel -w "%{http_code} %{http_connect}\n"
+http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxytunnel -w "%{http_code} %{http_connect}\n"
 </command>
 <features>
 proxy
@@ -42,8 +42,8 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-CONNECT test.remote.example.com.217:%HTTPPORT HTTP/1.1\r
-Host: test.remote.example.com.217:%HTTPPORT\r
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
index 4951c264bf74ee2c262d0d5465b92b922795e4dd..40c68857f18683d46f86289349d399e49b206c4c 100644 (file)
@@ -29,9 +29,9 @@ http
 HTTP PUT from a file but enforce chunked transfer-encoding
  </name>
  <command>
- -T log/file218 -H "Transfer-Encoding: chunked" http://%HOSTIP:%HTTPPORT/218
+ -T log/file%TESTNUMBER -H "Transfer-Encoding: chunked" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
-<file name="log/file218">
+<file name="log/file%TESTNUMBER">
 just some tiny teeny contents
 </file>
 </client>
@@ -40,7 +40,7 @@ just some tiny teeny contents
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /218 HTTP/1.1\r
+PUT /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 2b638950ef8718d61058cb15925d5bad46653e41..74a8551dae204691f871fdd9d91e9ada91e431bc 100644 (file)
@@ -24,7 +24,7 @@ proxy
 try using proxy with unsupported scheme
  </name>
  <command>
--x foo://%HOSTIP:%NOLISTENPORT/219 http://%HOSTIP:%NOLISTENPORT/219
+-x foo://%HOSTIP:%NOLISTENPORT/%TESTNUMBER http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER
 </command>
 </client>
 
index 57dd7ddaaa0834feed72cb72448f47b97231157f..f5593c435c7d99b0a613f6567927697ea771a937 100644 (file)
@@ -26,14 +26,14 @@ http
 get HTTP with URL > 10000 bytes
  </name>
  <command>
-%HOSTIP:%HTTPPORT/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/22
+%HOSTIP:%HTTPPORT/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/22 HTTP/1.1\r
+GET /aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 67f31f1f470f2d98665c20c05b62e3f838f2b681..cfc8cbda7715977827266305b1f8cde22fd2e33b 100644 (file)
@@ -47,7 +47,7 @@ http
 HTTP GET gzip compressed content
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/220 --compressed
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>
 
@@ -62,7 +62,7 @@ s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 %endif
 </strippart>
 <protocol>
-GET /220 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 3fab37f52c035d93b68d05448a91e5eb5abfd3de..ce80637b1058d9500930fbbb5154f20fbc7bd703 100644 (file)
@@ -47,7 +47,7 @@ http
 HTTP GET gzip compressed content with broken gzip header
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/221 --compressed
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>
 
@@ -58,7 +58,7 @@ http://%HOSTIP:%HTTPPORT/221 --compressed
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
-GET /221 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 27d169fed9642e24bdeda80ff090b84cfd5ce8e6..a06234a08ba8fab182c166ce2fc54a9a01a7e743 100644 (file)
@@ -178,7 +178,7 @@ http
 HTTP GET deflate compressed content
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/222 --compressed
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>
 
@@ -189,7 +189,7 @@ http://%HOSTIP:%HTTPPORT/222 --compressed
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
-GET /222 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 52bbb7c6f90e0394a147debc4133e1407bbfba79..a37645d7d9c600b2c5c108991c823651569b4616 100644 (file)
@@ -68,7 +68,7 @@ http
 HTTP GET deflate compressed content with broken deflate header
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/223 --compressed
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>
 
@@ -79,7 +79,7 @@ http://%HOSTIP:%HTTPPORT/223 --compressed
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
-GET /223 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index b632ffd29b2822480a9502d244d5b01f79c3fbee..f98c8eddf39f90a2f6f8d753190f1b77e6e0c991 100644 (file)
@@ -83,7 +83,7 @@ http
 HTTP GET gzip compressed content with huge comment and extra field
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/224 --compressed
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>
 
@@ -94,7 +94,7 @@ http://%HOSTIP:%HTTPPORT/224 --compressed
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
-GET /224 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index a6447125d036ad06f97fd84e1c5a10376a5af8e5..5c8efd9d93bb5a68928c1fb3ec7cb269ea91947b 100644 (file)
@@ -14,7 +14,7 @@ ftp
 FTP %0a-code in URL's name part
  </name>
  <command>
-ftp://bad%0auser:passwd@%HOSTIP:%FTPPORT/225%0a
+ftp://bad%0auser:passwd@%HOSTIP:%FTPPORT/%TESTNUMBER%0a
 </command>
 </client>
 
index 9fc4bda3d99ec613d82fa117b7fea11aa10c86ee..93954576640df1521838a2f941c590ddc4aaf843 100644 (file)
@@ -15,7 +15,7 @@ ftp
 FTP %0d-code in URL's CWD part
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/226%0d
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER%0d
 </command>
 </client>
 
index 5b6d98cd1720fb57343bdd0b5c78c79a163d218f..18622df58978b24ce3dedff8249e481e1d84d9af 100644 (file)
@@ -31,7 +31,7 @@ ftp
 FTP with quote ops
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/227 -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FAIL" -Q "+*FAIL HARD"
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FAIL" -Q "+*FAIL HARD"
 </command>
 </client>
 
@@ -48,8 +48,8 @@ PASV
 TYPE I\r
 NOOP 2\r
 FAIL HARD\r
-SIZE 227\r
-RETR 227\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 NOOP 3\r
 QUIT\r
 </protocol>
index f581583f318bd986e2ae282296d762bc5ac6cfe9..7ac4ca49a3cae2b6d52a90a1ad356fc56381ac23 100644 (file)
@@ -30,7 +30,7 @@ ftp
 FTP RETR with ACCT
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/228 --ftp-account "one count"
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-account "one count"
 </command>
 </client>
 
@@ -44,8 +44,8 @@ ACCT one count
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 228\r
-RETR 228\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index d337468ac09a4ea49601d2f6f1c7018bc4007678..75dc10335eb0dcf4be92881dc765a2ed77ab49cd 100644 (file)
@@ -23,7 +23,7 @@ ftp
 FTP RETR with bad ACCT
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/229 --ftp-account "one count"
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-account "one count"
 </command>
 </client>
 
index eb696da026b5e50e8a6b2d2a57253988d3c12528..ea54f9dd4b012863a4ecff5cff4032da7a980813 100644 (file)
@@ -179,7 +179,7 @@ http
 HTTP GET multiply compressed content
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/230 --compressed
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>
 
@@ -190,7 +190,7 @@ http://%HOSTIP:%HTTPPORT/230 --compressed
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
-GET /230 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 7254953e15635e8708c00ef3303ba40d3ec33f58..c925eb15188499a35297865312c61c2877696f77 100644 (file)
@@ -23,9 +23,9 @@ file
 file:// with resume
  </name>
 <command option="no-include">
-file://localhost%FILE_PWD/log/test231.txt -C 10
+file://localhost%FILE_PWD/log/test%TESTNUMBER.txt -C 10
 </command>
-<file name="log/test231.txt">
+<file name="log/test%TESTNUMBER.txt">
 A01234567
 B01234567
 C01234567
index e0e703422e6cb749b4793d1826b865ab8a8df394..a856adea21fcfadcc44ffaf205ef3187859be77d 100644 (file)
@@ -178,7 +178,7 @@ http
 HTTP GET deflate raw-compressed content
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/232 --compressed
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>
 
@@ -189,7 +189,7 @@ http://%HOSTIP:%HTTPPORT/232 --compressed
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
-GET /232 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 5e42c715f8f79f065abe959d1740b845434aedb5..d0899758629de422270c9b5e48cfcde2f5502d37 100644 (file)
@@ -17,7 +17,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/html
 Funny-head: yesyes
-Location: http://goto.second.host.now/2330002
+Location: http://goto.second.host.now/%TESTNUMBER0002
 Content-Length: 8
 Connection: close
 
@@ -40,7 +40,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/html
 Funny-head: yesyes
-Location: http://goto.second.host.now/2330002
+Location: http://goto.second.host.now/%TESTNUMBER0002
 Content-Length: 8
 Connection: close
 
@@ -65,7 +65,7 @@ http
 HTTP, proxy, site+proxy auth and Location: to new host
  </name>
  <command>
-http://first.host.it.is/we/want/that/page/233 -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user testing:this --location
+http://first.host.it.is/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user testing:this --location
 </command>
 <features>
 proxy
@@ -76,7 +76,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://first.host.it.is/we/want/that/page/233 HTTP/1.1\r
+GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1\r
 Host: first.host.it.is\r
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
 Authorization: Basic aWFtOm15c2VsZg==\r
@@ -84,7 +84,7 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://goto.second.host.now/2330002 HTTP/1.1\r
+GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1\r
 Host: goto.second.host.now\r
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
 User-Agent: curl/%VERSION\r
index 0c1871ea9d635c41225f1e3ed4c4b9de61ee8fa8..5e9258f5090767e6a7b0da97c21548f5820ffe97 100644 (file)
@@ -19,7 +19,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/html
 Funny-head: yesyes
-Location: http://goto.second.host.now/2340002
+Location: http://goto.second.host.now/%TESTNUMBER0002
 Content-Length: 8
 Connection: close
 
@@ -42,7 +42,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/html
 Funny-head: yesyes
-Location: http://goto.second.host.now/2340002
+Location: http://goto.second.host.now/%TESTNUMBER0002
 Content-Length: 8
 Connection: close
 
@@ -67,7 +67,7 @@ http
 HTTP, proxy, site+proxy auth and Location: to new host using location-trusted
  </name>
  <command>
-http://first.host.it.is/we/want/that/page/234 -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user testing:this --location-trusted
+http://first.host.it.is/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user testing:this --location-trusted
 </command>
 <features>
 proxy
@@ -78,7 +78,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://first.host.it.is/we/want/that/page/234 HTTP/1.1\r
+GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1\r
 Host: first.host.it.is\r
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
 Authorization: Basic aWFtOm15c2VsZg==\r
@@ -86,7 +86,7 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://goto.second.host.now/2340002 HTTP/1.1\r
+GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1\r
 Host: goto.second.host.now\r
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
 Authorization: Basic aWFtOm15c2VsZg==\r
index 94abb951ca9f20b64499ce0061a1bed9dff7cb50..e1f2a2f1ee22b3cf91d53a564601ae5c03e02585 100644 (file)
@@ -21,9 +21,9 @@ ftp
 FTP resumed upload but no file present remotely
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/235 -T log/upload235 -C -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER -C -
 </command>
-<file name="log/upload235">
+<file name="log/upload%TESTNUMBER">
 this is the *****crap******** that we're gonna upload
 
 worx?
@@ -38,8 +38,8 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 235\r
-STOR 235\r
+SIZE %TESTNUMBER\r
+STOR %TESTNUMBER\r
 QUIT\r
 </protocol>
 <upload>
index 92e34bc3e096b283b10007425498fbe17eb6441e..3a89add7fd1ed18d41c91e7590145d02665b98ce 100644 (file)
@@ -24,9 +24,9 @@ ftp
 FTP resume upload but denied access to remote file
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/236 -T log/file236.txt -C -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/file%TESTNUMBER.txt -C -
 </command>
-<file name="log/file236.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 </file>
 </client>
@@ -40,8 +40,8 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 236\r
-STOR 236\r
+SIZE %TESTNUMBER\r
+STOR %TESTNUMBER\r
 QUIT\r
 </protocol>
 
index e9147dcd15fed63e0823f9a4a6bb9b792c5beca6..18ee6d951e731fcec907a597e4b80b14f7474014 100644 (file)
@@ -21,7 +21,7 @@ ftp
 FTP getting bad host in 227-response to PASV
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/237 --disable-epsv
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --disable-epsv
 </command>
 </client>
 
index ea54509a17d2ea94d35e22e1fa18900d909776f2..748ad46bfd2f01eced214fff594b19c4aaa57b68 100644 (file)
@@ -21,7 +21,7 @@ ftp
 FTP getting bad port in response to EPSV
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/238
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
index b9e18723554e88cbb6daa6820721e724ec2e289a..c234e0b687347cfadc1d4627ac1e1875766929bf 100644 (file)
@@ -67,7 +67,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/239 --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-ntlm -d "postit"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-ntlm -d "postit"
 </command>
 <precheck>
 chkhostname curlhost
@@ -77,7 +77,7 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST http://%HOSTIP:%HTTPPORT/239 HTTP/1.1\r
+POST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/%VERSION\r
@@ -86,7 +86,7 @@ Proxy-Connection: Keep-Alive
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-POST http://%HOSTIP:%HTTPPORT/239 HTTP/1.1\r
+POST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
 User-Agent: curl/%VERSION\r
index 4c9d35e261503c4a07eebed3358e3277375744f7..bbd5f039475377f8df513cfd2d0f3c7f55e86588 100644 (file)
@@ -25,14 +25,14 @@ http
 HTTP GET fail silently on HTTP error return
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/24 --fail --silent --show-error
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail --silent --show-error
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /24 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -41,7 +41,7 @@ Accept: */*
 <errorcode>
 22
 </errorcode>
-<file2 name="log/stderr24" mode="text">
+<file2 name="log/stderr%TESTNUMBER" mode="text">
 curl: (22) The requested URL returned error: 404
 </file2>
 </verify>
index 2ddba015747afade1d7c9746d7667091ed9a6a9a..068a2eb60d6c957fcb50faa41826636c2d6f24f6 100644 (file)
@@ -38,7 +38,7 @@ http-ipv6
 HTTP-IPv6 GET
  </name>
  <command>
--g "http://%HOST6IP:%HTTP6PORT/240"
+-g "http://%HOST6IP:%HTTP6PORT/%TESTNUMBER"
 </command>
 </client>
 
@@ -46,7 +46,7 @@ HTTP-IPv6 GET
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /240 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOST6IP:%HTTP6PORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 7ea7a7af60f4e2f3cbd11c77eadf13a18ca392b2..8fb619cac7d2bfc612876f13417b720b07666252 100644 (file)
@@ -33,7 +33,7 @@ http-ipv6
 HTTP-IPv6 GET (using ip6-localhost)
  </name>
  <command>
--g "http://ip6-localhost:%HTTP6PORT/241"
+-g "http://ip6-localhost:%HTTP6PORT/%TESTNUMBER"
 </command>
 <precheck>
 ./server/resolve --ipv6 ip6-localhost
@@ -44,7 +44,7 @@ HTTP-IPv6 GET (using ip6-localhost)
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /241 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: ip6-localhost:%HTTP6PORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 03c6cae57e9d8e575be2ca61a9662b3a98cbf502..504555923c5130bb527702da9371c768c22e8059 100644 (file)
@@ -33,7 +33,7 @@ http-ipv6
 HTTP-IPv6 GET with username+password in URL
  </name>
  <command>
--g "http://foobar:barfoo@%HOST6IP:%HTTP6PORT/242"
+-g "http://foobar:barfoo@%HOST6IP:%HTTP6PORT/%TESTNUMBER"
 </command>
 </client>
 
@@ -41,7 +41,7 @@ HTTP-IPv6 GET with username+password in URL
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /242 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOST6IP:%HTTP6PORT\r
 Authorization: Basic Zm9vYmFyOmJhcmZvbw==\r
 User-Agent: curl/%VERSION\r
index 87826a82eadb3825f072acd1240fa5a0f52f5f2d..2f61afc245cbf4c55b3e11b168e0929406e24511 100644 (file)
@@ -88,7 +88,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/243 --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-anyauth -d "postit"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-anyauth -d "postit"
 </command>
 <precheck>
 chkhostname curlhost
@@ -98,7 +98,7 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST http://%HOSTIP:%HTTPPORT/243 HTTP/1.1\r
+POST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -106,7 +106,7 @@ Proxy-Connection: Keep-Alive
 Content-Length: 6\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-postitPOST http://%HOSTIP:%HTTPPORT/243 HTTP/1.1\r
+postitPOST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/%VERSION\r
@@ -115,7 +115,7 @@ Proxy-Connection: Keep-Alive
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-POST http://%HOSTIP:%HTTPPORT/243 HTTP/1.1\r
+POST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
 User-Agent: curl/%VERSION\r
index 080163dd17b14f6c2f207c1ca1781317811fc376..6755994d5eaf9d5814f75c324daaaeafdeededc1 100644 (file)
@@ -35,7 +35,7 @@ ftp
 FTP dir listing with nocwd and URL encoded path
  </name>
  <command>
---ftp-method nocwd ftp://%HOSTIP:%FTPPORT/fir%23t/th%69rd/244/
+--ftp-method nocwd ftp://%HOSTIP:%FTPPORT/fir%23t/th%69rd/%TESTNUMBER/
 </command>
 </client>
 
@@ -47,7 +47,7 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE A\r
-LIST fir#t/third/244\r
+LIST fir#t/third/%TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 5750b4fa3b43dd3d9fab94096a30968209ff9c99..2d19f0ded617be3b3a8a6ce5392464bef5e28272 100644 (file)
@@ -57,23 +57,23 @@ crypto
 HTTP POST --digest
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/245 -u auser:apasswd --digest -d "junkelijunk"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -d "junkelijunk"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /245 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-POST /245 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/245", response="379a439b1737ba257c1d2f103914b18b"\r
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="379a439b1737ba257c1d2f103914b18b"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 11\r
index b5469f3e5119d580cb17694ad88c938f11cb6186..22b383370a00c1b7b35f6561be729cb92cbb7881 100644 (file)
@@ -67,23 +67,23 @@ crypto
 HTTP POST --digest with server doing a 100 before 401 response
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/246 -u auser:apasswd --digest -d "junkelijunk"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -d "junkelijunk"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /246 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-POST /246 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/246", response="761e6fc9a760c39d587092e8d840e740"\r
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="761e6fc9a760c39d587092e8d840e740"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 11\r
index 2720144edd8f649f4b6afaa2e1f56fc9077f2af2..7e79d39117d1de18cdf9ebfdfc3c040bfaa077b3 100644 (file)
@@ -19,7 +19,7 @@ ftp
  <name>
 FTP upload time condition evaluates TRUE => skip upload
  </name>
-<file name="log/test247.txt">
+<file name="log/test%TESTNUMBER.txt">
 data
     to
       see
@@ -28,7 +28,7 @@ works
   so does it?
 </file>
  <command>
-ftp://%HOSTIP:%FTPPORT/247 -T log/test247.txt -z "apr 1 2005 08:00:00"
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/test%TESTNUMBER.txt -z "apr 1 2005 08:00:00"
 </command>
 </client>
 
@@ -40,7 +40,7 @@ ftp://%HOSTIP:%FTPPORT/247 -T log/test247.txt -z "apr 1 2005 08:00:00"
 USER anonymous\r
 PASS ftp@example.com\r
 PWD\r
-MDTM 247\r
+MDTM %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index d254a951e1797e432b26d4c2535b76792f6be808..8881c99d57d9c2b9c699344a9cca6d34213d56a7 100644 (file)
@@ -19,7 +19,7 @@ ftp
  <name>
 FTP upload time condition evaluates FALSE => upload anyway
  </name>
-<file name="log/test248.txt">
+<file name="log/test%TESTNUMBER.txt">
 data
     to
       see
@@ -28,7 +28,7 @@ works
   so does it?
 </file>
  <command>
-ftp://%HOSTIP:%FTPPORT/248 -T log/test248.txt -z "apr 1 2005 08:00:00"
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/test%TESTNUMBER.txt -z "apr 1 2005 08:00:00"
 </command>
 </client>
 
@@ -46,10 +46,10 @@ works
 USER anonymous\r
 PASS ftp@example.com\r
 PWD\r
-MDTM 248\r
+MDTM %TESTNUMBER\r
 EPSV\r
 TYPE I\r
-STOR 248\r
+STOR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 5e5e4754b8733086c8e9c6ed37dd4fc0b00a7493..4f1ef6aa36f820573bc5179b3e848440681034f1 100644 (file)
@@ -32,7 +32,7 @@ http
 HTTP 304 response with "illegal" Content-Length: header
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/249 -z "dec 12 12:00:00 1999 GMT"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT"
 </command>
 </client>
 
@@ -40,7 +40,7 @@ http://%HOSTIP:%HTTPPORT/249 -z "dec 12 12:00:00 1999 GMT"
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /249 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index d694cdc75e09af5a9d4d2ad6471d4493187103b4..61080ca397661f7604e6684d824781b4e1386b6a 100644 (file)
@@ -12,7 +12,7 @@ followlocation
 <data>
 HTTP/1.1 301 This is a weirdo text message
 Server: test-server/fake
-Location: data/reply/25
+Location: data/reply/%TESTNUMBER
 Content-Length: 32
 Connection: close
 
@@ -21,37 +21,37 @@ Redirect to the same URL again!
 <datacheck>
 HTTP/1.1 301 This is a weirdo text message
 Server: test-server/fake
-Location: data/reply/25
+Location: data/reply/%TESTNUMBER
 Content-Length: 32
 Connection: close
 
 HTTP/1.1 301 This is a weirdo text message
 Server: test-server/fake
-Location: data/reply/25
+Location: data/reply/%TESTNUMBER
 Content-Length: 32
 Connection: close
 
 HTTP/1.1 301 This is a weirdo text message
 Server: test-server/fake
-Location: data/reply/25
+Location: data/reply/%TESTNUMBER
 Content-Length: 32
 Connection: close
 
 HTTP/1.1 301 This is a weirdo text message
 Server: test-server/fake
-Location: data/reply/25
+Location: data/reply/%TESTNUMBER
 Content-Length: 32
 Connection: close
 
 HTTP/1.1 301 This is a weirdo text message
 Server: test-server/fake
-Location: data/reply/25
+Location: data/reply/%TESTNUMBER
 Content-Length: 32
 Connection: close
 
 HTTP/1.1 301 This is a weirdo text message
 Server: test-server/fake
-Location: data/reply/25
+Location: data/reply/%TESTNUMBER
 Content-Length: 32
 Connection: close
 
@@ -67,39 +67,39 @@ http
 looping HTTP Location: following with --max-redirs
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/25 -L --max-redirs 5
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L --max-redirs 5
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/25 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /want/data/reply/25 HTTP/1.1\r
+GET /want/data/reply/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /want/data/reply/data/reply/25 HTTP/1.1\r
+GET /want/data/reply/data/reply/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /want/data/reply/data/reply/data/reply/25 HTTP/1.1\r
+GET /want/data/reply/data/reply/data/reply/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /want/data/reply/data/reply/data/reply/data/reply/25 HTTP/1.1\r
+GET /want/data/reply/data/reply/data/reply/data/reply/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /want/data/reply/data/reply/data/reply/data/reply/data/reply/25 HTTP/1.1\r
+GET /want/data/reply/data/reply/data/reply/data/reply/data/reply/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index e873d579cd5e703bb419cbe5b40754bcb57353c8..6816bb768d2f37753715f29b7a73c5c1ab68656e 100644 (file)
@@ -29,9 +29,9 @@ http
 HTTP resume request over proxy with auth without server supporting it
  </name>
  <command option="no-output">
--x http://%HOSTIP:%HTTPPORT http://%HOSTIP:%HTTPPORT/want/256 -C - --no-include -o log/fewl256.txt -U daniel:stenberg
+-x http://%HOSTIP:%HTTPPORT http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -C - --no-include -o log/fewl%TESTNUMBER.txt -U daniel:stenberg
 </command>
-<file name="log/fewl256.txt">
+<file name="log/fewl%TESTNUMBER.txt">
 This text is here to simulate a partly downloaded file to resume
 download on.
 </file>
@@ -46,7 +46,7 @@ proxy
 33
 </errorcode>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/want/256 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Proxy-Authorization: Basic ZGFuaWVsOnN0ZW5iZXJn\r
 Range: bytes=78-\r
@@ -57,7 +57,7 @@ Proxy-Connection: Keep-Alive
 </protocol>
 
 # the download target file must remain untouched
-<file name="log/fewl256.txt">
+<file name="log/fewl%TESTNUMBER.txt">
 This text is here to simulate a partly downloaded file to resume
 download on.
 </file>
index 18320bfcb63cd69e2d26315161e024afbe192fa3..701abb777de7404e0adbb0b5dc4972c041a14d32 100644 (file)
@@ -16,7 +16,7 @@ netrc
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: http://anotherone.com/2570002
+Location: http://anotherone.com/%TESTNUMBER0002
 Connection: close
 
 This server reply is for testing a simple Location: following
@@ -26,7 +26,7 @@ This server reply is for testing a simple Location: following
 HTTP/1.1 302 Followed here fine swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: http://athird.com/2570003
+Location: http://athird.com/%TESTNUMBER0003
 
 If this is received, the location following worked
 
@@ -44,13 +44,13 @@ If this is received, the location following worked
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: http://anotherone.com/2570002
+Location: http://anotherone.com/%TESTNUMBER0002
 Connection: close
 
 HTTP/1.1 302 Followed here fine swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: http://athird.com/2570003
+Location: http://athird.com/%TESTNUMBER0003
 
 HTTP/1.1 200 Followed here fine swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -71,13 +71,13 @@ http
 HTTP Location: following with --netrc-optional
  </name>
  <command>
-http://supersite.com/want/257 -L -x http://%HOSTIP:%HTTPPORT --netrc-optional --netrc-file log/netrc257
+http://supersite.com/want/%TESTNUMBER -L -x http://%HOSTIP:%HTTPPORT --netrc-optional --netrc-file log/netrc%TESTNUMBER
 </command>
 <features>
 proxy
 </features>
 # netrc auth for two out of three sites:
-<file name="log/netrc257">
+<file name="log/netrc%TESTNUMBER">
 machine supersite.com login user1 password passwd1
 machine anotherone.com login user2 password passwd2
 </file>
@@ -86,21 +86,21 @@ machine anotherone.com login user2 password passwd2
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://supersite.com/want/257 HTTP/1.1\r
+GET http://supersite.com/want/%TESTNUMBER HTTP/1.1\r
 Host: supersite.com\r
 Authorization: Basic dXNlcjE6cGFzc3dkMQ==\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://anotherone.com/2570002 HTTP/1.1\r
+GET http://anotherone.com/%TESTNUMBER0002 HTTP/1.1\r
 Host: anotherone.com\r
 Authorization: Basic dXNlcjI6cGFzc3dkMg==\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://athird.com/2570003 HTTP/1.1\r
+GET http://athird.com/%TESTNUMBER0003 HTTP/1.1\r
 Host: athird.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index e0cd02ef5cadf0b28b39bacef6cb0817af14ca81..c0f8c18c76b685dd9a2a7658a31f5a502295ab02 100644 (file)
@@ -64,10 +64,10 @@ proxy
 HTTP POST multipart without Expect: header using proxy anyauth (Digest)
  </name>
  <command>
--x http://%HOSTIP:%HTTPPORT http://remotehost:54321/we/want/258 -F name=daniel -F tool=curl -F file=@log/test258.txt -H "Expect:" -U uuuser:pppassword --proxy-anyauth
+-x http://%HOSTIP:%HTTPPORT http://remotehost:54321/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@log/test%TESTNUMBER.txt -H "Expect:" -U uuuser:pppassword --proxy-anyauth
 </command>
 # We create this file before the command is invoked!
-<file name="log/test258.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo-
 This is a moo-
 bar
@@ -80,7 +80,7 @@ bar
 ^(Content-Type: multipart/form-data;|------).*
 </strip>
 <protocol>
-POST http://remotehost:54321/we/want/258 HTTP/1.1\r
+POST http://remotehost:54321/we/want/%TESTNUMBER HTTP/1.1\r
 Host: remotehost:54321\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -97,7 +97,7 @@ Content-Disposition: form-data; name="tool"
 \r
 curl\r
 ------------------------------7c633d5c27ce\r
-Content-Disposition: form-data; name="file"; filename="test258.txt"\r
+Content-Disposition: form-data; name="file"; filename="test%TESTNUMBER.txt"\r
 Content-Type: text/plain\r
 \r
 foo-
@@ -105,9 +105,9 @@ This is a moo-
 bar
 \r
 ------------------------------7c633d5c27ce--\r
-POST http://remotehost:54321/we/want/258 HTTP/1.1\r
+POST http://remotehost:54321/we/want/%TESTNUMBER HTTP/1.1\r
 Host: remotehost:54321\r
-Proxy-Authorization: Digest username="uuuser", realm="many secrets", nonce="911", uri="/we/want/258", response="2501654ca391f0b5c8c12a1da77e34cd"\r
+Proxy-Authorization: Digest username="uuuser", realm="many secrets", nonce="911", uri="/we/want/%TESTNUMBER", response="2501654ca391f0b5c8c12a1da77e34cd"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
@@ -123,7 +123,7 @@ Content-Disposition: form-data; name="tool"
 \r
 curl\r
 ------------------------------7c633d5c27ce\r
-Content-Disposition: form-data; name="file"; filename="test258.txt"\r
+Content-Disposition: form-data; name="file"; filename="test%TESTNUMBER.txt"\r
 Content-Type: text/plain\r
 \r
 foo-
index 08f6f14602dae738ae964ee070e5f8afba108d5e..4b5deee1822e13f2c6bbc58b7b67043a849f7f58 100644 (file)
@@ -60,10 +60,10 @@ proxy
 HTTP POST multipart with Expect: header using proxy anyauth (Digest)
  </name>
  <command>
--x http://%HOSTIP:%HTTPPORT http://remotehost:54321/we/want/259 -F name=daniel -F tool=curl -F file=@log/test259.txt -U uuuser:pppassword --proxy-anyauth -H "Expect: 100-continue"
+-x http://%HOSTIP:%HTTPPORT http://remotehost:54321/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@log/test%TESTNUMBER.txt -U uuuser:pppassword --proxy-anyauth -H "Expect: 100-continue"
 </command>
 # We create this file before the command is invoked!
-<file name="log/test259.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo-
 This is a moo-
 bar
@@ -76,7 +76,7 @@ bar
 ^(Content-Type: multipart/form-data;|------).*
 </strip>
 <protocol>
-POST http://remotehost:54321/we/want/259 HTTP/1.1\r
+POST http://remotehost:54321/we/want/%TESTNUMBER HTTP/1.1\r
 Host: remotehost:54321\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -94,7 +94,7 @@ Content-Disposition: form-data; name="tool"
 \r
 curl\r
 ------------------------------7c633d5c27ce\r
-Content-Disposition: form-data; name="file"; filename="test259.txt"\r
+Content-Disposition: form-data; name="file"; filename="test%TESTNUMBER.txt"\r
 Content-Type: text/plain\r
 \r
 foo-
@@ -102,9 +102,9 @@ This is a moo-
 bar
 \r
 ------------------------------7c633d5c27ce--\r
-POST http://remotehost:54321/we/want/259 HTTP/1.1\r
+POST http://remotehost:54321/we/want/%TESTNUMBER HTTP/1.1\r
 Host: remotehost:54321\r
-Proxy-Authorization: Digest username="uuuser", realm="many secrets", nonce="911", uri="/we/want/259", response="b479994d13e60f3aa192a67c5892ddc5"\r
+Proxy-Authorization: Digest username="uuuser", realm="many secrets", nonce="911", uri="/we/want/%TESTNUMBER", response="b479994d13e60f3aa192a67c5892ddc5"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
@@ -121,7 +121,7 @@ Content-Disposition: form-data; name="tool"
 \r
 curl\r
 ------------------------------7c633d5c27ce\r
-Content-Disposition: form-data; name="file"; filename="test259.txt"\r
+Content-Disposition: form-data; name="file"; filename="test%TESTNUMBER.txt"\r
 Content-Type: text/plain\r
 \r
 foo-
index 073fed3d36147e9a6cd55b887102d72a98e9d725..cd8ba426cc8d7b002c8ecbbe9f2c87083d9625fb 100644 (file)
@@ -25,14 +25,14 @@ http
 specify more -o than URLs
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/26 -o - -o -
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -o - -o -
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/26 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index bdb01d2ccb9704b0b6abd18e1c12f33c92b704d4..b706e60b5f490a6b19829d1648bf43fbb90befc8 100644 (file)
@@ -35,7 +35,7 @@ http
 HTTP GET URL without slash but with questionmark
  </name>
  <command>
-"http://%HOSTIP:%HTTPPORT?260"
+"http://%HOSTIP:%HTTPPORT?%TESTNUMBER"
 </command>
 </client>
 
@@ -43,7 +43,7 @@ HTTP GET URL without slash but with questionmark
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /?260 HTTP/1.1\r
+GET /?%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index e3639bfe93d5215a1a0624ccb1576d587fd3a9e3..8a68ba9cd6e6fe059ac91aa46084070ac87bff60 100644 (file)
@@ -27,7 +27,7 @@ ftp
 FTP RETR with 226 response code to TYPE
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/261
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -40,8 +40,8 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 261\r
-RETR 261\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 3c60cece007b67b122de2f4f94a8c1ab457f3833..1e03f2772a591a8d919855753bfe5e6583ecd5b6 100644 (file)
Binary files a/tests/data/test262 and b/tests/data/test262 differ
index a6d6ee05514ed5ca543f0ca6660ade46539ecce2..7a2bff9ecd10d61d9a39c36dd88e5eaf1d61e99e 100644 (file)
@@ -34,7 +34,7 @@ http-ipv6
 HTTP-IPv6 GET with proxy specified using IPv6-numerical address
  </name>
  <command>
--g -x "http://%HOST6IP:%HTTP6PORT" http://veryveryremotesite.com/263
+-g -x "http://%HOST6IP:%HTTP6PORT" http://veryveryremotesite.com/%TESTNUMBER
 </command>
 </client>
 
@@ -42,7 +42,7 @@ HTTP-IPv6 GET with proxy specified using IPv6-numerical address
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://veryveryremotesite.com/263 HTTP/1.1\r
+GET http://veryveryremotesite.com/%TESTNUMBER HTTP/1.1\r
 Host: veryveryremotesite.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 7ca52e6d309bfc8cdd39fe34561f74768a88d544..c4c3652998443d4b703b9d898684a3e9ee3e76f3 100644 (file)
@@ -28,7 +28,7 @@ http
 HTTP with proxy string including http:// and user+password
  </name>
  <command>
-http://we.want.that.site.com/264 -x http://f%61ke:user@%HOSTIP:%HTTPPORT
+http://we.want.that.site.com/%TESTNUMBER -x http://f%61ke:user@%HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -38,7 +38,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://we.want.that.site.com/264 HTTP/1.1\r
+GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1\r
 Host: we.want.that.site.com\r
 Proxy-Authorization: Basic ZmFrZTp1c2Vy\r
 User-Agent: curl/%VERSION\r
index 7a2a5e37b0d8eea60e18d46492fe8f6321d9faf7..095058af1a04d3794a3918870050497c482505f6 100644 (file)
@@ -93,7 +93,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://test.remote.example.com.265:%HTTPPORT/path/2650002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-ntlm --proxytunnel -d "postit"
+http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-ntlm --proxytunnel -d "postit"
 </command>
 <precheck>
 chkhostname curlhost
@@ -103,20 +103,20 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-CONNECT test.remote.example.com.265:%HTTPPORT HTTP/1.1\r
-Host: test.remote.example.com.265:%HTTPPORT\r
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
-CONNECT test.remote.example.com.265:%HTTPPORT HTTP/1.1\r
-Host: test.remote.example.com.265:%HTTPPORT\r
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
-POST /path/2650002 HTTP/1.1\r
-Host: test.remote.example.com.265:%HTTPPORT\r
+POST /path/%TESTNUMBER0002 HTTP/1.1\r
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 6\r
index 0997ae7b6a9654d52dd06bb1dab7a179f108825f..6b5d2e6c775d3fa7dbc11dcd4881313621b3dd73 100644 (file)
@@ -49,7 +49,7 @@ http
 HTTP GET with chunked Transfer-Encoding and chunked trailer
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/266 -D log/heads266
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D log/heads%TESTNUMBER
 </command>
 </client>
 
@@ -57,13 +57,13 @@ http://%HOSTIP:%HTTPPORT/266 -D log/heads266
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /266 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file name="log/heads266">
+<file name="log/heads%TESTNUMBER">
 HTTP/1.1 200 funky chunky!\r
 Server: fakeit/0.9 fakeitbad/1.0\r
 Transfer-Encoding: chunked\r
index ed10b22a3d27ff3d3955492f0f7c787e7c746ad2..8ad112d41f1f104d45f050a1c60e5caed51df1f3 100644 (file)
@@ -73,7 +73,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/267 -u testuser:testpass --ntlm -d "data" -H "Header1: yes" -H "Header2: no"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm -d "data" -H "Header1: yes" -H "Header2: no"
 </command>
 <precheck>
 chkhostname curlhost
@@ -83,7 +83,7 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /267 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/%VERSION\r
@@ -93,7 +93,7 @@ Header2: no
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-POST /267 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
 User-Agent: curl/%VERSION\r
index 70a5a73dd1924c89af7d50bca4045cedda1a972d..851af4133da8c4b5d2021924eb8a588a68255696 100644 (file)
@@ -35,7 +35,7 @@ http
 HTTP POST a non-existing file
  </name>
  <command>
- -d @nonesuchfile http://%HOSTIP:%HTTPPORT/268
+ -d @nonesuchfile http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -43,7 +43,7 @@ HTTP POST a non-existing file
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST /268 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 1cf2698c1e526b40baab39c109b53b6e32ea7f27..448d5fbeb03e724e8e6e68e0a89ba60e139100e2 100644 (file)
@@ -33,7 +33,7 @@ http
 HTTP --ignore-content-length
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/269 --ignore-content-length
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --ignore-content-length
 </command>
 </client>
 
@@ -41,7 +41,7 @@ http://%HOSTIP:%HTTPPORT/269 --ignore-content-length
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /269 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 54b4f8a6233d2058815acdcdf3f4164c0db44f95..414741363a4e5753d10acf585d4f6ecbf7736392 100644 (file)
@@ -27,25 +27,25 @@ http
 Get same cookie page several times
  </name>
  <command>
-"http://%HOSTIP:%HTTPPORT/want/{27,27,27}" -b none
+"http://%HOSTIP:%HTTPPORT/want/{%TESTNUMBER,%TESTNUMBER,%TESTNUMBER}" -b none
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/27 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /want/27 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Cookie: thewinneris=nowayyouwin\r
 \r
-GET /want/27 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index f4eea970e3a9f2c1c3dd05aa8e70c9e1ed87b885..983e0d2b7f2bcb38c153200b3c6cde60d39b2362 100644 (file)
@@ -30,7 +30,7 @@ ftp
 FTP RETR PASV --ftp-skip-pasv-ip
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/270 --ftp-skip-pasv-ip --disable-epsv
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-skip-pasv-ip --disable-epsv
 </command>
 </client>
 
@@ -42,8 +42,8 @@ PASS ftp@example.com
 PWD\r
 PASV\r
 TYPE I\r
-SIZE 270\r
-RETR 270\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 1557fd0f7a8eb09c36938256def3ccc4d0ed2853..a9a44360fc8dea3e6b70a56b20cfd8887c4cb6e4 100644 (file)
@@ -27,7 +27,7 @@ tftp
 TFTP retrieve
  </name>
  <command>
-tftp://%HOSTIP:%TFTPPORT//271
+tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER
 </command>
 </client>
 
@@ -40,7 +40,7 @@ mode: octet
 tsize: 0
 blksize: 512
 timeout: 6
-filename: /271
+filename: /%TESTNUMBER
 </protocol>
 </verify>
 </testcase>
index f728a2a8c813ce59db855936df8f19ed0681d957..c959ff3aea89005cb80665a8bea32697edba44a1 100644 (file)
@@ -22,7 +22,7 @@ ftp
 FTP timed conditioned get file with identical time stamp 
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/272 -z "2004 jan 1 12:12:12 UTC"
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -z "2004 jan 1 12:12:12 UTC"
 </command>
 
 </client>
@@ -33,7 +33,7 @@ ftp://%HOSTIP:%FTPPORT/272 -z "2004 jan 1 12:12:12 UTC"
 USER anonymous\r
 PASS ftp@example.com\r
 PWD\r
-MDTM 272\r
+MDTM %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 45c293512e24e4aa8a5d391e81ab23e1db7cbac1..b2b023a60706a8854cf829008f0fb9670d196793 100644 (file)
@@ -59,21 +59,21 @@ crypto
 HTTP with two Digest authorization headers
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/273 -u testuser:testpass --digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /273 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /273 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/273", response="576ae57b1db0039f8c0de43ef58e49e3"\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="576ae57b1db0039f8c0de43ef58e49e3"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index dd1b816de192f44d919b2fd16527c79ba9af596f..b0f74b49442ef7de883e6c67cd64c7563dac593d 100644 (file)
@@ -28,14 +28,14 @@ http
 HTTP Location: following with --max-redirs 0
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/274 -L --max-redirs 0
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L --max-redirs 0
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/274 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 5db3ec1ce6c000db41a4a3f944bcf1c0cc371799..c6b6b566e681f5092bd7398e071d951530412785 100644 (file)
@@ -54,7 +54,7 @@ http-proxy
 HTTP CONNECT with proxytunnel getting two URLs from the same host
  </name>
  <command>
-http://remotesite.com.275:%HTTPPORT/we/want/that/page/275 -p -x %HOSTIP:%PROXYPORT --user iam:myself --proxy-user youare:yourself http://remotesite.com.275:%HTTPPORT/we/want/that/page/275
+http://remotesite.com.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -p -x %HOSTIP:%PROXYPORT --user iam:myself --proxy-user youare:yourself http://remotesite.com.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER
 </command>
 <features>
 proxy
@@ -65,22 +65,22 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT remotesite.com.275:%HTTPPORT HTTP/1.1\r
-Host: remotesite.com.275:%HTTPPORT\r
+CONNECT remotesite.com.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
+Host: remotesite.com.%TESTNUMBER:%HTTPPORT\r
 Proxy-Authorization: Basic eW91YXJlOnlvdXJzZWxm\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>
-GET /we/want/that/page/275 HTTP/1.1\r
-Host: remotesite.com.275:%HTTPPORT\r
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1\r
+Host: remotesite.com.%TESTNUMBER:%HTTPPORT\r
 Authorization: Basic aWFtOm15c2VsZg==\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /we/want/that/page/275 HTTP/1.1\r
-Host: remotesite.com.275:%HTTPPORT\r
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1\r
+Host: remotesite.com.%TESTNUMBER:%HTTPPORT\r
 Authorization: Basic aWFtOm15c2VsZg==\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index bd7fdc89a853d17cf101c0001be6bef61f218c24..07a1aaed171bd1b4d4ee9caf08f9a98dccb494bd 100644 (file)
@@ -12,7 +12,7 @@ followlocation
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: data/2760002.txt?coolsite=http://anotherurl/?a_second/2760002
+Location: data/%TESTNUMBER0002.txt?coolsite=http://anotherurl/?a_second/%TESTNUMBER0002
 Connection: close
 
 This server reply is for testing a simple Location: following
@@ -31,7 +31,7 @@ If this is received, the location following worked
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: data/2760002.txt?coolsite=http://anotherurl/?a_second/2760002
+Location: data/%TESTNUMBER0002.txt?coolsite=http://anotherurl/?a_second/%TESTNUMBER0002
 Connection: close
 
 HTTP/1.1 200 Followed here fine swsclose
@@ -53,19 +53,19 @@ http
 HTTP Location: following with multiple question marks in URLs
  </name>
  <command>
-"http://%HOSTIP:%HTTPPORT/want?uri=http://anything/276?secondq/276" -L
+"http://%HOSTIP:%HTTPPORT/want?uri=http://anything/%TESTNUMBER?secondq/%TESTNUMBER" -L
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want?uri=http://anything/276?secondq/276 HTTP/1.1\r
+GET /want?uri=http://anything/%TESTNUMBER?secondq/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /data/2760002.txt?coolsite=http://anotherurl/?a_second/2760002 HTTP/1.1\r
+GET /data/%TESTNUMBER0002.txt?coolsite=http://anotherurl/?a_second/%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index a2a00ead7273175997bf1505e68211b82f6d2dbf..466b793741dcd7866f4d02311f2afb4c9d82855c 100644 (file)
@@ -27,7 +27,7 @@ http
 HTTP RFC1867-type formposting with custom Content-Type
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/277 -F name=daniel -H "Content-Type: text/info"
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -F name=daniel -H "Content-Type: text/info"
 </command>
 </client>
 
@@ -38,7 +38,7 @@ s/^--------------------------[a-z0-9]*/--------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=------------------------/
 </strippart>
 <protocol>
-POST /want/277 HTTP/1.1\r
+POST /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 575edf14dd6235c5ab9cedf31c604cfe78e88537..7cbd4704b18d267280b7d9941d47842b36e83bbb 100644 (file)
@@ -28,7 +28,7 @@ http
 HTTP with proxy string including http:// and user+empty password
  </name>
  <command>
-http://we.want.that.site.com/278 -x http://f%61ke:@%HOSTIP:%HTTPPORT
+http://we.want.that.site.com/%TESTNUMBER -x http://f%61ke:@%HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -38,7 +38,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://we.want.that.site.com/278 HTTP/1.1\r
+GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1\r
 Host: we.want.that.site.com\r
 Proxy-Authorization: Basic ZmFrZTo=\r
 User-Agent: curl/%VERSION\r
index 82ce2524444462f1f27c9ee3ef0d356ae3582216..cc919224d50a1e8f37a0acb021ef8260dfd86cc2 100644 (file)
@@ -29,7 +29,7 @@ http
 HTTP with proxy string including http:// and user only
  </name>
  <command>
-http://we.want.that.site.com/279 -x http://f%61ke@%HOSTIP:%HTTPPORT
+http://we.want.that.site.com/%TESTNUMBER -x http://f%61ke@%HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -39,7 +39,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://we.want.that.site.com/279 HTTP/1.1\r
+GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1\r
 Host: we.want.that.site.com\r
 Proxy-Authorization: Basic ZmFrZTo=\r
 User-Agent: curl/%VERSION\r
index 8d26bc9a4993102bd1998ae3c33fa5ba006219e5..1966cc86304e4063b9c68e2393a8ee186046fda2 100644 (file)
@@ -11,7 +11,7 @@ HTTP GET
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location:  /online/1,1795,Welcome,00.html/280002.txt?logout=TRUE
+Location:  /online/1,1795,Welcome,00.html/%TESTNUMBER0002.txt?logout=TRUE
 Connection: close
 
 This server reply is for testing a simple Location: following
@@ -31,9 +31,9 @@ HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 %if hyper
-Location: /online/1,1795,Welcome,00.html/280002.txt?logout=TRUE
+Location: /online/1,1795,Welcome,00.html/%TESTNUMBER0002.txt?logout=TRUE
 %else
-Location:  /online/1,1795,Welcome,00.html/280002.txt?logout=TRUE
+Location:  /online/1,1795,Welcome,00.html/%TESTNUMBER0002.txt?logout=TRUE
 %endif
 Connection: close
 
@@ -56,19 +56,19 @@ http
 HTTP Location: following with extra spaces in header
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/28 -L
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/28 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /online/1,1795,Welcome,00.html/280002.txt?logout=TRUE HTTP/1.1\r
+GET /online/1,1795,Welcome,00.html/%TESTNUMBER0002.txt?logout=TRUE HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index de7534e7b275550952fc5c082bd57ce2bd7fa42a..71c147ce46ef9fdcf220fc1d77d125551a19cc0e 100644 (file)
@@ -41,7 +41,7 @@ ftp
 FTP --ftp-alternative-to-user on USER failure
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/280/ --ftp-alternative-to-user "USER replacement"
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ --ftp-alternative-to-user "USER replacement"
 </command>
 </client>
 
@@ -53,7 +53,7 @@ USER anonymous
 USER replacement\r
 PASS ftp@example.com\r
 PWD\r
-CWD 280\r
+CWD %TESTNUMBER\r
 EPSV\r
 TYPE A\r
 LIST\r
index a5ea8760a21d00790265dab5e005e255b7f7864b..4210f7b8f04c6ceb6c79857bb118f36713a64882 100644 (file)
@@ -28,9 +28,9 @@ http
 HTTP PUT from file with 100 + 401 responses and -f without auth given
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/281 -f -T log/test281.txt
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -f -T log/test%TESTNUMBER.txt
 </command>
-<file name="log/test281.txt">
+<file name="log/test%TESTNUMBER.txt">
 Weird
      file
          to
@@ -44,7 +44,7 @@ Weird
 22
 </errorcode>
 <protocol>
-PUT /we/want/281 HTTP/1.1\r
+PUT /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 578c102a54fa884e214cbd2b54c52242e803fa4b..4fb9e598e574f7521a7782dde2c25eb3b22dbd99 100644 (file)
@@ -25,7 +25,7 @@ http
 HTTP GET with no response body or headers
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/282
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -33,7 +33,7 @@ http://%HOSTIP:%HTTPPORT/282
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /282 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 9b946ecd5d06b8b2fb825779e28657831a1f9a5d..bee74f4c7cb945951eab3372f7975b7c2f326349 100644 (file)
@@ -51,7 +51,7 @@ tftp
 TFTP retrieve of boundary case 512 byte file
  </name>
  <command>
-tftp://%HOSTIP:%TFTPPORT//284
+tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER
 </command>
 </client>
 
@@ -64,7 +64,7 @@ mode: octet
 tsize: 0
 blksize: 512
 timeout: 6
-filename: /284
+filename: /%TESTNUMBER
 </protocol>
 </verify>
 </testcase>
index 09bfe3195cf089bb307bb5ca0484fa2020259aeb..23fe66ef1af88a236e8260fe371e64541879810c 100644 (file)
@@ -16,9 +16,9 @@ tftp
 TFTP send
  </name>
  <command>
--T log/test285.txt tftp://%HOSTIP:%TFTPPORT//
+-T log/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//
 </command>
-<file name="log/test285.txt">
+<file name="log/test%TESTNUMBER.txt">
 a chunk of
 data
 sent
@@ -41,7 +41,7 @@ mode: octet
 tsize: 32
 blksize: 512
 timeout: 6
-filename: /test285.txt
+filename: /test%TESTNUMBER.txt
 </protocol>
 </verify>
 </testcase>
index 505352a767827fb20825aec5164b297c03c07277..3fa774bd3dee217edb85db796ac1682bc2bafae6 100644 (file)
@@ -16,9 +16,9 @@ tftp
 TFTP send of boundary case 512 byte file
  </name>
  <command>
--T log/test286.txt tftp://%HOSTIP:%TFTPPORT//
+-T log/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//
 </command>
-<file name="log/test286.txt">
+<file name="log/test%TESTNUMBER.txt">
 A chunk of data which exactly fits into
 a 512 byte TFTP block, testing a boundary
 condition in the TFTP transmit code.
@@ -89,7 +89,7 @@ mode: octet
 tsize: 512
 blksize: 512
 timeout: 6
-filename: /test286.txt
+filename: /test%TESTNUMBER.txt
 </protocol>
 </verify>
 </testcase>
index 7c29f7f024ed2e71826867741168fee0fa53c8e9..71ab8d527d6c3720d84887f9a03fd80bc3d5c001 100644 (file)
@@ -28,7 +28,7 @@ http
 HTTP proxy CONNECT with custom User-Agent header
  </name>
  <command>
-http://test.remote.example.com.287:%HTTPPORT/path/287 -H "User-Agent: looser/2015" --proxy http://%HOSTIP:%HTTPPORT --proxytunnel --proxy-header "User-Agent: looser/2007"
+http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER -H "User-Agent: looser/2015" --proxy http://%HOSTIP:%HTTPPORT --proxytunnel --proxy-header "User-Agent: looser/2007"
 </command>
 <features>
 proxy
@@ -38,8 +38,8 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-CONNECT test.remote.example.com.287:%HTTPPORT HTTP/1.1\r
-Host: test.remote.example.com.287:%HTTPPORT\r
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
 Proxy-Connection: Keep-Alive\r
 User-Agent: looser/2007\r
 \r
index 26e1b842a83c55da09f1f02db12695fcc6781e32..6ee19d41dfd6116da5e2365f9fa1c209ff380961 100644 (file)
@@ -31,9 +31,9 @@ file:// with (unsupported) proxy, authentication and range
 all_proxy=http://fake:user@%HOSTIP:%NOLISTENPORT/
 </setenv>
 <command option="no-include">
-file://localhost%FILE_PWD/log/test288.txt
+file://localhost%FILE_PWD/log/test%TESTNUMBER.txt
 </command>
-<file name="log/test288.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo
    bar
 bar
index 2720e2e9c5875e13f0a58c0db4d7c92bea7c1f0a..481eacf819d86ba668e926be998990b7f2c609bb 100644 (file)
@@ -17,7 +17,7 @@ ftp
 FTP resume upload but denied access to local file
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/289 -T log/illegal-nonexistent-file -C -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/illegal-nonexistent-file -C -
 </command>
 </client>
 
index 298e76a8dca89e5d5987bb23847b6a76ea0edab6..bb9916e83b5589960983233cb97d7f7ae2132e90 100644 (file)
@@ -30,14 +30,14 @@ http
 HTTP with 2 secs timeout
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/29 -m 2
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -m 2
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/29 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 6078a2ac7d62a1baf735eacd11f483589e07125b..9e59311523c7daa00de10d07bdfcfa641a8d80fb 100644 (file)
@@ -21,7 +21,7 @@ ftp
 FTP download maximum filesize exceeded
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/290 --max-filesize 30
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --max-filesize 30
 </command>
 </client>
 
@@ -36,7 +36,7 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 290\r
+SIZE %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 18e039e4fbb1a4535e2449eabf39bffef5a3b6e1..45f041e2e41e554b3d17a79d2f121f0b76fb9fa8 100644 (file)
@@ -27,7 +27,7 @@ ftp
 FTP download maximum filesize not exceeded
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/291 --max-filesize 100
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --max-filesize 100
 </command>
 </client>
 
@@ -39,8 +39,8 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 291\r
-RETR 291\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index f32c5b6b1b71165d66a160ee0a224472f23162da..91e2d66705321d47af87688bdda7f152120dab01 100644 (file)
@@ -36,7 +36,7 @@ http
 HTTP GET with maximum filesize not exceeded
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/292 --max-filesize 1000
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 1000
 </command>
 </client>
 
@@ -44,7 +44,7 @@ http://%HOSTIP:%HTTPPORT/292 --max-filesize 1000
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /292 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 8c569281e70c5fc17520a15a8d4db364afa28acd..aaeefc45791f54ac5e7a7802cbd6c153c7cc163e 100644 (file)
@@ -37,7 +37,7 @@ http
 HTTP GET with maximum filesize exceeded
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/293 --max-filesize 2
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 2
 </command>
 </client>
 
@@ -48,7 +48,7 @@ http://%HOSTIP:%HTTPPORT/293 --max-filesize 2
 63
 </errorcode>
 <protocol>
-GET /293 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index a9752a278ec41c4983f280236c6b36098c26fd08..4dc90e368304b7d2dfa029ae93426797c98712d1 100644 (file)
@@ -42,7 +42,7 @@ ftp
 FTP --ftp-account on ACCT request
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/294/ --ftp-account "data for acct"
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ --ftp-account "data for acct"
 </command>
 </client>
 
@@ -54,7 +54,7 @@ USER anonymous
 PASS ftp@example.com\r
 ACCT data for acct\r
 PWD\r
-CWD 294\r
+CWD %TESTNUMBER\r
 EPSV\r
 TYPE A\r
 LIST\r
index 5b1ddcf6b2ab5709513c424b1d49ad537f968498..206c1ab744a8f4ac63315bf0884f79f8e1356781 100644 (file)
@@ -27,7 +27,7 @@ ftp
 FTP ACCT request without --ftp-account
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/295/
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/
 </command>
 </client>
 
index 2008c8bfd82654940ea0ad359052e65ddd7e0487..3c36a160896ea02b45a1eac73e8fa4d9b7f11440 100644 (file)
@@ -25,7 +25,7 @@ ftp
 FTP CWD with --ftp-method multicwd
  </name>
  <command>
---ftp-method multicwd ftp://%HOSTIP:%FTPPORT/first/second/third/296
+--ftp-method multicwd ftp://%HOSTIP:%FTPPORT/first/second/third/%TESTNUMBER
 </command>
 </client>
 
@@ -40,8 +40,8 @@ CWD second
 CWD third\r
 EPSV\r
 TYPE I\r
-SIZE 296\r
-RETR 296\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 36573f8b91b74db93b3642afe7047dcf5b6c5bed..e4cdd856c5ec872faa9c04da2e6602029c42cdbf 100644 (file)
@@ -25,7 +25,7 @@ ftp
 FTP CWD with --ftp-method singlecwd
  </name>
  <command>
---ftp-method singlecwd ftp://%HOSTIP:%FTPPORT/first/second/third/297
+--ftp-method singlecwd ftp://%HOSTIP:%FTPPORT/first/second/third/%TESTNUMBER
 </command>
 </client>
 
@@ -38,8 +38,8 @@ PWD
 CWD first/second/third\r
 EPSV\r
 TYPE I\r
-SIZE 297\r
-RETR 297\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 09b127fbfdbdbc2c4bef5b872de6ac32ef835822..20c8eccf27639ac8bba35434977757c418953473 100644 (file)
@@ -25,7 +25,7 @@ ftp
 FTP CWD with --ftp-method nocwd
  </name>
  <command>
---ftp-method nocwd ftp://%HOSTIP:%FTPPORT/first/second/th%69rd/298
+--ftp-method nocwd ftp://%HOSTIP:%FTPPORT/first/second/th%69rd/%TESTNUMBER
 </command>
 </client>
 
@@ -37,8 +37,8 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE first/second/third/298\r
-RETR first/second/third/298\r
+SIZE first/second/third/%TESTNUMBER\r
+RETR first/second/third/%TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index bc625350ffe7686dcd99874cd3efa82065ece96d..9b3fd0c30e3e6342de9adb1c549f4f5de4bb6bef 100644 (file)
@@ -33,14 +33,14 @@ proxy
 FTP over HTTP proxy with user:pass not in url
  </name>
  <command>
--x http://%HOSTIP:%HTTPPORT -u michal:aybabtu ftp://host.com/we/want/299
+-x http://%HOSTIP:%HTTPPORT -u michal:aybabtu ftp://host.com/we/want/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET ftp://michal:aybabtu@host.com/we/want/299 HTTP/1.1\r
+GET ftp://michal:aybabtu@host.com/we/want/%TESTNUMBER HTTP/1.1\r
 Host: host.com:21\r
 Authorization: Basic bWljaGFsOmF5YmFidHU=\r
 User-Agent: curl/%VERSION\r
index 0dc3b4618a2f70d9fb9e0565a4e0b44b88ad66cf..f28d0ccd434b83a168f291cda392bf628d536952 100644 (file)
@@ -36,7 +36,7 @@ http
 HTTP POST with auth and contents but with content-length set to 0
  </name>
  <command>
- -d "fooo=mooo&pooo=clue&doo=%20%20%20++++" -u "fake:-user" http://%HOSTIP:%HTTPPORT/3
+ -d "fooo=mooo&pooo=clue&doo=%20%20%20++++" -u "fake:-user" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -44,7 +44,7 @@ HTTP POST with auth and contents but with content-length set to 0
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /3 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic ZmFrZTotdXNlcg==\r
 User-Agent: curl/%VERSION\r
index ab4425db5906ba7591cc61c56477d6374526a64c..2a84b4c36c3f820dcb257782991e7954807d9100 100644 (file)
@@ -21,14 +21,14 @@ http
 HTTP with no data in server reply
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/30
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/30 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index e3bf8adb9eaa550b59e158dd5e184bdfb3167667..efbf97fe3775bac9337bf9ccfc464cfde8f5cfef 100644 (file)
@@ -32,7 +32,7 @@ https
 simple HTTPS GET
  </name>
  <command>
--k https://%HOSTIP:%HTTPSPORT/300
+-k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -40,7 +40,7 @@ simple HTTPS GET
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /300 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPSPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 9d237514e29c1ed20c6a931704c02d8a712440e1..db5299e5f04a968458fc74d4a7a8d7cbae0f09e4 100644 (file)
@@ -33,7 +33,7 @@ https Server-localhost-firstSAN-sv.pem
 HTTPS GET to localhost, first subject alt name matches, CN does not match
 </name>
 <command>
---cacert %SRCDIR/certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/3000
+--cacert %SRCDIR/certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name
 <precheck>
@@ -45,7 +45,7 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /3000 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: localhost:%HTTPSPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 7ef9034d9bc787acc07a8ebc1a98903fb0350e83..534a5cded4be1df7655e0c3ee7a40f146850ac6e 100644 (file)
@@ -33,7 +33,7 @@ https Server-localhost-lastSAN-sv.pem
 HTTPS GET to localhost, last subject alt name matches, CN does not match
 </name>
 <command>
---cacert %SRCDIR/certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/3001
+--cacert %SRCDIR/certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name
 <precheck>
@@ -45,7 +45,7 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /3001 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: localhost:%HTTPSPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index ac6820214431b45e800e272f5acdf5dcec48dd25..b6c94ec3ce210bf77827fed1ed3da3709cd9a63b 100644 (file)
@@ -26,7 +26,7 @@ To: another
 body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/3002 --mail-rcpt-allowfails --mail-rcpt invalid.one --mail-rcpt recipient.two@example.com --mail-rcpt recipient.three@example.com --mail-rcpt recipient.four@example.com --mail-rcpt recipient.five@example.com --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt invalid.one --mail-rcpt recipient.two@example.com --mail-rcpt recipient.three@example.com --mail-rcpt recipient.four@example.com --mail-rcpt recipient.five@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -34,7 +34,7 @@ smtp://%HOSTIP:%SMTPPORT/3002 --mail-rcpt-allowfails --mail-rcpt invalid.one --m
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 3002\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<invalid.one>\r
 RCPT TO:<recipient.two@example.com>\r
index 7515affbc12a36d3b65478fc6e828e92d93d4843..23e86c05ecbfc7982d822f9ceafda52fc8503b70 100644 (file)
@@ -26,7 +26,7 @@ To: another
 body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/3003 --mail-rcpt-allowfails --mail-rcpt recipient.one@example.com --mail-rcpt recipient.two@example.com --mail-rcpt recipient.three@example.com --mail-rcpt recipient.four@example.com --mail-rcpt invalid.five --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt recipient.one@example.com --mail-rcpt recipient.two@example.com --mail-rcpt recipient.three@example.com --mail-rcpt recipient.four@example.com --mail-rcpt invalid.five --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -34,7 +34,7 @@ smtp://%HOSTIP:%SMTPPORT/3003 --mail-rcpt-allowfails --mail-rcpt recipient.one@e
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 3003\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient.one@example.com>\r
 RCPT TO:<recipient.two@example.com>\r
index e021cde41e0dfcd9025f1c7867db1966c5a9d7d0..1f646eeaba3de64eaa8d4667c3870f69379c718a 100644 (file)
@@ -26,7 +26,7 @@ To: another
 body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/3004 --mail-rcpt-allowfails --mail-rcpt recipient.one@example.com --mail-rcpt recipient.two@example.com --mail-rcpt invalid.three --mail-rcpt recipient.four@example.com --mail-rcpt recipient.five@example.com --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt recipient.one@example.com --mail-rcpt recipient.two@example.com --mail-rcpt invalid.three --mail-rcpt recipient.four@example.com --mail-rcpt recipient.five@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -34,7 +34,7 @@ smtp://%HOSTIP:%SMTPPORT/3004 --mail-rcpt-allowfails --mail-rcpt recipient.one@e
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 3004\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient.one@example.com>\r
 RCPT TO:<recipient.two@example.com>\r
index 256555ac9db48d40b42f4266685d5ddde737a054..ffaa475bd9050569f83afeaa73221c0b0b82accb 100644 (file)
@@ -26,7 +26,7 @@ To: another
 body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/3005 --mail-rcpt-allowfails --mail-rcpt invalid.one --mail-rcpt recipient.two@example.com --mail-rcpt invalid.three --mail-rcpt invalid.four --mail-rcpt invalid.five --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt invalid.one --mail-rcpt recipient.two@example.com --mail-rcpt invalid.three --mail-rcpt invalid.four --mail-rcpt invalid.five --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -34,7 +34,7 @@ smtp://%HOSTIP:%SMTPPORT/3005 --mail-rcpt-allowfails --mail-rcpt invalid.one --m
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 3005\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<invalid.one>\r
 RCPT TO:<recipient.two@example.com>\r
index f54d71c8d22f2c44dac56e85b511aec556e3b3b3..9753d74fc01813eadd6e3708ac39e28fc1c4b1e7 100644 (file)
@@ -26,7 +26,7 @@ To: another
 body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/3006 --mail-rcpt-allowfails --mail-rcpt invalid.one --mail-rcpt invalid.two --mail-rcpt invalid.three --mail-rcpt invalid.four --mail-rcpt invalid.five --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt invalid.one --mail-rcpt invalid.two --mail-rcpt invalid.three --mail-rcpt invalid.four --mail-rcpt invalid.five --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -38,7 +38,7 @@ smtp://%HOSTIP:%SMTPPORT/3006 --mail-rcpt-allowfails --mail-rcpt invalid.one --m
 55
 </errorcode>
 <protocol>
-EHLO 3006\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<invalid.one>\r
 RCPT TO:<invalid.two>\r
index b0d690262946eb9cb9b9136be044433b66968258..74497ed12f09f97214c06419749286a915903c73 100644 (file)
@@ -26,7 +26,7 @@ To: another
 body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/3007 --mail-rcpt-allowfails --mail-rcpt invalid.one --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt invalid.one --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -38,7 +38,7 @@ smtp://%HOSTIP:%SMTPPORT/3007 --mail-rcpt-allowfails --mail-rcpt invalid.one --m
 55
 </errorcode>
 <protocol>
-EHLO 3007\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<invalid.one>\r
 QUIT\r
index 5fb10247abb4dce976411809ff6e23749b3656be..31aa4f766b27ce8883a6049c1df9596abac0ae5f 100644 (file)
@@ -36,7 +36,7 @@ http
 --output-dir
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/this/is/the/3008 -O --output-dir %PWD/log
+http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/log
 </command>
 </client>
 
@@ -44,13 +44,13 @@ http://%HOSTIP:%HTTPPORT/this/is/the/3008 -O --output-dir %PWD/log
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /this/is/the/3008 HTTP/1.1\r
+GET /this/is/the/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file name="log/3008">
+<file name="log/%TESTNUMBER">
 -foo-
 </file>
 </verify>
index 83becdfa4bd079d1efc8eb69bac8cb6911ea51eb..213e8ae682bc7bc2c9a2e18c37b14ff3316d7ec1 100644 (file)
@@ -36,7 +36,7 @@ http
 --output-dir a non-existing directory
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/this/is/the/3009 -O --output-dir %PWD/not-there
+http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/not-there
 </command>
 </client>
 
@@ -44,7 +44,7 @@ http://%HOSTIP:%HTTPPORT/this/is/the/3009 -O --output-dir %PWD/not-there
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /this/is/the/3009 HTTP/1.1\r
+GET /this/is/the/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 066c140526339ee5a9738c6ab31416ea8bd29d4e..167a718aba0dc7015b0fdca0fa025511270e81bb 100644 (file)
@@ -33,7 +33,7 @@ https
 HTTPS GET with user and password
  </name>
  <command>
--k -u fake:user https://%HOSTIP:%HTTPSPORT/301
+-k -u fake:user https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -41,7 +41,7 @@ HTTPS GET with user and password
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /301 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPSPORT\r
 Authorization: Basic ZmFrZTp1c2Vy\r
 User-Agent: curl/%VERSION\r
index 98c8ce7f3a65c9e49d88ca5a7ed27833ca25809a..d69b1ae655a7dc622525bdc29b8ea3915b770280 100644 (file)
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Type: text/html
 Content-Length: 0
 Retry-After: 2
-Location: /30100002
+Location: /%TESTNUMBER0002
 
 </data>
 <data2>
@@ -39,11 +39,11 @@ http
 HTTP retry-after reset
 </name>
 <tool>
-lib3010
+lib%TESTNUMBER
 </tool>
 
 <command>
-%HOSTIP:%HTTPPORT/3010
+%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
index 3658acb9d70ae4de9d194433e0389c82d1183248..c282cdb782c3ca767a4fcc81177e14ee403e3300 100644 (file)
@@ -36,7 +36,7 @@ http
 --output-dir with --create-dirs
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/this/is/the/3011 -O --output-dir %PWD/log/tmp --create-dirs
+http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/log/tmp --create-dirs
 </command>
 </client>
 
@@ -44,13 +44,13 @@ http://%HOSTIP:%HTTPPORT/this/is/the/3011 -O --output-dir %PWD/log/tmp --create-
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /this/is/the/3011 HTTP/1.1\r
+GET /this/is/the/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file name="log/tmp/3011">
+<file name="log/tmp/%TESTNUMBER">
 -foo-
 </file>
 </verify>
index 7f85825c8ca9d5f4b2e233ff43d9ba0d746ef0c0..1889c937e300ad64c2c1b318f74a1f2b7bdaafa5 100644 (file)
@@ -18,7 +18,7 @@ ETag: "21025-dc7-39462498"
 Accept-Ranges: bytes
 Content-Length: 6
 Connection: close
-Content-Disposition: inline; filename="MMM3012MMM"
+Content-Disposition: inline; filename="MMM%TESTNUMBERMMM"
 Content-Type: text/html
 Funny-head: yesyes
 
@@ -39,7 +39,7 @@ http
 --output-dir with -J
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/this/is/the/3012 -OJ --output-dir %PWD/log
+http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -OJ --output-dir %PWD/log
 </command>
 </client>
 
@@ -47,13 +47,13 @@ http://%HOSTIP:%HTTPPORT/this/is/the/3012 -OJ --output-dir %PWD/log
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /this/is/the/3012 HTTP/1.1\r
+GET /this/is/the/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file name="log/MMM3012MMM">
+<file name="log/MMM%TESTNUMBERMMM">
 -foo-
 </file>
 </verify>
index 0dda077973facc3a83eb5f0106e4a1c143a16381..9c0ce445c18e6e715df33e8c4e264e0c1de26b2b 100644 (file)
@@ -18,7 +18,7 @@ ETag: "21025-dc7-39462498"
 Accept-Ranges: bytes
 Content-Length: 6
 Connection: close
-Content-Disposition: inline; filename="MMM3013MMM"
+Content-Disposition: inline; filename="MMM%TESTNUMBERMMM"
 Content-Type: text/html
 Funny-head: yesyes
 
@@ -39,7 +39,7 @@ http
 Two --output-dir with --next in between
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/this/is/the/3013 -O --output-dir %PWD/log http://%HOSTIP:%HTTPPORT/another/3013 -o second3013 --output-dir %PWD/log
+http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/log http://%HOSTIP:%HTTPPORT/another/%TESTNUMBER -o second%TESTNUMBER --output-dir %PWD/log
 </command>
 </client>
 
@@ -47,21 +47,21 @@ http://%HOSTIP:%HTTPPORT/this/is/the/3013 -O --output-dir %PWD/log http://%HOSTI
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /this/is/the/3013 HTTP/1.1\r
+GET /this/is/the/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /another/3013 HTTP/1.1\r
+GET /another/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file name="log/3013">
+<file name="log/%TESTNUMBER">
 -foo-
 </file>
-<file2 name="log/second3013">
+<file2 name="log/second%TESTNUMBER">
 -foo-
 </file2>
 </verify>
index 9c86d024b246fc7b486142251a1058950bc507dd..523d06a084d7a6604974fb390582975b51b991d3 100644 (file)
@@ -18,7 +18,7 @@ Date: Sun, 13 Sep 2020 15:00 GMT
 Content-Length: 8\r
 Connection: close\r
 Content-Type: text/plain\r
-Location: ./30150001\r
+Location: ./%TESTNUMBER0001\r
 \r
 monster
 </data>
@@ -50,7 +50,7 @@ http
 HTTP GET -w num_headers with redirected fetch (2 connects)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/3015 -w "%{num_headers}\n" -L -o/dev/null
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_headers}\n" -L -o/dev/null
 </command>
 </client>
 
@@ -58,12 +58,12 @@ http://%HOSTIP:%HTTPPORT/3015 -w "%{num_headers}\n" -L -o/dev/null
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /3015 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /30150001 HTTP/1.1\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index bdef98eea2aaf4d520b754f70ffb2121559ca20c..755d4b224fee8c28c6c8522c5b59c182bc3d3268 100644 (file)
@@ -33,7 +33,7 @@ https
 HTTPS GET over HTTP proxy fails
  </name>
  <command>
--k -U fake:user -x %HOSTIP:%HTTPPORT https://bad.fakeurl-to.test:302/slash/302
+-k -U fake:user -x %HOSTIP:%HTTPPORT https://bad.fakeurl-to.test:%TESTNUMBER/slash/%TESTNUMBER
 </command>
 </client>
 
index 953177b7d46fe54a32bf28e3f1e46c9dfd77e080..318cbe672c02eca4d2a0686a4a716f6276378e6a 100644 (file)
@@ -33,14 +33,14 @@ https
 HTTPS with 8 secs timeout
  </name>
  <command>
--k https://%HOSTIP:%HTTPSPORT/want/303 -m 8
+-k https://%HOSTIP:%HTTPSPORT/want/%TESTNUMBER -m 8
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/303 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPSPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 98cb8091b3bdeec2f00ed9ca273ecaf7743c4e65..b4030725d020e40d12653be7eaf7a708ecf671cb 100644 (file)
@@ -30,10 +30,10 @@ https
 HTTPS multipart formpost
  </name>
  <command>
--k https://%HOSTIP:%HTTPSPORT/we/want/304 -F name=daniel -F tool=curl -F file=@log/test304.txt
+-k https://%HOSTIP:%HTTPSPORT/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@log/test%TESTNUMBER.txt
 </command>
 # We create this file before the command is invoked!
-<file name="log/test304.txt">
+<file name="log/test%TESTNUMBER.txt">
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 </file>
 </client>
@@ -44,7 +44,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 ^(Content-Type: multipart/form-data;|------).*
 </strip>
 <protocol>
-POST /we/want/304 HTTP/1.1\r
+POST /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPSPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -60,7 +60,7 @@ Content-Disposition: form-data; name="tool"
 \r
 curl\r
 ------------------------------c3b2ef7f0bb8\r
-Content-Disposition: form-data; name="file"; filename="test304.txt"\r
+Content-Disposition: form-data; name="file"; filename="test%TESTNUMBER.txt"\r
 Content-Type: text/plain\r
 \r
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
index f60226cba3f8c7898dd0cdb8eb8286f88a625e43..4ca5789ed78abcec7c1922f64aa486546dfbc7da 100644 (file)
@@ -19,7 +19,7 @@ https
 insecure HTTPS without permission
  </name>
  <command>
-https://%HOSTIP:%HTTPSPORT/want/305 --cacert moooo
+https://%HOSTIP:%HTTPSPORT/want/%TESTNUMBER --cacert moooo
 </command>
 </client>
 
index 4833ecce6b6d25e2c57fa2a69b62d6aa2925aa60..ee887024116d3c2edd6cbb6c471ae17e823714a1 100644 (file)
@@ -46,7 +46,7 @@ https
 HTTPS GET, receive no headers only data!
  </name>
  <command>
--k https://%HOSTIP:%HTTPSPORT/306 --http0.9
+-k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER --http0.9
 </command>
 </client>
 
@@ -54,7 +54,7 @@ HTTPS GET, receive no headers only data!
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /306 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPSPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 5fb9faa474ddbc0219f5602a87d35d6a3370e2fb..4c004ae1cc4628dbe0b8947d4b0910b1366056e6 100644 (file)
@@ -29,14 +29,14 @@ OpenSSL
 https
 </server>
 <precheck>
-perl %SRCDIR/libtest/test307.pl %CURL
+perl %SRCDIR/libtest/test%TESTNUMBER.pl %CURL
 </precheck>
 
  <name>
 simple HTTPS GET with openssl engine
  </name>
  <command>
---engine openssl -k https://%HOSTIP:%HTTPSPORT/307
+--engine openssl -k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -44,7 +44,7 @@ simple HTTPS GET with openssl engine
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /307 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPSPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 1a3c8ec5328060533adfdefd5b9db0f6b1343126..7534ed6ba0407c3fe03d30d8946f1b2252d0b811 100644 (file)
@@ -21,7 +21,7 @@ https
 simple HTTPS GET with invalid crypto engine
  </name>
  <command>
---engine invalid-crypto-engine-xyzzy -k https://%HOSTIP:%HTTPSPORT/308
+--engine invalid-crypto-engine-xyzzy -k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
 </command>
 </client>
 
index 0160a2030ad3102adf3d7a0d7c06b1b651503388..0a3b5296527f81da647cd04a670e603b809d5d9b 100644 (file)
@@ -14,7 +14,7 @@ followlocation
 HTTP/1.1 301 This is a weirdo text message swsclose\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
-Location: https://%HOSTIP:%HTTPSPORT/data/3090002.txt?coolsite=yes\r
+Location: https://%HOSTIP:%HTTPSPORT/data/%TESTNUMBER0002.txt?coolsite=yes\r
 Connection: close\r
 \r
 This server reply is for testing a simple Location: following to HTTPS URL
@@ -33,7 +33,7 @@ If this is received, the location following worked
 HTTP/1.1 301 This is a weirdo text message swsclose\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
-Location: https://%HOSTIP:%HTTPSPORT/data/3090002.txt?coolsite=yes\r
+Location: https://%HOSTIP:%HTTPSPORT/data/%TESTNUMBER0002.txt?coolsite=yes\r
 Connection: close\r
 \r
 HTTP/1.1 200 Followed here fine swsclose\r
@@ -59,19 +59,19 @@ https
 HTTP Location: redirect to HTTPS URL
  </name>
  <command>
--k http://%HOSTIP:%HTTPPORT/want/309 -L
+-k http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/309 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /data/3090002.txt?coolsite=yes HTTP/1.1\r
+GET /data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1\r
 Host: %HOSTIP:%HTTPSPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index e30e8b4378fed8e384c286497a956832016fcb8d..2ccb032549fa2740f65f1e53886e7bae7120befa 100644 (file)
@@ -127,7 +127,7 @@ HTTP with weirdly formatted cookies and cookiejar storage
 TZ=GMT
 </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/31 -b none -c log/jar31.txt
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b none -c log/jar%TESTNUMBER.txt
 </command>
 <precheck>
 perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0.0.1' );"
@@ -137,13 +137,13 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/31 HTTP/1.1\r
+GET /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file name="log/jar31.txt" mode="text">
+<file name="log/jar%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
index 2202ec101bad721772e0d5c232146566814dccac..c31085b87761d15dbb40dbb5fc2492edb41e6931 100644 (file)
@@ -33,7 +33,7 @@ https Server-localhost-sv.pem
 simple HTTPS GET
  </name>
  <command>
---cacert %SRCDIR/certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/310
+--cacert %SRCDIR/certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name
 <precheck>
@@ -45,7 +45,7 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /310 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: localhost:%HTTPSPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 87f4dddce5f7cd4a3c3e8035ab06458042273afe..0e05b63c0fae3c4bd62f2593e02f22319c0f67f3 100644 (file)
@@ -25,7 +25,7 @@ https Server-localhost0h-sv.pem
 HTTPS wrong subjectAltName but right CN
  </name>
  <command>
---cacert %SRCDIR/certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/311
+--cacert %SRCDIR/certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name
 <precheck>
index 6a79f59a7bc16c10b2e9f1eb1a5caf02ecd25fb3..f013a7cfd1f1f440743fc6fe7239a6c2a17ff9c7 100644 (file)
@@ -25,7 +25,7 @@ https Server-localhost.nn-sv.pem
 HTTPS GET to localhost and null-prefixed CN cert
  </name>
  <command>
---cacert %SRCDIR/certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/312
+--cacert %SRCDIR/certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name
 <precheck>
index c54495a88b8059df07e0fcc82a4e5635e47d5dbd..d87a464919375c7a9671d23f296f1ffd8c343c61 100644 (file)
@@ -21,7 +21,7 @@ https Server-localhost-sv.pem
 CRL test
  </name>
  <command>
---cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --crlfile %SRCDIR/certs/Server-localhost-sv.crl https://localhost:%HTTPSPORT/313
+--cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --crlfile %SRCDIR/certs/Server-localhost-sv.crl https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name
 <precheck>
index d22038a5b4908d6c66660e9da81b382edab128aa..5080ceabc087643b96eca36a0a13d4c399b9bd0e 100644 (file)
@@ -174,7 +174,7 @@ http
 HTTP GET brotli compressed content
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/314 --compressed
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>
 
@@ -189,7 +189,7 @@ s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 %endif
 </strippart>
 <protocol>
-GET /314 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 605bb0f2d131f35f73b3a8e91b2fc25236c8c6e5..62f5b29e5abda63ce21ed1d9716a489c0d894965 100644 (file)
@@ -64,7 +64,7 @@ http
 HTTP GET brotli compressed content with broken header
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/315 --compressed
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>
 
@@ -75,7 +75,7 @@ http://%HOSTIP:%HTTPPORT/315 --compressed
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
-GET /315 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 6b95b37fd707b03b88ca05501bb605c9e3f64998..5b26a2a9db8e9a046615eae5652658a0cd8c4884 100644 (file)
@@ -174,7 +174,7 @@ http
 HTTP GET brotli compressed content of size more than CURL_MAX_WRITE_SIZE
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/316 --compressed
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>
 
@@ -185,7 +185,7 @@ http://%HOSTIP:%HTTPPORT/316 --compressed
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
-GET /316 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 70a0b08bddee74dda4d0e143b644602003e4cc53..a8cfd6112e321f4c8f7218f58ae2be49b4b3ec05 100644 (file)
@@ -17,7 +17,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/html
 Funny-head: yesyes
-Location: http://goto.second.host.now/3170002
+Location: http://goto.second.host.now/%TESTNUMBER0002
 Content-Length: 8
 Connection: close
 
@@ -40,7 +40,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/html
 Funny-head: yesyes
-Location: http://goto.second.host.now/3170002
+Location: http://goto.second.host.now/%TESTNUMBER0002
 Content-Length: 8
 Connection: close
 
@@ -65,7 +65,7 @@ http
 HTTP with custom Authorization: and redirect to new host
  </name>
  <command>
-http://first.host.it.is/we/want/that/page/317 -x %HOSTIP:%HTTPPORT -H "Authorization: s3cr3t" --proxy-user testing:this --location
+http://first.host.it.is/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT -H "Authorization: s3cr3t" --proxy-user testing:this --location
 </command>
 <features>
 proxy
@@ -76,7 +76,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://first.host.it.is/we/want/that/page/317 HTTP/1.1\r
+GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1\r
 Host: first.host.it.is\r
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
 User-Agent: curl/%VERSION\r
@@ -84,7 +84,7 @@ Accept: */*
 Proxy-Connection: Keep-Alive\r
 Authorization: s3cr3t\r
 \r
-GET http://goto.second.host.now/3170002 HTTP/1.1\r
+GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1\r
 Host: goto.second.host.now\r
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
 User-Agent: curl/%VERSION\r
index 3f20589aa6188cfd10d8e8032a8b571a1a156fed..94a53e8bcf78be200fc5dc5d3f82fdbfecb7f529 100644 (file)
@@ -17,7 +17,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/html
 Funny-head: yesyes
-Location: http://goto.second.host.now/3180002
+Location: http://goto.second.host.now/%TESTNUMBER0002
 Content-Length: 8
 Connection: close
 
@@ -40,7 +40,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/html
 Funny-head: yesyes
-Location: http://goto.second.host.now/3180002
+Location: http://goto.second.host.now/%TESTNUMBER0002
 Content-Length: 8
 Connection: close
 
@@ -65,7 +65,7 @@ http
 HTTP with custom Authorization: and redirect to new host
  </name>
  <command>
-http://first.host.it.is/we/want/that/page/318 -x %HOSTIP:%HTTPPORT -H "Authorization: s3cr3t" --proxy-user testing:this --location-trusted
+http://first.host.it.is/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT -H "Authorization: s3cr3t" --proxy-user testing:this --location-trusted
 </command>
 <features>
 proxy
@@ -76,7 +76,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://first.host.it.is/we/want/that/page/318 HTTP/1.1\r
+GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1\r
 Host: first.host.it.is\r
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
 User-Agent: curl/%VERSION\r
@@ -84,7 +84,7 @@ Accept: */*
 Proxy-Connection: Keep-Alive\r
 Authorization: s3cr3t\r
 \r
-GET http://goto.second.host.now/3180002 HTTP/1.1\r
+GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1\r
 Host: goto.second.host.now\r
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
 User-Agent: curl/%VERSION\r
index 855ea3e56e758e08a4ca9e7df412a7f20189ef0d..a27c99f82d05e29d5a8889a76c7ddff7f4d9644f 100644 (file)
@@ -37,7 +37,7 @@ http
 HTTP GET gzip transfer-encoded data in raw mode
  </name>
  <command option="no-include">
-http://%HOSTIP:%HTTPPORT/319 --raw
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --raw
  </command>
 </client>
 
@@ -45,7 +45,7 @@ http://%HOSTIP:%HTTPPORT/319 --raw
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /319 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 7bd5931b143b9dc025f49af06a1cd9220b768619..d5762f4e205b5fcb80b13ce618639b1906957ca5 100644 (file)
@@ -35,7 +35,7 @@ http
 HTTP with -d and -G
  </name>
  <command>
--d "foo=moo&moo=poo" http://%HOSTIP:%HTTPPORT/32 -G
+-d "foo=moo&moo=poo" http://%HOSTIP:%HTTPPORT/%TESTNUMBER -G
 </command>
 </client>
 
@@ -43,7 +43,7 @@ HTTP with -d and -G
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /32?foo=moo&moo=poo HTTP/1.1\r
+GET /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 87311d4f2032d23c6451ca4b3c8f362145858372..88f99ccdeea04eb2ac7485809a3f13b28af2194e 100644 (file)
@@ -58,7 +58,7 @@ simple TLS-SRP HTTPS GET, check user in response
 <verify>
 <protocol>
 </protocol>
-<file name="log/curl320.out">
+<file name="log/curl%TESTNUMBER.out">
 HTTP/1.0 200 OK\r
 Content-type: text/html\r
 \r
index 6439b4d43db2fe2bf6a77163714e314360972dd5..c46c02a3897fec83d923a8bc800103795d7515d0 100644 (file)
@@ -19,7 +19,7 @@ TLS-SRP
 TLS-SRP to non-TLS-SRP server
  </name>
 <command>
---insecure --tlsauthtype SRP --tlsuser jsmith --tlspassword badpass https://%HOSTIP:%HTTPSPORT/want/323
+--insecure --tlsauthtype SRP --tlsuser jsmith --tlspassword badpass https://%HOSTIP:%HTTPSPORT/want/%TESTNUMBER
 </command>
 </client>
 
index 461e54c50742617eafe02b0c7f7e4b0cf80095c9..159f36b8450b821e43b9579a92470622ec7800bc 100644 (file)
@@ -19,7 +19,7 @@ TLS-SRP
 TLS-SRP with server cert checking
  </name>
 <command> # no --insecure
---tlsauthtype SRP --tlsuser jsmith --tlspassword abc https://%HOSTIP:%HTTPTLSPORT/want/323
+--tlsauthtype SRP --tlsuser jsmith --tlspassword abc https://%HOSTIP:%HTTPTLSPORT/want/fails
 </command>
 </client>
 
index 8605f0b86fc9827344e250abfef0578c7837f323..4bdf2aa31631d3e11a41cccb4fce8abed297af71 100644 (file)
@@ -15,7 +15,7 @@ HTTP/1.1 301 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 7
-Location: http://somewhere/325
+Location: http://somewhere/%TESTNUMBER
 
 MooMoo
 </data>
@@ -24,7 +24,7 @@ HTTP/1.1 301 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 7
-Location: http://somewhere/325
+Location: http://somewhere/%TESTNUMBER
 
 </datacheck>
 </reply>
@@ -42,7 +42,7 @@ https
 HTTPS with attempted redirect to denied HTTP
  </name>
  <command>
--k https://%HOSTIP:%HTTPSPORT/325 --proto-redir -http --location
+-k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER --proto-redir -http --location
 </command>
 </client>
 
@@ -50,7 +50,7 @@ HTTPS with attempted redirect to denied HTTP
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /325 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPSPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 09ca9c0add6eaa7eb03b54b8bb557e85ef3c74d5..25f201eae650654ab10c1ee2777b167bd19c4070 100644 (file)
@@ -46,7 +46,7 @@ http
 HTTP GET chunked data in raw mode
  </name>
  <command option="no-include">
-http://%HOSTIP:%HTTPPORT/326 --raw
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --raw
  </command>
 </client>
 
@@ -54,7 +54,7 @@ http://%HOSTIP:%HTTPPORT/326 --raw
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /326 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index d6dae18eca4104c73ff940c77908ff48d5095353..73cedb657fc26f2fad235c7c7c821f0cace884ac 100644 (file)
@@ -43,26 +43,26 @@ http
 HTTP with cookiejar without cookies left
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/327 -b none -c log/cookies327 http://%HOSTIP:%HTTPPORT/we/want/3270002
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b none -c log/cookies%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER0002
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/327 HTTP/1.1\r
+GET /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /we/want/3270002 HTTP/1.1\r
+GET /we/want/%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Cookie: foobar=name\r
 \r
 </protocol>
-<file name="log/cookies327" mode="text">
+<file name="log/cookies%TESTNUMBER" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
index c1215f2d0b1722b85d97c391b4a2a62a7f64b99c..a9b6955600db41a73d573b8cccf39682c19a3f2c 100644 (file)
@@ -35,7 +35,7 @@ libz
 HTTP with "Content-Encoding: none
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/hello/328 --compressed
+http://%HOSTIP:%HTTPPORT/hello/%TESTNUMBER --compressed
 </command>
 </client>
 
@@ -45,7 +45,7 @@ http://%HOSTIP:%HTTPPORT/hello/328 --compressed
 ^Accept-Encoding:.*
 </strip>
 <protocol>
-GET /hello/328 HTTP/1.1\r
+GET /hello/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 67aac4baa85f67cb5270838bc2cdc717237a778c..d25f9689050c48b96fb8b057dc1ca987d211c2be 100644 (file)
@@ -30,10 +30,10 @@ moo
 
 # Client-side
 <client>
-<file name="log/jar329.txt" mode="text">
+<file name="log/jar%TESTNUMBER.txt" mode="text">
 .host.foo.com  TRUE    /we/want/       FALSE   2147483647      test    no
 </file>
-<file name="log/jar329-2.txt" mode="text">
+<file name="log/jar%TESTNUMBER-2.txt" mode="text">
 .host.foo.com  TRUE    /we/want/       FALSE   2147483647      tester  yes
 </file>
 <server>
@@ -49,20 +49,20 @@ HTTP cookie with Max-Age=0
 TZ=GMT
 </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/329 -b log/jar329.txt -b log/jar329-2.txt -H "Host: host.foo.com" http://%HOSTIP:%HTTPPORT/we/want/3290002
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b log/jar%TESTNUMBER.txt -b log/jar%TESTNUMBER-2.txt -H "Host: host.foo.com" http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER0002
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/329 HTTP/1.1\r
+GET /we/want/%TESTNUMBER HTTP/1.1\r
 Host: host.foo.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Cookie: tester=yes; test=no\r
 \r
-GET /we/want/3290002 HTTP/1.1\r
+GET /we/want/%TESTNUMBER0002 HTTP/1.1\r
 Host: host.foo.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 6b3c9d72c5a9a1932801f32aa08e4a797edde10c..1b9c898ef988be0d6923e6c86496b7b26f4c81a7 100644 (file)
@@ -23,7 +23,7 @@ http
  <name>
 HTTP PUT with resume
  </name>
-<file name="log/test33.txt">
+<file name="log/test%TESTNUMBER.txt">
 012345678
 012345678
 012345678
@@ -36,14 +36,14 @@ HTTP PUT with resume
 012345678
 </file>
  <command>
-http://%HOSTIP:%HTTPPORT/33 -Tlog/test33.txt -C 50
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -Tlog/test%TESTNUMBER.txt -C 50
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /33 HTTP/1.1\r
+PUT /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Content-Range: bytes 50-99/100\r
 User-Agent: curl/%VERSION\r
index 5104be03a3215598f72f6efc3856004c4f758915..d145fc07acfbca398229cf9868145f2ba6ba1e6b 100644 (file)
@@ -16,7 +16,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/html
 Funny-head: yesyes
-Location: http://goto.second.host.now/3170002
+Location: http://goto.second.host.now/%TESTNUMBER0002
 Content-Length: 8
 Connection: close
 
@@ -39,7 +39,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/html
 Funny-head: yesyes
-Location: http://goto.second.host.now/3170002
+Location: http://goto.second.host.now/%TESTNUMBER0002
 Content-Length: 8
 Connection: close
 
@@ -64,7 +64,7 @@ http
 HTTP with custom Cookie: and redirect to new host
  </name>
  <command>
-http://first.host.it.is/we/want/that/page/317 -x %HOSTIP:%HTTPPORT -H "Cookie: test=yes" --location
+http://first.host.it.is/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT -H "Cookie: test=yes" --location
 </command>
 <features>
 proxy
@@ -75,14 +75,14 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://first.host.it.is/we/want/that/page/317 HTTP/1.1\r
+GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1\r
 Host: first.host.it.is\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Cookie: test=yes\r
 \r
-GET http://goto.second.host.now/3170002 HTTP/1.1\r
+GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1\r
 Host: goto.second.host.now\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 8c9d384de560b57e5969b7df9ee3f3b109c77755..8fc68984e4102ab219912b284e6919dbba03f423 100644 (file)
@@ -40,7 +40,7 @@ http
 HTTP with cookie using host name 'moo'
  </name>
  <command>
--x http://%HOSTIP:%HTTPPORT http://moo/we/want/331 -b none http://moo/we/want/3310002
+-x http://%HOSTIP:%HTTPPORT http://moo/we/want/%TESTNUMBER -b none http://moo/we/want/%TESTNUMBER0002
 </command>
 <features>
 proxy
@@ -50,13 +50,13 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://moo/we/want/331 HTTP/1.1\r
+GET http://moo/we/want/%TESTNUMBER HTTP/1.1\r
 Host: moo\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://moo/we/want/3310002 HTTP/1.1\r
+GET http://moo/we/want/%TESTNUMBER0002 HTTP/1.1\r
 Host: moo\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 3688c2b08a75cf0d1b64df3329f7526f7ebdedaf..4f4c28b5d9b8c056556d221f9ccae63d23b91110 100644 (file)
@@ -26,7 +26,7 @@ tftp
 TFTP retrieve with blksize 400
  </name>
  <command>
-tftp://%HOSTIP:%TFTPPORT//332 --tftp-blksize 400
+tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --tftp-blksize 400
 </command>
 </client>
 
@@ -39,7 +39,7 @@ mode: octet
 tsize: 0
 blksize: 400
 timeout: 6
-filename: /332
+filename: /%TESTNUMBER
 </protocol>
 </verify>
 </testcase>
index 0fd0591e8ce62d33659cd1492f9c15ce2069a182..e0fc450d54aeeed8f28fb99dfa6c820e7b3882c5 100644 (file)
@@ -20,7 +20,7 @@ none
 Try a non-boolean command line option with --no-
  </name>
  <command>
---no-proxy "hey" http://%HOSTIP:%NOLISTENPORT/333
+--no-proxy "hey" http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER
 </command>
 </client>
 
index f43af2381896e983d3a1d00a3f81a929b7dd0f02..159335093b8d7dc859b3543f87656971c765d028 100644 (file)
@@ -25,14 +25,14 @@ http
 HTTP 204 No content with chunked header
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/want/334
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/334 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index e3e1950f1265680f8b20bd64970c0cef5c47f713..558d2ca77dfc16673cde8274b8bbb852eefb444f 100644 (file)
@@ -67,30 +67,30 @@ proxy
 HTTP with proxy Digest and site Digest with creds in URLs
  </name>
  <command>
-http://digest:alot@data.from.server.requiring.digest.hohoho.com/335 --proxy http://foo:bar@%HOSTIP:%HTTPPORT --proxy-digest --digest
+http://digest:alot@data.from.server.requiring.digest.hohoho.com/%TESTNUMBER --proxy http://foo:bar@%HOSTIP:%HTTPPORT --proxy-digest --digest
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://data.from.server.requiring.digest.hohoho.com/335 HTTP/1.1\r
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1\r
 Host: data.from.server.requiring.digest.hohoho.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://data.from.server.requiring.digest.hohoho.com/335 HTTP/1.1\r
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1\r
 Host: data.from.server.requiring.digest.hohoho.com\r
-Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/335", response="f61609cd8f5bb205ef4e169b2c5626cb"\r
+Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="f61609cd8f5bb205ef4e169b2c5626cb"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://data.from.server.requiring.digest.hohoho.com/335 HTTP/1.1\r
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1\r
 Host: data.from.server.requiring.digest.hohoho.com\r
-Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/335", response="f61609cd8f5bb205ef4e169b2c5626cb"\r
-Authorization: Digest username="digest", realm="realmweirdo", nonce="123456", uri="/335", response="08a2e2e684047f4219a38ddc189ac00c"\r
+Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="f61609cd8f5bb205ef4e169b2c5626cb"\r
+Authorization: Digest username="digest", realm="realmweirdo", nonce="123456", uri="/%TESTNUMBER", response="08a2e2e684047f4219a38ddc189ac00c"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
index cba846d4b3e7173a9335b070d850e27d1b964228..89e9bffc0d7b7f09fe5c55cfa549434564aa96ca 100644 (file)
@@ -35,7 +35,7 @@ ftp
 FTP range download when SIZE doesn't work
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/336 --range 3-6
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --range 3-6
 </command>
 </client>
 
@@ -48,9 +48,9 @@ PWD
 EPSV\r
 PASV\r
 TYPE I\r
-SIZE 336\r
+SIZE %TESTNUMBER\r
 REST 3\r
-RETR 336\r
+RETR %TESTNUMBER\r
 ABOR\r
 QUIT\r
 </protocol>
index 9ae4dfac5e976c02692149ad6659fb8baec2ad49..f8ca6856e88297e6f18c22cfda274371b751ac22 100644 (file)
@@ -35,7 +35,7 @@ ftp
 FTP range download with SIZE returning extra crap
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/337 --range 3-6
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --range 3-6
 </command>
 </client>
 
@@ -48,9 +48,9 @@ PWD
 EPSV\r
 PASV\r
 TYPE I\r
-SIZE 337\r
+SIZE %TESTNUMBER\r
 REST 3\r
-RETR 337\r
+RETR %TESTNUMBER\r
 ABOR\r
 QUIT\r
 </protocol>
index 28515d027e5f324e996632059ffe10a94e305e7a..4de5970420b8c3466e186976de87a4ed13f2e085 100644 (file)
@@ -38,7 +38,7 @@ http
 ANYAUTH connection reuse of non-authed connection
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/338 --next http://%HOSTIP:%HTTPPORT/338 --anyauth -u foo:moo
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --next http://%HOSTIP:%HTTPPORT/%TESTNUMBER --anyauth -u foo:moo
 </command>
 </client>
 
@@ -46,12 +46,12 @@ http://%HOSTIP:%HTTPPORT/338 --next http://%HOSTIP:%HTTPPORT/338 --anyauth -u fo
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /338 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /338 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index eca35947d5900a67d0039b56892781a6088a4b15..054707a9d2488c06cb9bbbb1c8eb264d5097234b 100644 (file)
@@ -39,7 +39,7 @@ http
 Check if --etag-save saved correct etag to a file
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/339 --etag-save log/etag339
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save log/etag%TESTNUMBER
 </command>
 </client>
 
@@ -47,13 +47,13 @@ http://%HOSTIP:%HTTPPORT/339 --etag-save log/etag339
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /339 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file name="log/etag339">
+<file name="log/etag%TESTNUMBER">
 W/"asdf"
 </file>
 </verify>
index fa4928d5c4d5caccebc993e385d04c422c015f4e..3119ce22a30b147a9db6974dcdf5bbf3d871adaf 100644 (file)
@@ -45,7 +45,7 @@ http
 HTTP GET with chunked Transfer-Encoding
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/34
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -53,7 +53,7 @@ http://%HOSTIP:%HTTPPORT/34
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /34 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index d834d767cd0f7bb2c777ff6ddff1267ea89f4f98..6c15dc190fa9d97e741fe95e1e82eecc467b0d51 100644 (file)
@@ -22,7 +22,7 @@ ftp
 FTP using %00 in path with singlecwd
  </name>
  <command>
---ftp-method singlecwd ftp://%HOSTIP:%FTPPORT/%00first/second/third/340
+--ftp-method singlecwd ftp://%HOSTIP:%FTPPORT/%00first/second/third/%TESTNUMBER
 </command>
 </client>
 
index 726000d163265955cb4cce47a8f3d1e453881a76..3c9f72ae5fae9396ed834986707912251c0a6a87 100644 (file)
@@ -39,7 +39,7 @@ http
 Try to open a non existing file with --etag-compare should return an error
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/341 --etag-compare log/etag341
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare log/etag%TESTNUMBER
 </command>
 </client>
 
index d4b14a3d013c4737710488629bf92c48a22b6b01..ca8957a5f03291cfad25180099352c41746916b3 100644 (file)
@@ -33,11 +33,11 @@ http
 <name>
 Check if --etag-compare set correct etag in header
 </name>
-<file name="log/etag342">
+<file name="log/etag%TESTNUMBER">
 "21025-dc7-39462498"
 </file>
 <command>
-http://%HOSTIP:%HTTPPORT/342 --etag-compare log/etag342
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare log/etag%TESTNUMBER
 </command>
 </client>
 
@@ -45,7 +45,7 @@ http://%HOSTIP:%HTTPPORT/342 --etag-compare log/etag342
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /342 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 091e925860a371e86f8095405fdac6d818169c94..faf6c9a5ed8cb1ad37a82e7facd9b794b1ee8350 100644 (file)
@@ -33,11 +33,11 @@ http
 <name>
 Both --etag-compare and --etag-save to save new Etag
 </name>
-<file name="log/etag343">
+<file name="log/etag%TESTNUMBER">
 "21025-dc7-39462498"
 </file>
 <command>
-http://%HOSTIP:%HTTPPORT/343 --etag-compare log/etag343 --etag-save log/out343
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare log/etag%TESTNUMBER --etag-save log/out%TESTNUMBER
 </command>
 </client>
 
@@ -45,14 +45,14 @@ http://%HOSTIP:%HTTPPORT/343 --etag-compare log/etag343 --etag-save log/out343
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /343 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 If-None-Match: "21025-dc7-39462498"\r
 \r
 </protocol>
-<file name="log/out343">
+<file name="log/out%TESTNUMBER">
 "21025-dc7-11111"
 </file>
 </verify>
index e84e45923f7e4925f306c15ac1e18b73eed0b77b..ec671d492008cb2a9d2c048056df72eac20adbbe 100644 (file)
@@ -34,7 +34,7 @@ http
 Both --etag-compare and -save store new Etag using non-existing file
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/344 --etag-compare log/etag344 --etag-save log/etag344
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare log/etag%TESTNUMBER --etag-save log/etag%TESTNUMBER
 </command>
 </client>
 
@@ -42,14 +42,14 @@ http://%HOSTIP:%HTTPPORT/344 --etag-compare log/etag344 --etag-save log/etag344
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /344 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 If-None-Match: ""\r
 \r
 </protocol>
-<file name="log/etag344">
+<file name="log/etag%TESTNUMBER">
 "21025-dc7-11111"
 </file>
 </verify>
index 1dc293a9a5431ed36ef5c4a8283c1ed786eb2a93..5619d4475a294f70d852692c38d74bd3214f4d50 100644 (file)
@@ -33,11 +33,11 @@ http
 <name>
 Both --etag-compare and -save store new Etag using one pre-existing file
 </name>
-<file name="log/etag345">
+<file name="log/etag%TESTNUMBER">
 "21025-dc7-39462498"
 </file>
 <command>
-http://%HOSTIP:%HTTPPORT/345 --etag-compare log/etag345 --etag-save log/etag345
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare log/etag%TESTNUMBER --etag-save log/etag%TESTNUMBER
 </command>
 </client>
 
@@ -45,14 +45,14 @@ http://%HOSTIP:%HTTPPORT/345 --etag-compare log/etag345 --etag-save log/etag345
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /345 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 If-None-Match: "21025-dc7-39462498"\r
 \r
 </protocol>
-<file name="log/etag345">
+<file name="log/etag%TESTNUMBER">
 "21025-dc7-11111"
 </file>
 </verify>
index bc464f792a86e127a24015c1c1ef7f74637d2958..c15ae71563a25423d21bdbeb137aa8c4ec619374 100644 (file)
@@ -38,14 +38,14 @@ http
 HTTP GET over proxy with credentials using blank passwords
 </name>
 <command>
--x http://%HOSTIP:%HTTPPORT/346 -U puser: -u suser: http://remote.example/346
+-x http://%HOSTIP:%HTTPPORT/%TESTNUMBER -U puser: -u suser: http://remote.example/%TESTNUMBER
 </command>
 </client>
 
 #
 <verify>
 <protocol>
-GET http://remote.example/346 HTTP/1.1\r
+GET http://remote.example/%TESTNUMBER HTTP/1.1\r
 Host: remote.example\r
 Proxy-Authorization: Basic cHVzZXI6\r
 Authorization: Basic c3VzZXI6\r
index 3d55a5bd24169e76bf30d584d83df40297107551..e6afa7ae968652fb608ec24ccc8b8f57b0f14afb 100644 (file)
@@ -39,7 +39,7 @@ http
 --etag-save with blank incoming header
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/347 --etag-save log/etag347
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save log/etag%TESTNUMBER
 </command>
 </client>
 
@@ -47,13 +47,13 @@ http://%HOSTIP:%HTTPPORT/347 --etag-save log/etag347
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /347 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file name="log/etag347">
+<file name="log/etag%TESTNUMBER">
 </file>
 </verify>
 
index befd9fb815ae72b7c3329541c16caa0776791389..8832a38104766618d9c72c7a246e1778e9c5c91a 100644 (file)
@@ -21,7 +21,7 @@ ftp
  <name>
 FTP upload file with 552 disk full response
  </name>
-<file name="log/test348.txt">
+<file name="log/test%TESTNUMBER.txt">
 data
     to
       see
@@ -30,7 +30,7 @@ works
   so does it?
 </file>
  <command>
-ftp://%HOSTIP:%FTPPORT/348 -T log/test348.txt
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/test%TESTNUMBER.txt
 </command>
 </client>
 
@@ -50,7 +50,7 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-STOR 348\r
+STOR %TESTNUMBER\r
 QUIT\r
 </protocol>
 # 70 - CURLE_REMOTE_DISK_FULL
index 472a4dc4896e92d7a73c3cdd54a568f76ed09a9a..7abd0579758080968cf27958776237ce1c87b0dd 100644 (file)
@@ -25,14 +25,14 @@ http
 HTTP GET --fail-with-body on HTTP error return
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/349 --fail-with-body
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail-with-body
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /349 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index c79822085d72124086ff8d59b406145a53c18d2a..b5feb199842548e1a345ccdd87931cbf3b7123da 100644 (file)
Binary files a/tests/data/test35 and b/tests/data/test35 differ
index a6949328a1c4825e8ab31d14f83accabea7a41c9..cdd82705189053ac1ab47de1655dc82ef11b052e 100644 (file)
@@ -30,7 +30,7 @@ ftp
 FTP without password
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/354
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 
 </client>
@@ -42,8 +42,8 @@ USER anonymous
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 354\r
-RETR 354\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index d554d30b59ddbc9fb0556a0771ab796d1b32d9b0..98e59079a2b0662f783e986b4424ee50e5b0736d 100644 (file)
@@ -34,9 +34,9 @@ http
 load Alt-Svc from file and use
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/355 --alt-svc ""
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --alt-svc ""
 </command>
-<file name="log/altsvc-355">
+<file name="log/altsvc-%TESTNUMBER">
 h1 example.com 80 h1 %HOSTIP %HTTPPORT "20290222 22:19:28" 0 0
 </file>
 </client>
@@ -45,7 +45,7 @@ h1 example.com 80 h1 %HOSTIP %HTTPPORT "20290222 22:19:28" 0 0
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /355 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 2b9df83914e72ce7ef47c09c38d5cdcca4590f35..0f8795899793e16fedd699a5b80a01c6bf5ea1f7 100644 (file)
@@ -40,7 +40,7 @@ parse incoming Alt-Svc and save to file
 CURL_ALTSVC_HTTP="yeah"
 </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/356 --alt-svc "log/altsvc-356"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --alt-svc "log/altsvc-%TESTNUMBER"
 </command>
 </client>
 
@@ -48,7 +48,7 @@ http://%HOSTIP:%HTTPPORT/356 --alt-svc "log/altsvc-356"
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /356 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -59,7 +59,7 @@ Accept: */*
 # matches
 s/\"([^\"]*)\"/TIMESTAMP/
 </stripfile>
-<file name="log/altsvc-356" mode="text">
+<file name="log/altsvc-%TESTNUMBER" mode="text">
 # Your alt-svc cache. https://curl.se/docs/alt-svc.html
 # This file was generated by libcurl! Edit at your own risk.
 h1 %HOSTIP %HTTPPORT h1 nowhere.foo 81 TIMESTAMP 0 0
index a907f6c6d2516fed8c47f952b7afeeec059d909c..8ddcdc90d1b64865f0a99c79bc1747d1d0808557 100644 (file)
@@ -51,9 +51,9 @@ http
 HTTP PUT with Expect: 100-continue and 417 response
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/357 -T log/test357.txt
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T log/test%TESTNUMBER.txt
 </command>
-<file name="log/test357.txt">
+<file name="log/test%TESTNUMBER.txt">
 Weird
      file
          to
@@ -69,14 +69,14 @@ the
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /we/want/357 HTTP/1.1\r
+PUT /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 78\r
 Expect: 100-continue\r
 \r
-PUT /we/want/357 HTTP/1.1\r
+PUT /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 15f2993e3b5fe42d033aa5b03b8545a7c73e0fb5..d1ddc1b9e7e81b7dc7276eb6523eb8d6b640eaf9 100644 (file)
@@ -43,9 +43,9 @@ HTTPS GET translated by alt-svc lookup to HTTP/2 GET
 CURL_ALTSVC_HTTP="yeah"
 </setenv>
  <command>
---http2 --alt-svc "log/altsvc-358" "http://%HOSTIP:%HTTPPORT/358" "http://%HOSTIP:%HTTPPORT/358"
+--http2 --alt-svc "log/altsvc-%TESTNUMBER" "http://%HOSTIP:%HTTPPORT/%TESTNUMBER" "http://%HOSTIP:%HTTPPORT/%TESTNUMBER"
 </command>
-<file name="log/altsvc-358">
+<file name="log/altsvc-%TESTNUMBER">
 h2 %HOSTIP %HTTPPORT h2 %HOSTIP %HTTP2PORT "20290222 22:19:28" 0 0
 </file>
 
@@ -84,7 +84,7 @@ s/^server: nghttpx.*\r?\n//
 # matches
 s/\"2([^\"]*)\"/TIMESTAMP/
 </stripfile>
-<file name="log/altsvc-358" mode="text">
+<file name="log/altsvc-%TESTNUMBER" mode="text">
 # Your alt-svc cache. https://curl.se/docs/alt-svc.html
 # This file was generated by libcurl! Edit at your own risk.
 h2 %HOSTIP %HTTPPORT h2 %HOSTIP %HTTP2PORT TIMESTAMP 0 0
index 81f3c86fb9cf53144d2dcfd8422870cd67d4014d..c1b1cb86c5b0727964ca12b4bdaabb7be20c6c5e 100644 (file)
@@ -43,9 +43,9 @@ HTTPS GET translated by alt-svc lookup to HTTP/2 GET
 CURL_ALTSVC_HTTP="yeah"
 </setenv>
  <command>
---http2 --alt-svc "log/altsvc-359" "http://%HOSTIP:%HTTPSPORT/359" "http://%HOSTIP:%HTTPSPORT/359"
+--http2 --alt-svc "log/altsvc-%TESTNUMBER" "http://%HOSTIP:%HTTPSPORT/%TESTNUMBER" "http://%HOSTIP:%HTTPSPORT/%TESTNUMBER"
 </command>
-<file name="log/altsvc-359">
+<file name="log/altsvc-%TESTNUMBER">
 h2 %HOSTIP %HTTPSPORT h2 %HOSTIP %HTTP2PORT "20290222 22:19:28" 0 0
 </file>
 
@@ -84,7 +84,7 @@ s/^server: nghttpx.*\r?\n//
 # matches
 s/\"2([^\"]*)\"/TIMESTAMP/
 </stripfile>
-<file name="log/altsvc-359" mode="text">
+<file name="log/altsvc-%TESTNUMBER" mode="text">
 # Your alt-svc cache. https://curl.se/docs/alt-svc.html
 # This file was generated by libcurl! Edit at your own risk.
 h2 %HOSTIP %HTTPSPORT h2 %HOSTIP %HTTP2PORT TIMESTAMP 0 0
index 91db26ec62f59bb476c7638aa574b51842a143d3..fb4c885eb26c282107e307194070acbb9e6117f2 100644 (file)
@@ -42,7 +42,7 @@ http
 HTTP GET with bad chunked Transfer-Encoding
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/36
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -53,7 +53,7 @@ http://%HOSTIP:%HTTPPORT/36
 56
 </errorcode>
 <protocol>
-GET /36 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index f466277b28d94415dc1bdc3497e92ef2a2856d00..e67c847ed5a5aae902bfd0e3fae5e370bd030663 100644 (file)
@@ -15,7 +15,7 @@ http
 Error on both --fail-with-body and --fail
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/360 --fail-with-body --fail
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail-with-body --fail
 </command>
 </client>
 
index 7d41d9244d617a4a195bb91b8ceecc7f3cc97e2a..ec135866a935f73d7285f9abf2648da5a714db0e 100644 (file)
@@ -25,19 +25,19 @@ http
 HTTP GET --fail-with-body on HTTP error return - twice
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/361 http://%HOSTIP:%HTTPPORT/361 --fail-with-body
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail-with-body
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /361 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /361 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index ad585419dcd7818b2b554124eccf23df563bfbee..ad852c224f7994214e55a7ecda5da5c92f4088a2 100644 (file)
@@ -15,7 +15,7 @@ ftp
  <name>
 FTP resume upload file with nothing to start from
  </name>
-<file name="log/test362.txt">
+<file name="log/test%TESTNUMBER.txt">
 data
     to
       see
@@ -24,7 +24,7 @@ works
   so does it?
 </file>
  <command>
-ftp://%HOSTIP:%FTPPORT/362 -T log/test362.txt --continue-at -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/test%TESTNUMBER.txt --continue-at -
 </command>
 </client>
 
@@ -43,8 +43,8 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 362\r
-STOR 362\r
+SIZE %TESTNUMBER\r
+STOR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 1dedfde79ccf08006d3dc25877cea0ea0880253b..f8798596294afcdda7f68407a240e108e397845f 100644 (file)
@@ -23,7 +23,7 @@ http
 HTTP GET with nothing returned from server
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/37
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -34,7 +34,7 @@ http://%HOSTIP:%HTTPPORT/37
 52
 </errorcode>
 <protocol>
-GET /37 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 518aae95ba6dc503199e652b972413cd880e7b88..0558700d152962e36a5a3430b7dc1adca4c3bcd7 100644 (file)
@@ -28,9 +28,9 @@ http
 HTTP resume request without server supporting it
  </name>
  <command option="no-output">
-http://%HOSTIP:%HTTPPORT/want/38 -C - --no-include -o log/fewl38.txt
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -C - --no-include -o log/fewl%TESTNUMBER.txt
 </command>
-<file name="log/fewl38.txt">
+<file name="log/fewl%TESTNUMBER.txt">
 This text is here to simulate a partly downloaded file to resume
 download on.
 </file>
@@ -42,7 +42,7 @@ download on.
 33
 </errorcode>
 <protocol>
-GET /want/38 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=78-\r
 User-Agent: curl/%VERSION\r
@@ -51,7 +51,7 @@ Accept: */*
 </protocol>
 
 # the download target file must remain untouched
-<file name="log/fewl38.txt">
+<file name="log/fewl%TESTNUMBER.txt">
 This text is here to simulate a partly downloaded file to resume
 download on.
 </file>
index e4126ce4374cf912644ee105a7f082bf447e6e90..8b00ada8c8fa9b5ce73bc297090a92a17e9ff0c7 100644 (file)
@@ -26,10 +26,10 @@ http
 HTTP RFC1867-type formposting with filename= and type=
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/39 -F name=daniel -F tool=curl --form-string "str1=@literal" --form-string "str2=<verbatim;type=xxx/yyy" -F "file=@log/test39.txt;type=moo/foobar;filename=fakerfile" -F file2=@log/test39.txt -F "file3=@\"log/test39.txt\";type=mo/foo;filename=\"f\\\\\\\\ak\\\\\\er,\\\\an\\d;.t\\\"xt\"" -F 'file4=@"log/test39.txt"; filename="A\\AA\"\"\\\"ZZZ"'
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=daniel -F tool=curl --form-string "str1=@literal" --form-string "str2=<verbatim;type=xxx/yyy" -F "file=@log/test%TESTNUMBER.txt;type=moo/foobar;filename=fakerfile" -F file2=@log/test%TESTNUMBER.txt -F "file3=@\"log/test%TESTNUMBER.txt\";type=mo/foo;filename=\"f\\\\\\\\ak\\\\\\er,\\\\an\\d;.t\\\"xt\"" -F 'file4=@"log/test%TESTNUMBER.txt"; filename="A\\AA\"\"\\\"ZZZ"'
 </command>
 # We create this file before the command is invoked!
-<file name="log/test39.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo bar
 This is a bar foo
 bar
@@ -43,7 +43,7 @@ foo
 ^(Content-Type: multipart/form-data;|-------).*
 </strip>
 <protocol>
-POST /we/want/39 HTTP/1.1\r
+POST /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -76,7 +76,7 @@ bar
 foo
 \r
 ------------------------------24e78000bd32\r
-Content-Disposition: form-data; name="file2"; filename="test39.txt"\r
+Content-Disposition: form-data; name="file2"; filename="test%TESTNUMBER.txt"\r
 Content-Type: text/plain\r
 \r
 foo bar
index e39bd82fe62115d4ddd0970065122388d229a0df..b29d7506ce65c941ecb4ead3bfdc171f74f44396 100644 (file)
@@ -37,7 +37,7 @@ http
 HTTP max-filesize and out-of-range Content-Length
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/393 --max-filesize 2000000
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 2000000
 </command>
 </client>
 
@@ -48,7 +48,7 @@ http://%HOSTIP:%HTTPPORT/393 --max-filesize 2000000
 63
 </errorcode>
 <protocol>
-GET /393 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 9245cb1e493607ac477a8724bf8d4b506fd385e2..8b0da04c2502ca9a82656f8d37a831810841ca4e 100644 (file)
@@ -36,7 +36,7 @@ http
 HTTP with rubbish in Content-Length
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/394
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -47,7 +47,7 @@ http://%HOSTIP:%HTTPPORT/394
 8
 </errorcode>
 <protocol>
-GET /394 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 2b67c9bd4326b224dab01a8eec86d1f8e75b994e..119eb47388dfd00705fcbb6c086216208dd62bd2 100644 (file)
@@ -35,7 +35,7 @@ http
 HTTP and out-of-range Content-Length
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/395
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -43,7 +43,7 @@ http://%HOSTIP:%HTTPPORT/395
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /395 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 01be58ac306331897d01ee2f0a7e19e7f4a8866a..2cd04c389be0773f126d5d669edff0806a19e758 100644 (file)
@@ -178,7 +178,7 @@ http
 HTTP GET zstd compressed content
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/396 --compressed
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>
 
@@ -189,7 +189,7 @@ http://%HOSTIP:%HTTPPORT/396 --compressed
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
-GET /396 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 0afd21c60433780751f9091ca8b46b4a05a8396c..9bc65e994128b94d5f28288adc62b58b83e83168 100644 (file)
@@ -174,7 +174,7 @@ http
 HTTP GET zstd compressed content of size more than CURL_MAX_WRITE_SIZE
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/397 --compressed
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>
 
@@ -185,7 +185,7 @@ http://%HOSTIP:%HTTPPORT/397 --compressed
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
-GET /397 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 271b1ebe70627b29c20b954be60331db1bf4c9fb..c0b4f05d33aff516b607590b9b1b9867407c39ea 100644 (file)
@@ -30,7 +30,7 @@ http
 Replaced internal and added custom HTTP headers
  </name>
  <command>
- -H "extra-header: here" -H "Accept: replaced" -H "X-Custom-Header;" -H "X-Test: foo; " -H "X-Test:" -H "X-Test2: foo;" -H "X-Test3:  " -H "X-Test4;  " -H "X-Test5;ignored" http://%HOSTIP:%HTTPPORT/4 http://%HOSTIP:%HTTPPORT/4
+ -H "extra-header: here" -H "Accept: replaced" -H "X-Custom-Header;" -H "X-Test: foo; " -H "X-Test:" -H "X-Test2: foo;" -H "X-Test3:  " -H "X-Test4;  " -H "X-Test5;ignored" http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -38,7 +38,7 @@ Replaced internal and added custom HTTP headers
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /4 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 extra-header: here\r
@@ -47,7 +47,7 @@ X-Custom-Header:
 X-Test: foo; \r
 X-Test2: foo;\r
 \r
-GET /4 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 extra-header: here\r
index d4daba0f291cd5964ee36a4a6a49b8c5ab1cbad3..ad437d07def0aca2d1d95ad33151396ba76bac91 100644 (file)
@@ -11,7 +11,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 302 OK swsclose\r
-Location: ../moo.html/?name=d a niel&testcase=/400002    \r
+Location: ../moo.html/?name=d a niel&testcase=/%TESTNUMBER0002    \r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Connection: close\r
 \r
@@ -27,9 +27,9 @@ body
 <datacheck>
 HTTP/1.1 302 OK swsclose\r
 %if !hyper
-Location: ../moo.html/?name=d a niel&testcase=/400002    \r
+Location: ../moo.html/?name=d a niel&testcase=/%TESTNUMBER0002    \r
 %else
-Location: ../moo.html/?name=d a niel&testcase=/400002\r
+Location: ../moo.html/?name=d a niel&testcase=/%TESTNUMBER0002\r
 %endif
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Connection: close\r
@@ -53,7 +53,7 @@ http
 HTTP redirect with whitespace after ? (and conversion)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/are/all/twits/40 -L
+http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 </command>
 </client>
 
@@ -61,12 +61,12 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/40 -L
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/are/all/twits/40 HTTP/1.1\r
+GET /we/are/all/twits/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /we/are/all/moo.html/?name=d+a+niel&testcase=/400002 HTTP/1.1\r
+GET /we/are/all/moo.html/?name=d+a+niel&testcase=/%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 1bb9fb1f289c54eef43ebb171dcf0d865b8d2203..ac4af97724e9d955418b0a819f966dbdd335dcbc 100644 (file)
@@ -19,7 +19,7 @@ ftps
  <name>
 FTPS PASV upload file
  </name>
-<file name="log/test401.txt">
+<file name="log/test%TESTNUMBER.txt">
 data
     to
       see
@@ -28,7 +28,7 @@ works
   so does it?
 </file>
  <command>
--k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/401 -T log/test401.txt
+-k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/%TESTNUMBER -T log/test%TESTNUMBER.txt
 </command>
 </client>
 
@@ -50,7 +50,7 @@ PROT C
 PWD\r
 EPSV\r
 TYPE I\r
-STOR 401\r
+STOR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 3060c997a7da19db432faa0a069548c3fb4f1652..5c7bc678e288e02a21eb77daca714197487c744c 100644 (file)
@@ -19,7 +19,7 @@ ftp
 FTP SSL required on non-SSL server
  </name>
  <command>
--k --ftp-ssl-reqd ftp://%HOSTIP:%FTPPORT/402
+-k --ftp-ssl-reqd ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
index 28d8b57246d5a9e9dabf87b8aa6374368a46088f..fc291d1ab8124ce965b1866fe690fc6ac918adef 100644 (file)
@@ -19,7 +19,7 @@ ftp
 FTPS operation to FTP port
  </name>
  <command>
--m 5 -k ftps://%HOSTIP:%FTPPORT/path/to/file/405
+-m 5 -k ftps://%HOSTIP:%FTPPORT/path/to/file/%TESTNUMBER
 </command>
 </client>
 
index ca06838af5d0652a4040204938c312c5d3f9065e..4f2591e9810fbda44a93b346f8d42dd788e791d9 100644 (file)
@@ -29,7 +29,7 @@ ftps
 Get two FTPS files from the same remote dir: no second CWD
  </name>
  <command>
--k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/a/path/407 ftps://%HOSTIP:%FTPSPORT/a/path/407
+-k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/a/path/%TESTNUMBER ftps://%HOSTIP:%FTPSPORT/a/path/%TESTNUMBER
 </command>
 <stdout>
 data blobb
@@ -49,11 +49,11 @@ CWD a
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE 407\r
-RETR 407\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 EPSV\r
-SIZE 407\r
-RETR 407\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 68b42b29f58b5e4ba4504ef13658ef644c3a6186..2516fc3323f71b1d020b4edf1b138df485989ac7 100644 (file)
@@ -25,9 +25,9 @@ ftps
 FTPS PORT upload with CWD
  </name>
  <command>
--k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/CWD/STOR/RETR/408 -T log/upload408 -P -
+-k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/CWD/STOR/RETR/%TESTNUMBER -T log/upload%TESTNUMBER -P -
 </command>
-<file name="log/upload408">
+<file name="log/upload%TESTNUMBER">
 Moooooooooooo
  upload this
 </file>
@@ -51,7 +51,7 @@ CWD STOR
 CWD RETR\r
 PORT 127,0,0,1,5,109\r
 TYPE I\r
-STOR 408\r
+STOR %TESTNUMBER\r
 QUIT\r
 </protocol>
 <upload>
index 00100bced358e83c1ababf8d62ddb95683ad3a44..ea6e79560969741670811ff7eb9df7609f797194 100644 (file)
@@ -19,7 +19,7 @@ ftps
  <name>
 FTPS PASV upload file
  </name>
-<file name="log/test409.txt">
+<file name="log/test%TESTNUMBER.txt">
 data
     to
       see
@@ -28,7 +28,7 @@ works
   so does it?
 </file>
  <command>
--k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/409 -T log/test409.txt
+-k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/%TESTNUMBER -T log/test%TESTNUMBER.txt
 </command>
 </client>
 
@@ -50,7 +50,7 @@ PROT C
 PWD\r
 EPSV\r
 TYPE I\r
-STOR 409\r
+STOR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 08eca38c9bafd804ed4660acb842bb3ab6636240..aaf0ae78b97ad31834428b15eef48851b4886da4 100644 (file)
@@ -19,7 +19,7 @@ http
 HTTP formpost with missing file
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/41 -F moo=@boo
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -F moo=@boo
 </command>
 </client>
 
index 4d5d660514f3cfcb8b82f84464fae9c898dae5a7..06999fbaa4ef0a0f7f0d3b6ea4a6e8ed7488289d 100644 (file)
@@ -32,11 +32,11 @@ https
 HTTPS GET with very long request header
  </name>
 # 14 characters repeated 3500 times makes 49000 bytes
-<file name="log/file410">
+<file name="log/file%TESTNUMBER">
 Long: %repeat[3500 x header content]%
 </file>
  <command>
--k https://%HOSTIP:%HTTPSPORT/410 -H @log/file410
+-k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER -H @log/file%TESTNUMBER
 </command>
 </client>
 
@@ -44,7 +44,7 @@ Long: %repeat[3500 x header content]%
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /410 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPSPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index deca03c1d1c9cebb14006c293b43b598d6b9d441..835f18185e23e39d164b6cab145a5eda9de0459f 100644 (file)
@@ -11,7 +11,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 302 OK swsclose\r
-Location: ../m o o.html/420002    \r
+Location: ../m o o.html/%TESTNUMBER0002    \r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Connection: close\r
 \r
@@ -27,9 +27,9 @@ body
 <datacheck>
 HTTP/1.1 302 OK swsclose\r
 %if !hyper
-Location: ../m o o.html/420002    \r
+Location: ../m o o.html/%TESTNUMBER0002    \r
 %else
-Location: ../m o o.html/420002\r
+Location: ../m o o.html/%TESTNUMBER0002\r
 %endif
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Connection: close\r
@@ -53,7 +53,7 @@ http
 HTTP redirect with whitespace in path (and conversion)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/are/all/twits/42 -L
+http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 </command>
 </client>
 
@@ -61,12 +61,12 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/42 -L
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/are/all/twits/42 HTTP/1.1\r
+GET /we/are/all/twits/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /we/are/all/m%20o%20o.html/420002 HTTP/1.1\r
+GET /we/are/all/m%20o%20o.html/%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 74d9b56a3425d0b890f7ef2b5a1dd459b7c5eb58..4e7408be139cf7b20a7d5664f2b19afcf4c23a93 100644 (file)
@@ -13,7 +13,7 @@ HTTP proxy
 HTTP/1.1 301 This is a weirdo text message
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: data/430002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Connection: close
 
 This server reply is for testing a simple Location: following
@@ -32,7 +32,7 @@ If this is received, the location following worked
 HTTP/1.1 301 This is a weirdo text message
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: data/430002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Connection: close
 
 HTTP/1.1 200 Followed here fine swsclose
@@ -54,7 +54,7 @@ http
 HTTP Location: following over HTTP proxy
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/43 -L -x %HOSTIP:%HTTPPORT
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -x %HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -64,13 +64,13 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/want/43 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://%HOSTIP:%HTTPPORT/want/data/430002.txt?coolsite=yes HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 4a669ff7ed6651cfd11289f9ae52f86c44c2fa50..e3aae0bef948dcc48d9079a102c52b23a6637c73 100644 (file)
@@ -37,21 +37,21 @@ Content-Type: text/3
 #
 # Client-side
 <client>
-<file1 name="log/config430-a">
+<file1 name="log/config%TESTNUMBER-a">
 --next
-url = %HOSTIP:%HTTPPORT/4300001
+url = %HOSTIP:%HTTPPORT/%TESTNUMBER0001
 header = "a: a"
 data = "a"
 </file1>
-<file2 name="log/config430-b">
+<file2 name="log/config%TESTNUMBER-b">
 --next
-url = %HOSTIP:%HTTPPORT/4300002
+url = %HOSTIP:%HTTPPORT/%TESTNUMBER0002
 header = "b: b"
 data = "b"
 </file2>
-<file3 name="log/config430-c">
+<file3 name="log/config%TESTNUMBER-c">
 --next
-url = %HOSTIP:%HTTPPORT/4300003
+url = %HOSTIP:%HTTPPORT/%TESTNUMBER0003
 header = "c: c"
 data = "c"
 </file3>
@@ -63,7 +63,7 @@ http
 Three -K uses with --next and --data in each
  </name>
  <command>
--K log/config430-a -K log/config430-b -K log/config430-c
+-K log/config%TESTNUMBER-a -K log/config%TESTNUMBER-b -K log/config%TESTNUMBER-c
 </command>
 </client>
 
@@ -71,7 +71,7 @@ Three -K uses with --next and --data in each
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /4300001 HTTP/1.1\r
+POST /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -79,7 +79,7 @@ a: a
 Content-Length: 1\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-aPOST /4300002 HTTP/1.1\r
+aPOST /%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -87,7 +87,7 @@ b: b
 Content-Length: 1\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-bPOST /4300003 HTTP/1.1\r
+bPOST /%TESTNUMBER0003 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 8f045482be79c80d047f8a7acfd4e2c12e0f6cdb..bebe62017e274183c285bd1b77aa96444b469cef 100644 (file)
@@ -37,15 +37,15 @@ Content-Type: text/3
 #
 # Client-side
 <client>
-<file1 name="log/config431-a">
+<file1 name="log/config%TESTNUMBER-a">
 --next
-url = %HOSTIP:%HTTPPORT/4310001
+url = %HOSTIP:%HTTPPORT/%TESTNUMBER0001
 header = "a: a"
 data = "a"
 </file1>
-<file2 name="log/config431-b">
+<file2 name="log/config%TESTNUMBER-b">
 --next
-url = %HOSTIP:%HTTPPORT/4310002
+url = %HOSTIP:%HTTPPORT/%TESTNUMBER0002
 header = "b: b"
 data = "b"
 </file2>
@@ -57,7 +57,7 @@ http
 Two -K uses with --next and then one on cmdline
  </name>
  <command>
--K log/config431-a -K log/config431-b --next -d c %HOSTIP:%HTTPPORT/4310003 -H "c: c"
+-K log/config%TESTNUMBER-a -K log/config%TESTNUMBER-b --next -d c %HOSTIP:%HTTPPORT/%TESTNUMBER0003 -H "c: c"
 </command>
 </client>
 
@@ -65,7 +65,7 @@ Two -K uses with --next and then one on cmdline
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /4310001 HTTP/1.1\r
+POST /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -73,7 +73,7 @@ a: a
 Content-Length: 1\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-aPOST /4310002 HTTP/1.1\r
+aPOST /%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -81,7 +81,7 @@ b: b
 Content-Length: 1\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-bPOST /4310003 HTTP/1.1\r
+bPOST /%TESTNUMBER0003 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index a7bc37886ef90467e9b7565e1491d6edae8746ca..e7fe45b3741f0a4e52dee4ca14f4ffe35edc090c 100644 (file)
@@ -37,20 +37,20 @@ Content-Type: text/3
 #
 # Client-side
 <client>
-<file1 name="log/config432">
+<file1 name="log/config%TESTNUMBER">
 --next
-url = %HOSTIP:%HTTPPORT/4320001
+url = %HOSTIP:%HTTPPORT/%TESTNUMBER0001
 header = "a: a"
 data = "a"
 --next
-url = %HOSTIP:%HTTPPORT/4320002
+url = %HOSTIP:%HTTPPORT/%TESTNUMBER0002
 header = "b: b"
 data = "b"
-config = "log/config432-c"
+config = "log/config%TESTNUMBER-c"
 </file1>
-<file2 name="log/config432-c">
+<file2 name="log/config%TESTNUMBER-c">
 --next
-url = %HOSTIP:%HTTPPORT/4320003
+url = %HOSTIP:%HTTPPORT/%TESTNUMBER0003
 header = "c: c"
 data = "c"
 </file2>
@@ -62,7 +62,7 @@ http
 Use -K with --next and --config from within
  </name>
  <command>
--K log/config432
+-K log/config%TESTNUMBER
 </command>
 </client>
 
@@ -70,7 +70,7 @@ Use -K with --next and --config from within
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /4320001 HTTP/1.1\r
+POST /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -78,7 +78,7 @@ a: a
 Content-Length: 1\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-aPOST /4320002 HTTP/1.1\r
+aPOST /%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -86,7 +86,7 @@ b: b
 Content-Length: 1\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-bPOST /4320003 HTTP/1.1\r
+bPOST /%TESTNUMBER0003 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 9658ded0bf0f94624c6537a95b1305cf33539265..fd9e26be8f4af3e0727e991399508bc684c63bf1 100644 (file)
@@ -37,7 +37,7 @@ CURL_HOME=
 Verify XDG_CONFIG_HOME use to find .curlrc
 </name>
 <command>
-%HOSTIP:%HTTPPORT/433
+%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -45,7 +45,7 @@ Verify XDG_CONFIG_HOME use to find .curlrc
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /433 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index a2bcc0cbdfac09f00bdd8a73e3d0bc082cd5fe15..6263d5519780e88c8ee6c5180100ee2d0d1912b2 100644 (file)
@@ -19,8 +19,8 @@ Content-Type: text/1
 
 #
 <client>
-<file name="log/config434" nonewline="yes">
-url = %HOSTIP:%HTTPPORT/434
+<file name="log/config%TESTNUMBER" nonewline="yes">
+url = %HOSTIP:%HTTPPORT/%TESTNUMBER
 </file>
 <server>
 http
@@ -29,14 +29,14 @@ http
 -K with a single line without newline
 </name>
 <command>
--K log/config434
+-K log/config%TESTNUMBER
 </command>
 </client>
 
 #
 <verify>
 <protocol>
-GET /434 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 0678ed5b736a603c4f8c5ce77d27348db46f4158..0ec2f4b79474b64947a9f6f54c731fd9cadb856e 100644 (file)
@@ -27,10 +27,10 @@ http
 HTTP RFC1867-type formposting without Expect: header
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/44 -F name=daniel -F tool=curl -F file=@log/test44.txt -H "Expect:"
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@log/test%TESTNUMBER.txt -H "Expect:"
 </command>
 # We create this file before the command is invoked!
-<file name="log/test44.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo-
 This is a moo-
 bar
@@ -43,7 +43,7 @@ bar
 ^(Content-Type: multipart/form-data;|------).*
 </strip>
 <protocol>
-POST /we/want/44 HTTP/1.1\r
+POST /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -59,7 +59,7 @@ Content-Disposition: form-data; name="tool"
 \r
 curl\r
 ------------------------------7c633d5c27ce\r
-Content-Disposition: form-data; name="file"; filename="test44.txt"\r
+Content-Disposition: form-data; name="file"; filename="test%TESTNUMBER.txt"\r
 Content-Type: text/plain\r
 \r
 foo-
index 4fe6e0142826bda49e5b04d948a7df9f932b9588..0368882d67834d65c9af1d11c7668f22cd7e28d8 100644 (file)
@@ -12,7 +12,7 @@ followlocation
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: data.cgi?moo=http://&/450002
+Location: data.cgi?moo=http://&/%TESTNUMBER0002
 Connection: close
 
 This server reply is for testing a simple Location: following
@@ -31,7 +31,7 @@ If this is received, the location following worked
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: data.cgi?moo=http://&/450002
+Location: data.cgi?moo=http://&/%TESTNUMBER0002
 Connection: close
 
 HTTP/1.1 200 Followed here fine swsclose
@@ -53,19 +53,19 @@ http
 simple HTTP Location: without protocol in initial URL
  </name>
  <command>
-%HOSTIP:%HTTPPORT/want/45 -L
+%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/45 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /want/data.cgi?moo=http://&/450002 HTTP/1.1\r
+GET /want/data.cgi?moo=http://&/%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index dba69068c7bf010ceeffea0e3f2f9fdc269e2f83..91e24cbaff87cf0ba9785ef3556b72a23fcf807f 100644 (file)
@@ -43,9 +43,9 @@ HTTP with bad domain name, get cookies and store in cookie jar
 TZ=GMT
 </setenv>
  <command>
-domain..tld:%HTTPPORT/want/46 --resolve domain..tld:%HTTPPORT:%HOSTIP -c log/jar46 -b log/injar46
+domain..tld:%HTTPPORT/want/%TESTNUMBER --resolve domain..tld:%HTTPPORT:%HOSTIP -c log/jar%TESTNUMBER -b log/injar%TESTNUMBER
 </command>
-<file name="log/injar46">
+<file name="log/injar%TESTNUMBER">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This is generated by libcurl!  Do not edit.
@@ -61,14 +61,14 @@ domain..tld FALSE   /want   FALSE   0       empty
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/46 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: domain..tld:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Cookie: empty=; mooo2=indeed2; mooo=indeed\r
 \r
 </protocol>
-<file name="log/jar46" mode="text">
+<file name="log/jar%TESTNUMBER" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
index cb76845602e37a81fc4afc45a8dd9dfadb194723..e506b346bf362d4ef9a3a6eac5cae10631098bd7 100644 (file)
@@ -28,7 +28,7 @@ http
 simple HTTP 1.0 GET
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/47 -0
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -0
 </command>
 </client>
 
@@ -36,7 +36,7 @@ http://%HOSTIP:%HTTPPORT/47 -0
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /47 HTTP/1.0\r
+GET /%TESTNUMBER HTTP/1.0\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index d7fe790c787002290a9b94548eb9740179806e48..c983768341443ec878f018d737bea9766f5e7985 100644 (file)
@@ -29,7 +29,7 @@ http
 HTTP with -d and -G and -I
  </name>
  <command>
--d "foo=moo&moo=poo" http://%HOSTIP:%HTTPPORT/48 -G -I http://%HOSTIP:%HTTPPORT/48
+-d "foo=moo&moo=poo" http://%HOSTIP:%HTTPPORT/%TESTNUMBER -G -I http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -37,12 +37,12 @@ HTTP with -d and -G and -I
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-HEAD /48?foo=moo&moo=poo HTTP/1.1\r
+HEAD /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-HEAD /48?foo=moo&moo=poo HTTP/1.1\r
+HEAD /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index ee5fa91f8542c55f62fe4c117e6895986ec94ad9..79890d68b4eedfdad4bdcc477b17112f15df1067 100644 (file)
@@ -11,7 +11,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 302 OK swsclose
-Location: ../moo.html/490002
+Location: ../moo.html/%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
 
@@ -26,7 +26,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 302 OK swsclose
-Location: ../moo.html/490002
+Location: ../moo.html/%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
 
@@ -49,7 +49,7 @@ http
 HTTP follow redirect with ../
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/are/all/twits/49 -L
+http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 </command>
 </client>
 
@@ -57,12 +57,12 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/49 -L
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/are/all/twits/49 HTTP/1.1\r
+GET /we/are/all/twits/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /we/are/all/moo.html/490002 HTTP/1.1\r
+GET /we/are/all/moo.html/%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 456521599c31b71544e3e7a3ece95c3f1b21ef2a..2d4cf1604a9cfcf9750fd8c5c7525066d698f610 100644 (file)
@@ -35,9 +35,9 @@ http
 Two globbed HTTP PUTs
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/490 -T '{log/in490,log/in490}'
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T '{log/in%TESTNUMBER,log/in%TESTNUMBER}'
 </command>
-<file name="log/in490">
+<file name="log/in%TESTNUMBER">
 surprise!
 </file>
 </client>
@@ -46,7 +46,7 @@ surprise!
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /490 HTTP/1.1\r
+PUT /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -54,7 +54,7 @@ Content-Length: 10
 Expect: 100-continue\r
 \r
 surprise!
-PUT /490 HTTP/1.1\r
+PUT /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index f99dbe5528c765eb2776fffeda2e5c2d04d23659..5f2c27d6a27ef57dc4023dc40bcd771305d08f38 100644 (file)
@@ -35,9 +35,9 @@ http
 Two globbed HTTP PUTs, the second upload file is missing
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/491 -T '{log/in491,log/bad491}'
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T '{log/in%TESTNUMBER,log/bad%TESTNUMBER}'
 </command>
-<file name="log/in491">
+<file name="log/in%TESTNUMBER">
 surprise!
 </file>
 </client>
@@ -46,7 +46,7 @@ surprise!
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /491 HTTP/1.1\r
+PUT /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 63e7bb96fba73cfe35df990d10bbd6bc30c0fe8b..aedaf5b8a4fc0965ddc7902c662760176ef08792 100644 (file)
@@ -35,13 +35,13 @@ http
 Two globbed HTTP PUTs to two globbed URLs
  </name>
  <command>
-'http://%HOSTIP:%HTTPPORT/{one,two}/' -T '{log/first492,log/second492}' -H "Testno: 492"
+'http://%HOSTIP:%HTTPPORT/{one,two}/' -T '{log/first%TESTNUMBER,log/second%TESTNUMBER}' -H "Testno: %TESTNUMBER"
 </command>
-<file name="log/first492">
-first 492 contents
+<file name="log/first%TESTNUMBER">
+first %TESTNUMBER contents
 </file>
-<file1 name="log/second492">
-second 492 contents
+<file1 name="log/second%TESTNUMBER">
+second %TESTNUMBER contents
 </file1>
 </client>
 
@@ -49,42 +49,42 @@ second 492 contents
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /one/first492 HTTP/1.1\r
+PUT /one/first%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
-Testno: 492\r
+Testno: %TESTNUMBER\r
 Content-Length: 19\r
 Expect: 100-continue\r
 \r
-first 492 contents
-PUT /two/first492 HTTP/1.1\r
+first %TESTNUMBER contents
+PUT /two/first%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
-Testno: 492\r
+Testno: %TESTNUMBER\r
 Content-Length: 19\r
 Expect: 100-continue\r
 \r
-first 492 contents
-PUT /one/second492 HTTP/1.1\r
+first %TESTNUMBER contents
+PUT /one/second%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
-Testno: 492\r
+Testno: %TESTNUMBER\r
 Content-Length: 20\r
 Expect: 100-continue\r
 \r
-second 492 contents
-PUT /two/second492 HTTP/1.1\r
+second %TESTNUMBER contents
+PUT /two/second%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
-Testno: 492\r
+Testno: %TESTNUMBER\r
 Content-Length: 20\r
 Expect: 100-continue\r
 \r
-second 492 contents
+second %TESTNUMBER contents
 </protocol>
 </verify>
 </testcase>
index ebb9884b2ae9e745c494f25ccd666e81ef6d34e2..bb0b5dee75bab9143f0be0008bf827b5b58ec5d3 100644 (file)
@@ -29,7 +29,7 @@ http
 HSTS
 </features>
 
-<file name="log/input493">
+<file name="log/input%TESTNUMBER">
 .hsts.example "20311001 04:47:41"
 </file>
 
@@ -37,7 +37,7 @@ HSTS
 HSTS and %{url_effective} after upgrade
 </name>
 <command>
--x http://%HOSTIP:%HTTPPORT http://this.hsts.example/493 --hsts log/input493 -w '%{url_effective}\n'
+-x http://%HOSTIP:%HTTPPORT http://this.hsts.example/%TESTNUMBER --hsts log/input%TESTNUMBER -w '%{url_effective}\n'
 </command>
 </client>
 
@@ -51,7 +51,7 @@ Proxy-Connection: Keep-Alive
 \r
 </protocol>
 <stdout>
-https://this.hsts.example/493
+https://this.hsts.example/%TESTNUMBER
 </stdout>
 # Proxy CONNECT aborted
 <errorcode>
index 161fdceb3ad05f1e03d1fe44f64984fbee14ba2c..4e8cd46eefddc3285603f3468b920371fefce10d 100644 (file)
@@ -29,7 +29,7 @@ http
 HTTP over proxy
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/that/page/5#5 -x %HOSTIP:%HTTPPORT
+http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER#5 -x %HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -40,7 +40,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/we/want/that/page/5 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index b188263eaebb0d074bcdbd9fa6693011914ed56f..308095e38cf3084e85a84672d569fc3fcb331adb 100644 (file)
@@ -11,7 +11,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 302 OK swsclose
-Location: ../../moo.html/500002
+Location: ../../moo.html/%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:50:00 GMT
 Connection: close
 
@@ -26,7 +26,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 302 OK swsclose
-Location: ../../moo.html/500002
+Location: ../../moo.html/%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:50:00 GMT
 Connection: close
 
@@ -49,7 +49,7 @@ http
 HTTP follow redirect with ../../
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/are/all/twits/50 -L
+http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 </command>
 </client>
 
@@ -57,12 +57,12 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/50 -L
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/are/all/twits/50 HTTP/1.1\r
+GET /we/are/all/twits/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /we/are/moo.html/500002 HTTP/1.1\r
+GET /we/are/moo.html/%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index b0c76b2ebbcc6d0602168a715d2b5541cc3bf5d7..e0d8e93d3feb8547144d0895a79b4722f4647107 100644 (file)
@@ -38,18 +38,18 @@ lib500
 simple libcurl HTTP GET tool
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/500 log/ip500
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER log/ip%TESTNUMBER
 </command>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/ip500">
+<file name="log/ip%TESTNUMBER">
 IP: %HOSTIP
 </file>
 <protocol>
-GET /500 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
index 8b3dac7ede59a9392494b8de3b589908775814bf..b86642f6a3269f3687585b60b03d5d91f9cf680f 100644 (file)
@@ -19,14 +19,14 @@ http
 </features>
 # tool is what to use instead of 'curl'
 <tool>
-lib501
+lib%TESTNUMBER
 </tool>
 
  <name>
 simple libcurl attempt operation without URL set
  </name>
  <command>
-http://%HOSTIP:%NOLISTENPORT/501
+http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER
 </command>
 </client>
 
index f8d776b6c8dd05b0c9840e10b62be4c58fcd378a..11212572d6cd51ee1e1d321c881cf262ada2a289 100644 (file)
@@ -23,16 +23,16 @@ file
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib502
+lib%TESTNUMBER
 </tool>
 
  <name>
 simple multi file:// get
  </name>
  <command>
-file://%PWD/log/test502.txt
+file://%PWD/log/test%TESTNUMBER.txt
 </command>
-<file name="log/test502.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo
    bar swsclose
 bar
index c8fb34e6b0dedccdd795152898a91da9939aae1f..1ad7a552d18e805df60a061e50de382f76cf8c79 100644 (file)
@@ -48,7 +48,7 @@ http-proxy
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib503
+lib%TESTNUMBER
 </tool>
 <features>
 proxy
@@ -57,9 +57,9 @@ proxy
 simple multi http:// through proxytunnel with authentication info
  </name>
  <command>
-http://machine.503:%HTTPPORT/503 %HOSTIP:%PROXYPORT
+http://machine.%TESTNUMBER:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT
 </command>
-<file name="log/test503.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo
    bar
 bar
@@ -71,15 +71,15 @@ moo
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT machine.503:%HTTPPORT HTTP/1.1\r
-Host: machine.503:%HTTPPORT\r
+CONNECT machine.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
+Host: machine.%TESTNUMBER:%HTTPPORT\r
 Proxy-Authorization: Basic dGVzdDppbmc=\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>
-GET /503 HTTP/1.1\r
-Host: machine.503:%HTTPPORT\r
+GET /%TESTNUMBER HTTP/1.1\r
+Host: machine.%TESTNUMBER:%HTTPPORT\r
 Authorization: Basic dGVzdDppbmc=\r
 Accept: */*\r
 \r
index 351ae749f200f0571691bff1de8cfc45cb5d4c39..05061e2a897fca7ba51aff79fdf304af029754de 100644 (file)
@@ -25,14 +25,14 @@ proxy
 </features>
 # tool is what to use instead of 'curl'
 <tool>
-lib504
+lib%TESTNUMBER
 </tool>
 
  <name>
 simple multi through local proxy without listener
  </name>
  <command>
-http://%HOSTIP:%NOLISTENPORT/504 %HOSTIP:%NOLISTENPORT
+http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER %HOSTIP:%NOLISTENPORT
 </command>
 </client>
 
index a5e5d31fe1ceaea8055f5a8bb567ec45a12d7b69..13ddc62d738cfae448f12d1431cbdeed17a0917a 100644 (file)
@@ -16,16 +16,16 @@ ftp
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib505
+lib%TESTNUMBER
 </tool>
 
  <name>
 FTP upload with rename after transfer
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/505 log/upload505
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER log/upload%TESTNUMBER
 </command>
-<file name="log/upload505">
+<file name="log/upload%TESTNUMBER">
 Contents
 of
 a file
@@ -57,9 +57,9 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-STOR 505\r
-RNFR 505\r
-RNTO 505-forreal\r
+STOR %TESTNUMBER\r
+RNFR %TESTNUMBER\r
+RNTO %TESTNUMBER-forreal\r
 QUIT\r
 </protocol>
 </verify>
index cb756c317887e7b9c544899f603068d660f532e3..44f3afd224a44b76efb5f2d5ded2c8bd56097dae 100644 (file)
@@ -71,10 +71,10 @@ HTTP with shared cookie list (and dns cache)
 TZ=GMT
 </setenv>
 <tool>
-lib506
+lib%TESTNUMBER
 </tool>
 <command>
-http://%HOSTIP:%HTTPPORT/506
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -233,7 +233,7 @@ lock:   share  [Pigs in space]: 98
 unlock: share  [Pigs in space]: 99
 GLOBAL_CLEANUP
 </stdout>
-<file name="log/jar506" mode="text">
+<file name="log/jar%TESTNUMBER" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
index 9549bd986fd46992e76ec93633458a06cc3d183d..49d75176085a37d1574a3329a9f104d9640821b6 100644 (file)
@@ -21,7 +21,7 @@ http
 multi interface get with non-existing host name
 </name>
 <tool>
-lib507
+lib%TESTNUMBER
 </tool>
 <command>
 http://non-existing-host.haxx.se/
index a4ee1c3a5f3f74b65e2d1aa6312955f51bd2b4fa..143fe317163a03977a850932be0f2f843319cc13 100644 (file)
@@ -27,14 +27,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib508
+lib%TESTNUMBER
 </tool>
 
  <name>
 send HTTP POST using read callback
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/508
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -46,7 +46,7 @@ http://%HOSTIP:%HTTPPORT/508
 s/^(this is what we post to the silly web server)\r\n/$1\n/ if($has_charconv)
 </strippart>
 <protocol>
-POST /508 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Content-Length: 45\r
index 0e0dd212b907c6ce7d86c17f19ae0a86328159b8..4cdbe80dba3444aca0fb0c8a42f0f621629b8f04 100644 (file)
@@ -19,7 +19,7 @@ http
 </features>
 # tool is what to use instead of 'curl'
 <tool>
-lib509
+lib%TESTNUMBER
 </tool>
 
 <name>
index 27eba3b06314f148ee61350bf5dff9f58a641434..9bb28654c0d7214dd9485d539dafacbc80d0e8a9 100644 (file)
@@ -11,7 +11,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 302 OK swsclose
-Location: ../../../../../../../510002
+Location: ../../../../../../../%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:50:00 GMT
 Connection: close
 
@@ -26,7 +26,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 302 OK swsclose
-Location: ../../../../../../../510002
+Location: ../../../../../../../%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:50:00 GMT
 Connection: close
 
@@ -49,7 +49,7 @@ http
 HTTP follow redirect with excessive ../
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/are/all/twits/51 -L
+http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 </command>
 </client>
 
@@ -57,12 +57,12 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/51 -L
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/are/all/twits/51 HTTP/1.1\r
+GET /we/are/all/twits/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /510002 HTTP/1.1\r
+GET /%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 5facff04b691352d1f20e1dd66502fbd2b2b0eca..415bbae27fd06e5801c980c5d83273018051841b 100644 (file)
@@ -28,14 +28,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib510
+lib%TESTNUMBER
 </tool>
 
  <name>
 send HTTP POST using read callback, using chunked transfer-encoding
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/510
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -43,7 +43,7 @@ http://%HOSTIP:%HTTPPORT/510
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST /510 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Transfer-Encoding: chunked\r
index 1a251fd8925483d3f3b3cbd5f9a415f72298590e..994907a9b00c5d5f5f3ac627737bd0418dae537f 100644 (file)
@@ -21,14 +21,14 @@ ftp
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib511
+lib%TESTNUMBER
 </tool>
 
  <name>
 FTP with FILETIME and NOBODY but missing file
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/511
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -43,7 +43,7 @@ ftp://%HOSTIP:%FTPPORT/511
 USER anonymous\r
 PASS ftp@example.com\r
 PWD\r
-MDTM 511\r
+MDTM %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index b5b83395c76cb99512a4286904bdb507fc68d2bf..6598d3162de994407d695fb65c03f09d0ba5589b 100644 (file)
@@ -26,14 +26,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib512
+lib%TESTNUMBER
 </tool>
 
  <name>
 simple curl_easy_duplicate() test
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/512
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -41,7 +41,7 @@ http://%HOSTIP:%HTTPPORT/512
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /512 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
index 00e0f77eb76c3179592789fa4acf912072047617..968da4fb75390a7590b86f1e5c9735e09c2f2384 100644 (file)
@@ -18,7 +18,7 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib513
+lib%TESTNUMBER
 </tool>
 
  <name>
@@ -26,7 +26,7 @@ send HTTP POST using read callback that returns CURL_READFUNC_ABORT
  </name>
 # the 1s post-command delay helps to prevent a spurious failure on s390
  <command delay="1">
-http://%HOSTIP:%HTTPPORT/513
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -34,7 +34,7 @@ http://%HOSTIP:%HTTPPORT/513
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST /513 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Content-Length: 1\r
index b95695bc58cc772c5cc4c659cf0864d34c6bfe11..1d5f38050080ecc3f23d44b87c798c53850368c6 100644 (file)
@@ -30,14 +30,14 @@ Funny-head: yesyes
 http
 </server>
 <tool>
-lib514
+lib%TESTNUMBER
 </tool>
  <name>
 First set options to POST and then to make HEAD
  </name>
 # the 1s post-command delay helps to prevent a spurious failure on s390
  <command delay="1">
-http://%HOSTIP:%HTTPPORT/514
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -45,7 +45,7 @@ http://%HOSTIP:%HTTPPORT/514
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-HEAD /514 HTTP/1.1\r
+HEAD /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
index 1e7fa1dc5ec52fdfabe5ffa3da6c233fc7d8afe3..42d153b03f643e5a4c01e5df4280558fdb681aba 100644 (file)
@@ -25,14 +25,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib515
+lib%TESTNUMBER
 </tool>
 
  <name>
 make a POSTFIELDS set to NULL with POSTFIELDSIZE set to zero
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/515
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -40,7 +40,7 @@ http://%HOSTIP:%HTTPPORT/515
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST /515 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Content-Length: 0\r
index 837b67eb0c2cc5f653f3c8008634cc7bc937c928..c441cfb2f5602b35480916c1d2c64cd1303d9706 100644 (file)
@@ -26,14 +26,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib516
+lib%TESTNUMBER
 </tool>
 
  <name>
 make a HTTPPOST set to NULL
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/516
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -41,7 +41,7 @@ http://%HOSTIP:%HTTPPORT/516
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST /516 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Content-Length: 0\r
index f58f4edaa48d2c6909248c13e87a0c5edf4a2da6..0152c0f29d0045e4d4ca33cb8f4d84b09aa1fd73 100644 (file)
@@ -17,7 +17,7 @@ none
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib517
+lib%TESTNUMBER
 </tool>
 
  <name>
index c9db5b7dce14986aef00e64028105578613babd4..042b6d767d56c6f81c3d60ec632b8809374579b2 100644 (file)
@@ -35,19 +35,19 @@ getrlimit
 </features>
 # tool is what to use instead of 'curl'
 <tool>
-lib518
+lib%TESTNUMBER
 </tool>
 # precheck is a command line to run before the test, to see if we can execute
 # the test or not
 <precheck>
-./libtest/lib518 check
+./libtest/lib%TESTNUMBER check
 </precheck>
 
  <name>
 HTTP GET with more than FD_SETSIZE descriptors open
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/518
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -55,7 +55,7 @@ http://%HOSTIP:%HTTPPORT/518
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /518 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
index 19fc3815827f50dba23de32b780984d163fc9b66..9b47ed28c5756b4fa3cd190c118a19d76672f1b8 100644 (file)
@@ -48,14 +48,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib519
+lib%TESTNUMBER
 </tool>
 
  <name>
 GET same URL twice with different users
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/519
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -63,12 +63,12 @@ http://%HOSTIP:%HTTPPORT/519
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /519 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic bW9uc3Rlcjp1bmRlcmJlZA==\r
 Accept: */*\r
 \r
-GET /519 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic YW5vdGhlcm1vbnN0ZXI6aW53YXJkcm9iZQ==\r
 Accept: */*\r
index b2ac9e51a62d841a624769bf263a67fc5c972644..662a4ef331488ee1f85ef4c0565e264d56d695dd 100644 (file)
@@ -11,7 +11,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 302 OK swsclose
-Location: ./520002
+Location: ./%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
 
@@ -26,7 +26,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 302 OK swsclose
-Location: ./520002
+Location: ./%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
 
@@ -49,7 +49,7 @@ http
 HTTP follow redirect with ./-prefix
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/are/all/twits/52 -L
+http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 </command>
 </client>
 
@@ -57,12 +57,12 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/52 -L
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/are/all/twits/52 HTTP/1.1\r
+GET /we/are/all/twits/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /we/are/all/twits/520002 HTTP/1.1\r
+GET /we/are/all/twits/%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 90f51b38d3a058eb06ba7af997589bddfc214314..b8b7896a5468af22c019ab57a059c0e08d1e81e5 100644 (file)
@@ -33,13 +33,13 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 ftp
 </server>
 <tool>
-lib521
+lib%TESTNUMBER
 </tool>
  <name>
 FTP dir list PASV with CURLOPT_PORT
  </name>
  <command>
-ftp://%HOSTIP/521/ %FTPPORT
+ftp://%HOSTIP/%TESTNUMBER/ %FTPPORT
 </command>
 </client>
 
@@ -50,7 +50,7 @@ ftp://%HOSTIP/521/ %FTPPORT
 USER xxx\r
 PASS yyy\r
 PWD\r
-CWD 521\r
+CWD %TESTNUMBER\r
 EPSV\r
 TYPE A\r
 LIST\r
index 7a724f3e63b69f97b65237fc4c79db66a5b5d2d7..6691a29a1578cea585e2fac46d4b25dd03de2bac 100644 (file)
@@ -36,7 +36,7 @@ lib521
 HTTP GET with CURLOPT_PORT
  </name>
  <command>
-http://%HOSTIP/522 %HTTPPORT
+http://%HOSTIP/%TESTNUMBER %HTTPPORT
 </command>
 </client>
 
@@ -44,7 +44,7 @@ http://%HOSTIP/522 %HTTPPORT
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /522 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic eHh4Onl5eQ==\r
 Accept: */*\r
index 3886a4cf8588c4f142f554f8bfabf1ffcd3f016d..88cda7a2cd5eb773eebc7e345b9a04fef1e6b098 100644 (file)
@@ -32,14 +32,14 @@ hello
 http
 </server>
 <tool>
-lib523
+lib%TESTNUMBER
 </tool>
  <name>
 HTTP GET with proxy and CURLOPT_PORT
  </name>
 # first URL then proxy
  <command>
-http://www.example.com:999/523 http://%HOSTIP:%HTTPPORT
+http://www.example.com:999/%TESTNUMBER http://%HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -50,7 +50,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://www.example.com:19999/523 HTTP/1.1\r
+GET http://www.example.com:19999/%TESTNUMBER HTTP/1.1\r
 Host: www.example.com:19999\r
 Authorization: Basic eHh4Onl5eQ==\r
 Accept: */*\r
index c60946672923c1260e3845e1ad4950d31f3a0539..13246e235dea230d83f599de8fcbb5c1f57f43e2 100644 (file)
@@ -18,7 +18,7 @@ UPLOAD
 ftp
 </server>
 <tool>
-lib524
+lib%TESTNUMBER
 </tool>
  <name>
 FTP upload with target URL ending with slash
index 7bd494e02d249cd249d2941848b85ac0f2545e0d..ce37399fcef478600bc8d69d4556b27555136782 100644 (file)
@@ -20,15 +20,15 @@ multi
 ftp
 </server>
 <tool>
-lib525
+lib%TESTNUMBER
 </tool>
  <name>
 FTP PORT upload using multi interface
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/525 log/upload525
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER log/upload%TESTNUMBER
 </command>
-<file name="log/upload525">
+<file name="log/upload%TESTNUMBER">
 Moooooooooooo
  upload this
 </file>
@@ -48,7 +48,7 @@ PWD
 CWD path\r
 PORT 127,0,0,1,5,109\r
 TYPE I\r
-STOR 525\r
+STOR %TESTNUMBER\r
 QUIT\r
 </protocol>
 <upload>
index 70e6dcd12170415e5c620e8047a13ec0d489493d..be2e4be802895501dbafd50d64ebb811aa77798b 100644 (file)
@@ -27,13 +27,13 @@ file contents should appear once for each file
 ftp
 </server>
 <tool>
-lib526
+lib%TESTNUMBER
 </tool>
  <name>
 FTP RETR same file using different handles but same connection
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/526
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>
 
@@ -46,17 +46,17 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE 526\r
-RETR 526\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 EPSV\r
-SIZE 526\r
-RETR 526\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 EPSV\r
-SIZE 526\r
-RETR 526\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 EPSV\r
-SIZE 526\r
-RETR 526\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 98892a97ea5896fb9c567fdf90a23f6457060e55..be2e4be802895501dbafd50d64ebb811aa77798b 100644 (file)
@@ -27,13 +27,13 @@ file contents should appear once for each file
 ftp
 </server>
 <tool>
-lib527
+lib%TESTNUMBER
 </tool>
  <name>
 FTP RETR same file using different handles but same connection
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/527
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>
 
@@ -46,17 +46,17 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE 527\r
-RETR 527\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 EPSV\r
-SIZE 527\r
-RETR 527\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 EPSV\r
-SIZE 527\r
-RETR 527\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 EPSV\r
-SIZE 527\r
-RETR 527\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 89e0174208daa3f4f3552aee07c3cd12f9463e1a..a55768b3365a222a37c8d642b4dfc688c63621ae 100644 (file)
@@ -37,26 +37,26 @@ lib526
 HTTP GET same file using different handles but same connection
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/path/528
+http://%HOSTIP:%HTTPPORT/path/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /path/528 HTTP/1.1\r
+GET /path/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
-GET /path/528 HTTP/1.1\r
+GET /path/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
-GET /path/528 HTTP/1.1\r
+GET /path/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
-GET /path/528 HTTP/1.1\r
+GET /path/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
index 16147201cdd94a3a56a9b73b3a82742562299b71..141166c028a157a5e7b8530b66df5e51004ef71d 100644 (file)
@@ -20,15 +20,15 @@ multi
 ftp
 </server>
 <tool>
-lib529
+lib%TESTNUMBER
 </tool>
  <name>
 FTP PORT upload using multi interface (weird cleanup function sequence)
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/529 log/upload529
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER log/upload%TESTNUMBER
 </command>
-<file name="log/upload529">
+<file name="log/upload%TESTNUMBER">
 Moooooooooooo
  upload this
 </file>
@@ -48,7 +48,7 @@ PWD
 CWD path\r
 PORT 127,0,0,1,5,109\r
 TYPE I\r
-STOR 529\r
+STOR %TESTNUMBER\r
 QUIT\r
 </protocol>
 <upload>
index bffd063e57ebf1ea9970928e0b2ccde115e37b5f..e3b9ec962527c2731b637dc913cd3551da9380cd 100644 (file)
@@ -29,9 +29,9 @@ http
 HTTP, junk session cookies
  </name>
  <command>
-%HOSTIP:%HTTPPORT/want/53 -b log/injar53 -j
+%HOSTIP:%HTTPPORT/want/%TESTNUMBER -b log/injar%TESTNUMBER -j
 </command>
-<file name="log/injar53">
+<file name="log/injar%TESTNUMBER">
 %HOSTIP        FALSE   /       FALSE   2139150993      mooo    indeed
 %HOSTIP        FALSE   /       FALSE   0               moo1    indeed
 %HOSTIP        FALSE   /       FALSE   1               moo2    indeed
@@ -41,7 +41,7 @@ HTTP, junk session cookies
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/53 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 8a7cee50aa40fa86ee37069f29d4e7c93b74f67f..17ccf68e2298012d4d34b7edb69281f253239bf2 100644 (file)
@@ -29,9 +29,9 @@ lib525
 FTP PORT upload using multi interface and get 425 response
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/531 log/upload531
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER log/upload%TESTNUMBER
 </command>
-<file name="log/upload531">
+<file name="log/upload%TESTNUMBER">
 Moooooooooooo
 don't upload this
 </file>
@@ -51,7 +51,7 @@ PWD
 CWD path\r
 PORT 127,0,0,1,5,109\r
 TYPE I\r
-STOR 531\r
+STOR %TESTNUMBER\r
 QUIT\r
 </protocol>
 
index dc45db1d2bf6aa6879f7d8c951985534ba808267..f36d0440cb8b5177688b25448de97f8a117691e2 100644 (file)
@@ -27,13 +27,13 @@ file contents should appear once for each file
 ftp
 </server>
 <tool>
-lib532
+lib%TESTNUMBER
 </tool>
  <name>
 FTP RETR same file using reset handles between each transfer
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/532
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>
 
@@ -46,17 +46,17 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE 532\r
-RETR 532\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 EPSV\r
-SIZE 532\r
-RETR 532\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 EPSV\r
-SIZE 532\r
-RETR 532\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 EPSV\r
-SIZE 532\r
-RETR 532\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index a67c8c8245c7d92a41938814926c5952adb68829..4e94f88eb69b9825b26ea6d337f3eebf55b9a756 100644 (file)
@@ -25,13 +25,13 @@ REPLY SIZE 500 Can't check for file existence
 ftp
 </server>
 <tool>
-lib533
+lib%TESTNUMBER
 </tool>
  <name>
 FTP RETR a non-existing file twice using the multi interface
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/533 ftp://%HOSTIP:%FTPPORT/path/533
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>
 
@@ -44,11 +44,11 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE 533\r
-RETR 533\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 EPSV\r
-SIZE 533\r
-RETR 533\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index ba3f721e7f393ca53bb053edc99f1fd0de40753d..764fe6647d3810af20aa5e36e10e777c049d07cf 100644 (file)
@@ -32,7 +32,7 @@ lib533
 FTP RETR twice using multi: non-existing host and non-existing file
  </name>
  <command>
-ftp://non-existing-host.haxx.se/path/534 ftp://%HOSTIP:%FTPPORT/path/534
+ftp://non-existing-host.haxx.se/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>
 
@@ -45,8 +45,8 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE 534\r
-RETR 534\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index bf914c2728a124860c23bc1b38b82cf03dc94bf0..f9e6c390a652041718581d9432082c0970043fa1 100644 (file)
@@ -48,7 +48,7 @@ lib533
 HTTP GET multi two files with FAILONERROR
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/535 http://%HOSTIP:%HTTPPORT/5350001
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001
 </command>
 </client>
 
@@ -56,11 +56,11 @@ http://%HOSTIP:%HTTPPORT/535 http://%HOSTIP:%HTTPPORT/5350001
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /535 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
-GET /5350001 HTTP/1.1\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
index b8e22a5b362bd50b380058d87ca45bf5bd31730d..ab718fd291a29e3099feafef24d2d6c30c281f2c 100644 (file)
@@ -35,19 +35,19 @@ getrlimit
 </features>
 # tool is what to use instead of 'curl'
 <tool>
-lib537
+lib%TESTNUMBER
 </tool>
 # precheck is a command line to run before the test, to see if we can execute
 # the test or not
 <precheck>
-./libtest/lib537 check
+./libtest/lib%TESTNUMBER check
 </precheck>
 
  <name>
 HTTP GET with a HUGE number of file descriptors open
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/537
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -55,7 +55,7 @@ http://%HOSTIP:%HTTPPORT/537
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /537 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
index d2fecd353ddcda8fedd77575daaef94b1e420e1c..ff53a8ed6d7adbbcc79c08d8733a900e76c1260d 100644 (file)
@@ -27,7 +27,7 @@ lib504
 FTP multi-interface download, failed login: PASS not valid
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/538
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
index a69834012a0831a853f7b5dbd268890181b18bad..12f04e921e411cda895565335944fc6c0dc72e3b 100644 (file)
@@ -37,14 +37,14 @@ ftp
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib539
+lib%TESTNUMBER
 </tool>
 
  <name>
 Two FTP fetches using different CURLOPT_FTP_FILEMETHOD
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/to/the/file/539
+ftp://%HOSTIP:%FTPPORT/path/to/the/file/%TESTNUMBER
 </command>
 </client>
 
@@ -58,13 +58,13 @@ PWD
 CWD path/to/the/file\r
 EPSV\r
 TYPE I\r
-SIZE 539\r
-RETR 539\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 SYST\r
 CWD /\r
 EPSV\r
 TYPE A\r
-LIST path/to/the/file/539.\r
+LIST path/to/the/file/%TESTNUMBER.\r
 QUIT\r
 </protocol>
 </verify>
index 3878d53dcfeea9b0c4d475170aebd5230ce48213..a9efc2929dbb4021de145c9209aeac1a5abdcdbe 100644 (file)
@@ -26,14 +26,14 @@ http
 HTTP with blank Location:
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/54 -L
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/54 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 8f53b072c644858a73994fa67d20e2f3a8ce9e51..3e240488efa1ed3ad0d2cf4779a4c58979e86126 100644 (file)
@@ -62,7 +62,7 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib540
+lib%TESTNUMBER
 </tool>
 <features>
 !SSPI
@@ -73,32 +73,32 @@ proxy
 HTTP proxy auth Digest multi API re-using connection
  </name>
  <command>
-http://test.remote.example.com/path/540 http://%HOSTIP:%HTTPPORT silly:person custom.set.host.name
+http://test.remote.example.com/path/%TESTNUMBER http://%HOSTIP:%HTTPPORT silly:person custom.set.host.name
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://test.remote.example.com/path/540 HTTP/1.1\r
+GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1\r
 Host: custom.set.host.name\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://test.remote.example.com/path/540 HTTP/1.1\r
+GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1\r
 Host: custom.set.host.name\r
-Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="/path/540", response="ca507dcf189196b6a5374d3233042261"\r
+Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="/path/%TESTNUMBER", response="ca507dcf189196b6a5374d3233042261"\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://test.remote.example.com/path/540 HTTP/1.1\r
+GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1\r
 Host: custom.set.host.name\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://test.remote.example.com/path/540 HTTP/1.1\r
+GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1\r
 Host: custom.set.host.name\r
-Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="/path/540", response="ca507dcf189196b6a5374d3233042261"\r
+Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="/path/%TESTNUMBER", response="ca507dcf189196b6a5374d3233042261"\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
index 622daa0f855f50e6f3ed2014832f63d7a80c23cc..2dc75f8a47ac4c9473ced0b67030c03edeba0bd7 100644 (file)
@@ -16,16 +16,16 @@ ftp
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib541
+lib%TESTNUMBER
 </tool>
 
  <name>
 FTP upload and upload same file again without rewind
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/541 log/upload541
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER log/upload%TESTNUMBER
 </command>
-<file name="log/upload541">
+<file name="log/upload%TESTNUMBER">
 Contents
 of
 a file
@@ -48,9 +48,9 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-STOR 541\r
+STOR %TESTNUMBER\r
 EPSV\r
-STOR 541\r
+STOR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 5afe124703a1de0315745047f0a788704c92a674..0d918fbcd0cf8ccf70fc457292de8a423a6abbb1 100644 (file)
@@ -28,13 +28,13 @@ Accept-ranges: bytes
 ftp
 </server>
 <tool>
-lib542
+lib%TESTNUMBER
 </tool>
  <name>
 FTP a file with NOBODY yes and HEADER no
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/542
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 
 </client>
@@ -49,7 +49,7 @@ USER anonymous
 PASS ftp@example.com\r
 PWD\r
 TYPE I\r
-SIZE 542\r
+SIZE %TESTNUMBER\r
 REST 0\r
 QUIT\r
 </protocol>
index f7e687c46ec3621fdab52ae8940fec829c5cf7a5..2abaa696217a14c3f01532849bb980dacfa8623a 100644 (file)
@@ -12,7 +12,7 @@ curl_easy_escape
 none
 </server>
 <tool>
-lib543
+lib%TESTNUMBER
 </tool>
  <name>
 curl_easy_escape
index 8eaef17f64c236a04a7d272d9a9c4d846aac92a2..390489706d28d7127398dae79cf48308c115ed6b 100644 (file)
@@ -26,14 +26,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib544
+lib%TESTNUMBER
 </tool>
 
  <name>
 HTTP POST text data using CURLOPT_COPYPOSTFIELDS
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/544
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -41,7 +41,7 @@ http://%HOSTIP:%HTTPPORT/544
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /544 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Content-Length: 4\r
index 725e8e9df80ea3ce2288a4cca98ac5ee8d46ced7..a06b8ebb6e3844e77e58e78d213f8e9c1b93e409 100644 (file)
Binary files a/tests/data/test545 and b/tests/data/test545 differ
index 00dca99fa46ab4f8fff935aae28f99b2a9643853..6db456f1684e27059ad36f731b723d4ef106318a 100644 (file)
@@ -38,7 +38,7 @@ lib533
 FTP RETR a non-existing file then a found one using the multi interface
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/546 ftp://%HOSTIP:%FTPPORT/path/546
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>
 
@@ -51,11 +51,11 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE 546\r
-RETR 546\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 EPSV\r
-SIZE 546\r
-RETR 546\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 <stdout>
index 5401e06c897058351e383f775931074beed2a81b..376ddbae908a7a19f404d8e23738ff203f3110d7 100644 (file)
@@ -72,7 +72,7 @@ http
 </server>
 # tool to use
 <tool>
-lib547
+lib%TESTNUMBER
 </tool>
 <features>
 NTLM
@@ -91,7 +91,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://test.remote.example.com/path/547 http://%HOSTIP:%HTTPPORT testuser:testpass
+http://test.remote.example.com/path/%TESTNUMBER http://%HOSTIP:%HTTPPORT testuser:testpass
 </command>
 <precheck>
 chkhostname curlhost
@@ -101,7 +101,7 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST http://test.remote.example.com/path/547 HTTP/1.1\r
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1\r
 Host: test.remote.example.com\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
@@ -109,7 +109,7 @@ Content-Length: 36
 Content-Type: application/x-www-form-urlencoded\r
 \r
 this is the blurb we want to upload
-POST http://test.remote.example.com/path/547 HTTP/1.1\r
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1\r
 Host: test.remote.example.com\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 Accept: */*\r
@@ -117,7 +117,7 @@ Proxy-Connection: Keep-Alive
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-POST http://test.remote.example.com/path/547 HTTP/1.1\r
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1\r
 Host: test.remote.example.com\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
 Accept: */*\r
index 3ce5ae1eae15bb75b951f82085d8f3e43a7cce60..3df4ec3ae2f2362aecd0b0ad0cef400cd407aeca 100644 (file)
@@ -72,7 +72,7 @@ http
 </server>
 # tool to use
 <tool>
-lib548
+lib%TESTNUMBER
 </tool>
 <features>
 NTLM
@@ -91,7 +91,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://test.remote.example.com/path/548 http://%HOSTIP:%HTTPPORT testuser:testpass
+http://test.remote.example.com/path/%TESTNUMBER http://%HOSTIP:%HTTPPORT testuser:testpass
 </command>
 <precheck>
 chkhostname curlhost
@@ -101,7 +101,7 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST http://test.remote.example.com/path/548 HTTP/1.1\r
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1\r
 Host: test.remote.example.com\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
@@ -109,7 +109,7 @@ Content-Length: 36
 Content-Type: application/x-www-form-urlencoded\r
 \r
 this is the blurb we want to upload
-POST http://test.remote.example.com/path/548 HTTP/1.1\r
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1\r
 Host: test.remote.example.com\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 Accept: */*\r
@@ -117,7 +117,7 @@ Proxy-Connection: Keep-Alive
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-POST http://test.remote.example.com/path/548 HTTP/1.1\r
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1\r
 Host: test.remote.example.com\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
 Accept: */*\r
index 71a421328697e74d182d0bf9f81dc925111402b7..9f6ade6fd40c5a18cafa80b5fa2838ad0f2f5587 100644 (file)
@@ -35,14 +35,14 @@ ftp
 proxy
 </features>
 <tool>
-lib549
+lib%TESTNUMBER
 </tool>
  <name>
 FTP RETR over proxy with CURLOPT_PROXY_TRANSFER_MODE
  </name>
 # first URL then proxy
  <command>
-ftp://www.example.com/moo/549 http://%HOSTIP:%HTTPPORT 
+ftp://www.example.com/moo/%TESTNUMBER http://%HOSTIP:%HTTPPORT 
 </command>
 </client>
 
@@ -50,7 +50,7 @@ ftp://www.example.com/moo/549 http://%HOSTIP:%HTTPPORT
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET ftp://www.example.com/moo/549;type=i HTTP/1.1\r
+GET ftp://www.example.com/moo/%TESTNUMBER;type=i HTTP/1.1\r
 Host: www.example.com:21\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
index 8863700e20acce1181e3fe1815e80b53cb75439c..8786d40b21cff89113fbd9887dbe768f024cdfe0 100644 (file)
@@ -9,7 +9,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 302 OK swsclose
-Location: 550002
+Location: %TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:50:00 GMT
 Connection: close
 
@@ -23,7 +23,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 302 OK swsclose
-Location: 550002
+Location: %TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:50:00 GMT
 Connection: close
 
@@ -43,18 +43,18 @@ http
 HTTP follow redirect with single slash in path
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/55 -L
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -L
 </command>
 </client>
 
 <verify>
 <protocol>
-GET /55 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /550002 HTTP/1.1\r
+GET /%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 68f42de20d6009cf7efb75fab19385cc6be1d217..233546b6a1245f742315e66c8cf9993afe414cf6 100644 (file)
@@ -42,7 +42,7 @@ FTP RETR over proxy with CURLOPT_PROXY_TRANSFER_MODE and ASCII transfer
  </name>
 # first URL then proxy
  <command>
-ftp://www.example.com/moo/550 http://%HOSTIP:%HTTPPORT ascii
+ftp://www.example.com/moo/%TESTNUMBER http://%HOSTIP:%HTTPPORT ascii
 </command>
 </client>
 
@@ -50,7 +50,7 @@ ftp://www.example.com/moo/550 http://%HOSTIP:%HTTPPORT ascii
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET ftp://www.example.com/moo/550;type=a HTTP/1.1\r
+GET ftp://www.example.com/moo/%TESTNUMBER;type=a HTTP/1.1\r
 Host: www.example.com:21\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
index 30c0ed940e6dd1984d4d8a473b6d6e3cf967c729..2a6b1f5d522c55426b01ba759af291b0dac427cb 100644 (file)
@@ -69,14 +69,14 @@ proxy
 HTTP proxy auth Digest with POST data from read callback
  </name>
  <command>
-http://test.remote.example.com/path/551 http://%HOSTIP:%HTTPPORT s1lly:pers0n
+http://test.remote.example.com/path/%TESTNUMBER http://%HOSTIP:%HTTPPORT s1lly:pers0n
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST http://test.remote.example.com/path/551 HTTP/1.1\r
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1\r
 Host: test.remote.example.com\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
@@ -84,9 +84,9 @@ Content-Length: 36
 Content-Type: application/x-www-form-urlencoded\r
 \r
 this is the blurb we want to upload
-POST http://test.remote.example.com/path/551 HTTP/1.1\r
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1\r
 Host: test.remote.example.com\r
-Proxy-Authorization: Digest username="s1lly", realm="something fun to read", nonce="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", uri="/path/551", response="3325240726fbdaf1e61f3a0dd40b930c"\r
+Proxy-Authorization: Digest username="s1lly", realm="something fun to read", nonce="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", uri="/path/%TESTNUMBER", response="3325240726fbdaf1e61f3a0dd40b930c"\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 36\r
index 9ad37bd7e00841aba51a9d650e167e411d3ec306..15d531c16d2b85f8557c64a40c7f935a6341d513 100644 (file)
@@ -51,7 +51,7 @@ http
 </server>
 # tool to use
 <tool>
-lib552
+lib%TESTNUMBER
 </tool>
 <features>
 !SSPI
@@ -62,23 +62,23 @@ proxy
 HTTP proxy auth Digest with 70K POST data from read callback
  </name>
  <command>
-http://test.remote.example.com/path/552 http://s1lly:pers0n@%HOSTIP:%HTTPPORT/
+http://test.remote.example.com/path/%TESTNUMBER http://s1lly:pers0n@%HOSTIP:%HTTPPORT/
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST http://test.remote.example.com/path/552 HTTP/1.1\r
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1\r
 Host: test.remote.example.com\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 70000\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-%repeat[7000 x test data%00]%POST http://test.remote.example.com/path/552 HTTP/1.1\r
+%repeat[7000 x test data%00]%POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1\r
 Host: test.remote.example.com\r
-Proxy-Authorization: Digest username="s1lly", realm="something fun to read", nonce="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", uri="/path/552", response="be7aedc47d821b6d847c445ded782c43"\r
+Proxy-Authorization: Digest username="s1lly", realm="something fun to read", nonce="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", uri="/path/%TESTNUMBER", response="be7aedc47d821b6d847c445ded782c43"\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 70000\r
index 3ddb53295dc1802b1c0df53a311f144349bd62b8..f640ba4d009917f5677d64d0037cb116d146ada1 100644 (file)
@@ -27,7 +27,7 @@ http
 </server>
 # tool to use
 <tool>
-lib553
+lib%TESTNUMBER
 </tool>
 <features>
 </features>
@@ -35,14 +35,14 @@ lib553
 HTTP post with huge request headers and post data from callback
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/path/553
+http://%HOSTIP:%HTTPPORT/path/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /path/553 HTTP/1.1\r
+POST /path/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Header0: %repeat[5000 x A]%\r
index 2b6693a2053703f11f60ab58e4f4e4fdda150c7c..8488be60be163c5269d1f9da938e296f73b9249d 100644 (file)
@@ -43,14 +43,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib554
+lib%TESTNUMBER
 </tool>
 
  <name>
 HTTP multi-part formpost using read callback for the file part
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/554
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -65,7 +65,7 @@ s/boundary=------------------------[a-z0-9]*/boundary=--------------------------
 # boundary string and since 5 of them are in the body contents, we see
 # (5*12) == 60 bytes less
 <protocol>
-POST /554 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Content-Length: 744\r
@@ -96,7 +96,7 @@ Content-Type: text/plain
 \r
 blah blah\r
 --------------------------------\r
-POST /554 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Content-Length: 758\r
index 506cbb4a04b87c06425101b36cb327945a7aca81..72eb81d4bbb8d240a8e2c8c0c460be63d73c8a07 100644 (file)
@@ -77,7 +77,7 @@ http
 </server>
 # tool to use
 <tool>
-lib555
+lib%TESTNUMBER
 </tool>
 <features>
 NTLM
@@ -96,7 +96,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://test.remote.example.com/path/555 http://%HOSTIP:%HTTPPORT testuser:testpass
+http://test.remote.example.com/path/%TESTNUMBER http://%HOSTIP:%HTTPPORT testuser:testpass
 </command>
 <precheck>
 chkhostname curlhost
@@ -106,7 +106,7 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST http://test.remote.example.com/path/555 HTTP/1.1\r
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1\r
 Host: test.remote.example.com\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
@@ -114,7 +114,7 @@ Content-Length: 36
 Content-Type: application/x-www-form-urlencoded\r
 \r
 this is the blurb we want to upload
-POST http://test.remote.example.com/path/555 HTTP/1.1\r
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1\r
 Host: test.remote.example.com\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 Accept: */*\r
@@ -122,7 +122,7 @@ Proxy-Connection: Keep-Alive
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-POST http://test.remote.example.com/path/555 HTTP/1.1\r
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1\r
 Host: test.remote.example.com\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
 Accept: */*\r
index 3ce0d7e23def81ed37a0cda6e672c8602cc6a3ce..6384084d494a6f1698c3e2a8380d126e4c4e3b37 100644 (file)
@@ -25,7 +25,7 @@ Connection: close
 http
 </server>
 <tool>
-lib556
+lib%TESTNUMBER
 </tool>
  <name>
 send and recv HTTP
@@ -39,7 +39,7 @@ http://%HOSTIP:%HTTPPORT
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /556 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: ninja\r
 \r
 </protocol>
index ad9350f6e216c8f639aba53dcabb993078cf47ef..1963774946ff52c2fc76ceb2029e6b5a14019bd2 100644 (file)
@@ -17,7 +17,7 @@ none
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib557
+lib%TESTNUMBER
 </tool>
 
 <name>
index d1ff65608717900b783bbb91bcfc1ce490865adb..6df79887a5028aef144a53a2ce1eaf4e20e73efe 100644 (file)
@@ -21,7 +21,7 @@ ipv6
 </features>
 # tool is what to use instead of 'curl'
 <tool>
-lib558
+lib%TESTNUMBER
 </tool>
 
 <name>
@@ -37,8 +37,8 @@ nothing
 <verify>
 <file name="log/memdump">
 MEM easy.c: malloc()
-MEM lib558.c: malloc()
-MEM lib558.c: free()
+MEM lib%TESTNUMBER.c: malloc()
+MEM lib%TESTNUMBER.c: free()
 MEM dynbuf.c: realloc()
 MEM dynbuf.c: realloc()
 MEM escape.c: free()
index 7e9f6a57d80ffcad7531f6d9776cd626d28a152d..878fe2bc859023eb1c1fc44d4406995b54ffb735 100644 (file)
@@ -31,14 +31,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib559
+lib%TESTNUMBER
 </tool>
 
 <name>
 use tiny CURLOPT_BUFFERSIZE
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/559
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
index ee21c9d21783b78b6c6c416292db3a143a3f11d3..b0701194dcb80c7f778dea914461b63e3cdd4127 100644 (file)
@@ -38,14 +38,14 @@ header "Transfer-Encoding: chunked"
 #
  </stdin>
  <command>
--K - %HOSTIP:%HTTPPORT/that.site.com/56
+-K - %HOSTIP:%HTTPPORT/that.site.com/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST /that.site.com/56 HTTP/1.1\r
+POST /that.site.com/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: %repeat[99999 x a]%\r
 Accept: */*\r
index 299883850719468f19dadf59628f1cf78459418b..0f9befb543a9ea7e706bd6507a099b7b13578fe0 100644 (file)
@@ -30,13 +30,13 @@ SSL
 https
 </server>
 <tool>
-lib560
+lib%TESTNUMBER
 </tool>
  <name>
 simple HTTPS GET with multi interface
  </name>
  <command>
-https://%HOSTIP:%HTTPSPORT/560
+https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -44,7 +44,7 @@ https://%HOSTIP:%HTTPSPORT/560
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /560 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPSPORT\r
 Accept: */*\r
 \r
index bc5fb999fbdc6f9ed1e910e8b6d29d8c7c5677ad..a630185b45f932930c23051801ca8987746fb124 100644 (file)
@@ -43,7 +43,7 @@ FTP RETR with CURLOPT_PROXY_TRANSFER_MODE, ASCII transfer and type=i
  </name>
 # first URL then proxy
  <command>
-"ftp://www.example.com/moo/561;type=i" http://%HOSTIP:%HTTPPORT ascii
+"ftp://www.example.com/moo/%TESTNUMBER;type=i" http://%HOSTIP:%HTTPPORT ascii
 </command>
 </client>
 
@@ -51,7 +51,7 @@ FTP RETR with CURLOPT_PROXY_TRANSFER_MODE, ASCII transfer and type=i
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET ftp://www.example.com/moo/561;type=i HTTP/1.1\r
+GET ftp://www.example.com/moo/%TESTNUMBER;type=i HTTP/1.1\r
 Host: www.example.com:21\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
index 35f4f53d7d9e1aeb936fba1cb6cba53d5998b534..f442a63e576c80ebf484f5a4246e7e98b11166b3 100644 (file)
@@ -20,7 +20,7 @@ over FTP
 ftp
 </server>
 <tool>
-lib562
+lib%TESTNUMBER
 </tool>
  <name>
 FTP a type=A URL and CURLOPT_PORT set
@@ -29,7 +29,7 @@ FTP a type=A URL and CURLOPT_PORT set
 # note that we need quotes around the URL below to make sure the shell doesn't
 # treat the semicolon as a separator!
  <command>
-'ftp://%HOSTIP:23456/562;type=A' %FTPPORT
+'ftp://%HOSTIP:23456/%TESTNUMBER;type=A' %FTPPORT
 </command>
 
 </client>
@@ -45,7 +45,7 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE A\r
-RETR 562\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 290087b75f39114386095d08cd41fee5a52c2487..c19b9026a2283d38892ecd9f0a91383fd8aecce2 100644 (file)
@@ -41,7 +41,7 @@ ftp_proxy=http://%HOSTIP:%HTTPPORT/
 # note that we need quotes around the URL below to make sure the shell doesn't
 # treat the semicolon as a separator!
  <command>
-"ftp://%HOSTIP:23456/563;type=A" %FTPPORT
+"ftp://%HOSTIP:23456/%TESTNUMBER;type=A" %FTPPORT
 </command>
 
 </client>
@@ -49,7 +49,7 @@ ftp_proxy=http://%HOSTIP:%HTTPPORT/
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET ftp://%HOSTIP:%FTPPORT/563;type=A HTTP/1.1\r
+GET ftp://%HOSTIP:%FTPPORT/%TESTNUMBER;type=A HTTP/1.1\r
 Host: %HOSTIP:%FTPPORT\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
index 3078e2d083ee8882aeedabbee6c331ab13ae62ee..3d866f2839d3ebc92687ee1c3667a45aed50bef2 100644 (file)
@@ -30,13 +30,13 @@ ftp
 socks4
 </server>
 <tool>
-lib564
+lib%TESTNUMBER
 </tool>
  <name>
 FTP RETR a file over a SOCKS proxy using the multi interface
  </name>
 <command>
-ftp://%HOSTIP:%FTPPORT/path/564 %HOSTIP:%SOCKSPORT
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %HOSTIP:%SOCKSPORT
 </command>
 <features>
 proxy
@@ -52,8 +52,8 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE 564\r
-RETR 564\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 <stdout>
index ae8518c760451a3b2d3129f1824ef12edfc35430..37f70c932f965409bd6c9848a38520dffe924c63 100644 (file)
@@ -63,14 +63,14 @@ crypto
 </features>
 # tool is what to use instead of 'curl'
 <tool>
-lib565
+lib%TESTNUMBER
 </tool>
 
  <name>
 send HTTP POST using read callback, chunked transfer-encoding and Digest
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/565
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -78,7 +78,7 @@ http://%HOSTIP:%HTTPPORT/565
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST /565 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Transfer-Encoding: chunked\r
@@ -86,9 +86,9 @@ Content-Type: application/x-www-form-urlencoded
 \r
 0\r
 \r
-POST /565 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="foo", realm="testrealm", nonce="1053604144", uri="/565", response="877424f750af047634dbd94f9933217b"\r
+Authorization: Digest username="foo", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="877424f750af047634dbd94f9933217b"\r
 Accept: */*\r
 Transfer-Encoding: chunked\r
 Content-Type: application/x-www-form-urlencoded\r
index 6bf7f1400fe5cd90272f0c1d4b36337e2a0b73d8..14052fb31971f8972dbb9f0b12b921de80d49ad9 100644 (file)
@@ -30,25 +30,25 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib566
+lib%TESTNUMBER
 </tool>
 
  <name>
 HTTP GET with CURLINFO_CONTENT_LENGTH_DOWNLOAD and 0 bytes transfer
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/566 log/ip566
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER log/ip%TESTNUMBER
 </command>
 </client> 
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/ip566">
+<file name="log/ip%TESTNUMBER">
 CL: 0
 </file>
 <protocol>
-GET /566 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
index 4f91c85f028e0b52f11f811008d2c30b808131e8..f6cdec42a1f646f125d66c69008ffad03a80718e 100644 (file)
@@ -25,23 +25,23 @@ Curl-Private: swsclose
 rtsp
 </server>
 <tool>
-lib567
+lib%TESTNUMBER
 </tool>
 
 <name>
 simple RTSP OPTIONS command
 </name>
 <command>
-rtsp://%HOSTIP:%RTSPPORT/567
+rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
 </command>
 </client>
 
 <verify>
 <protocol>
-OPTIONS rtsp://%HOSTIP:%RTSPPORT/567 RTSP/1.0\r
+OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER RTSP/1.0\r
 CSeq: 1\r
-User-Agent: test567\r
-Test-Number: 567\r
+User-Agent: test%TESTNUMBER\r
+Test-Number: %TESTNUMBER\r
 \r
 </protocol>
 </verify>
index 372866dca7adfec1f3f529e59e2e62862cb7b214..7dd23ca48a0013a9196af94da5fdb5b7855e7cce 100644 (file)
@@ -51,17 +51,17 @@ Informational: Empty Options Response
 rtsp
 </server>
 <tool>
-lib568
+lib%TESTNUMBER
 </tool>
 
 <name>
 RTSP Announce (PUT and POST style) test
 </name>
 <command>
-rtsp://%HOSTIP:%RTSPPORT/568
+rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
 </command>
 # file written before test command runs
-<file name="log/file568.txt">
+<file name="log/file%TESTNUMBER.txt">
 v=0
 o=mhandley 2890844526 2890845468 IN IP4 126.16.64.4
 s=SDP Seminar
@@ -81,7 +81,7 @@ m=video 2232 RTP/AVP 31
 ^If-Modified-Since:.*
 </strip>
 <protocol>
-ANNOUNCE rtsp://%HOSTIP:%RTSPPORT/5680001 RTSP/1.0\r
+ANNOUNCE rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0001 RTSP/1.0\r
 CSeq: 1\r
 Content-Length: 306\r
 Content-Type: application/sdp\r
@@ -97,17 +97,17 @@ t=2873397496 2873404696
 a=recvonly
 m=audio 3456 RTP/AVP 0
 m=video 2232 RTP/AVP 31
-DESCRIBE rtsp://%HOSTIP:%RTSPPORT/5680002 RTSP/1.0\r
+DESCRIBE rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0002 RTSP/1.0\r
 CSeq: 2\r
 Accept: application/sdp\r
 \r
-ANNOUNCE rtsp://%HOSTIP:%RTSPPORT/5680003 RTSP/1.0\r
+ANNOUNCE rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0003 RTSP/1.0\r
 CSeq: 3\r
 Content-Type: posty goodness\r
 Content-Length: 35\r
 \r
 postyfield=postystuff&project=curl
-OPTIONS rtsp://%HOSTIP:%RTSPPORT/5680004 RTSP/1.0\r
+OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0004 RTSP/1.0\r
 CSeq: 4\r
 \r
 </protocol>
index 924832c118bd4904bc9908178504c11a5b0709d3..043c2445d39dd1ad9838cf1d3f2ebcdefab7d3a9 100644 (file)
@@ -59,14 +59,14 @@ CSeq: 6
 rtsp
 </server>
 <tool>
-lib569
+lib%TESTNUMBER
 </tool>
 
 <name>
 RTSP Session ID parsing
 </name>
 <command>
-rtsp://%HOSTIP:%RTSPPORT/569 log/idfile569.txt
+rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER log/idfile%TESTNUMBER.txt
 </command>
 </client>
 
@@ -75,32 +75,32 @@ rtsp://%HOSTIP:%RTSPPORT/569 log/idfile569.txt
 ^If-Modified-Since:.*
 </strip>
 <protocol>
-SETUP rtsp://%HOSTIP:%RTSPPORT/5690001 RTSP/1.0\r
+SETUP rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0001 RTSP/1.0\r
 CSeq: 1\r
 Transport: Fake/NotReal/JustATest;foo=baz\r
 \r
-TEARDOWN rtsp://%HOSTIP:%RTSPPORT/5690002 RTSP/1.0\r
+TEARDOWN rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0002 RTSP/1.0\r
 CSeq: 2\r
 Session: 00.+1-am-aSe55ion_id\$yes-i-am\$\r
 \r
-SETUP rtsp://%HOSTIP:%RTSPPORT/5690003 RTSP/1.0\r
+SETUP rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0003 RTSP/1.0\r
 CSeq: 3\r
 Transport: Fake/NotReal/JustATest;foo=baz\r
 \r
-TEARDOWN rtsp://%HOSTIP:%RTSPPORT/5690004 RTSP/1.0\r
+TEARDOWN rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0004 RTSP/1.0\r
 CSeq: 4\r
 Session: \$extraspaces\r
 \r
-SETUP rtsp://%HOSTIP:%RTSPPORT/5690005 RTSP/1.0\r
+SETUP rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0005 RTSP/1.0\r
 CSeq: 5\r
 Transport: Fake/NotReal/JustATest;foo=baz\r
 \r
-TEARDOWN rtsp://%HOSTIP:%RTSPPORT/5690006 RTSP/1.0\r
+TEARDOWN rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0006 RTSP/1.0\r
 CSeq: 6\r
 Session: A\r
 \r
 </protocol>
-<file name="log/idfile569.txt">
+<file name="log/idfile%TESTNUMBER.txt">
 Got Session ID: [00.+1-am-aSe55ion_id\$yes-i-am\$]
 Got Session ID: [\$extraspaces]
 Got Session ID: [A]
index 5011e6eb004f64951bfb405a0112848731f07e54..f379d7488ecc4d08fcb6577d87884661c7a33022 100644 (file)
@@ -26,7 +26,7 @@ http
 HTTP content-type with spaces in
  </name>
  <command>
--w "%{content_type}\n" http://%HOSTIP:%HTTPPORT/57 -o log/out57
+-w "%{content_type}\n" http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/out%TESTNUMBER
 </command>
 </client>
 
@@ -36,7 +36,7 @@ HTTP content-type with spaces in
 text/html; charset=ISO-8859-4
 </stdout>
 <protocol>
-GET /57 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 431c79afc9ceab81b5fc9411af551aa36b32f21c..c1a03485590b508edfc17217b0d27e5d0dfb36fa 100644 (file)
@@ -43,14 +43,14 @@ CSeq: 1000
 rtsp
 </server>
 <tool>
-lib570
+lib%TESTNUMBER
 </tool>
 
 <name>
 RTSP CSeq and Session Mismatch checks
 </name>
 <command>
-rtsp://%HOSTIP:%RTSPPORT/570
+rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -59,14 +59,14 @@ rtsp://%HOSTIP:%RTSPPORT/570
 ^If-Modified-Since:.*
 </strip>
 <protocol>
-OPTIONS rtsp://%HOSTIP:%RTSPPORT/5700001 RTSP/1.0\r
+OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0001 RTSP/1.0\r
 CSeq: 1\r
 \r
-SETUP rtsp://%HOSTIP:%RTSPPORT/5700002 RTSP/1.0\r
+SETUP rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0002 RTSP/1.0\r
 CSeq: 999\r
 Transport: RAW/RAW/UDP;unicast;client_port=3056-3057\r
 \r
-PLAY rtsp://%HOSTIP:%RTSPPORT/5700003 RTSP/1.0\r
+PLAY rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0003 RTSP/1.0\r
 CSeq: 1000\r
 Session: asdf\r
 \r
index 842410ad638f6c0d5c3c8e7f5b91ca0185c3cf2d..3cc1b98b5f90d48a60d43ed975284009af18cb01 100644 (file)
@@ -71,14 +71,14 @@ rtp: part 4 channel 1 size 24
 rtsp
 </server>
 <tool>
-lib571
+lib%TESTNUMBER
 </tool>
 
 <name>
 RTSP RTP Interleaving Test
 </name>
 <command>
-rtsp://%HOSTIP:%RTSPPORT/571 log/protofile571.txt
+rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER log/protofile%TESTNUMBER.txt
 </command>
 </client>
 
@@ -99,7 +99,7 @@ RTP: message size 85, channel 0
 RTP: message size 24, channel 1
 </stdout>
 
-<file name="log/protofile571.txt">
+<file name="log/protofile%TESTNUMBER.txt">
 $99
 </file>
 </verify>
index 7f044478d110f0786ad58c6a4f02859b8f17e246..0a470559bbeeadbf157c39f547b9d2caf5c94160 100644 (file)
@@ -66,17 +66,17 @@ Informational: Empty Options Response
 rtsp
 </server>
 <tool>
-lib572
+lib%TESTNUMBER
 </tool>
 
 <name>
 RTSP GET_PARAMETER (Put/Heartbeat/Post)
 </name>
 <command>
-rtsp://%HOSTIP:%RTSPPORT/572
+rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
 </command>
 # file written before test command runs
-<file name="log/file572.txt">
+<file name="log/file%TESTNUMBER.txt">
 scale
 speed
 </file>
@@ -87,11 +87,11 @@ speed
 ^If-Modified-Since:.*
 </strip>
 <protocol>
-SETUP rtsp://%HOSTIP:%RTSPPORT/5720001 RTSP/1.0\r
+SETUP rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0001 RTSP/1.0\r
 CSeq: 1\r
 Transport: Planes/Trains/Automobiles\r
 \r
-GET_PARAMETER rtsp://%HOSTIP:%RTSPPORT/5720002 RTSP/1.0\r
+GET_PARAMETER rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0002 RTSP/1.0\r
 CSeq: 2\r
 Session: getparams-test\r
 Content-Length: 12\r
@@ -99,11 +99,11 @@ Content-Type: text/parameters
 \r
 scale
 speed
-GET_PARAMETER rtsp://%HOSTIP:%RTSPPORT/5720003 RTSP/1.0\r
+GET_PARAMETER rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0003 RTSP/1.0\r
 CSeq: 3\r
 Session: getparams-test\r
 \r
-GET_PARAMETER rtsp://%HOSTIP:%RTSPPORT/5720004 RTSP/1.0\r
+GET_PARAMETER rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0004 RTSP/1.0\r
 CSeq: 4\r
 Session: getparams-test\r
 Content-Length: 24\r
@@ -111,7 +111,7 @@ Content-Type: text/parameters
 \r
 packets_received
 jitter
-OPTIONS rtsp://%HOSTIP:%RTSPPORT/5720005 RTSP/1.0\r
+OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0005 RTSP/1.0\r
 CSeq: 5\r
 Session: getparams-test\r
 \r
index fb9c859f72f436bf51a87b36742953f281cffe26..cab270bb65f300953650233d9ce9642bbc5e26e7 100644 (file)
@@ -32,21 +32,21 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib573
+lib%TESTNUMBER
 </tool>
 
  <name>
 verify connect time with multi interface
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/573
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /573 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
index cb41f03ec45c24714b16c51471181b6ce925aaec..436e1828bdb690b2a0d9af73495b6cbc5d32d970 100644 (file)
@@ -22,7 +22,7 @@ ftplistparser
 ftp
 </server>
 <tool>
-lib574
+lib%TESTNUMBER
 </tool>
 <name>
 FTP wildcard download - changed fnmatch, 2x perform (Unix LIST response)
index 8133834560ceec6fdb808f3ca49c1740a796265f..e84a39f05d37b9fa90f81ba87ebc67ee5698e666 100644 (file)
@@ -21,7 +21,7 @@ ftplistparser
 ftp
 </server>
 <tool>
-lib575
+lib%TESTNUMBER
 </tool>
  <name>
 FTP wildcard download - dup_handle and multi interface
index 74a3aedd13ba0ff151d15ef9cfcac3caffed9d7b..2a1b9419cff53542b093bb4650fce73eca728010 100644 (file)
@@ -19,7 +19,7 @@ ftplistparser
 ftp
 </server>
 <tool>
-lib576
+lib%TESTNUMBER
 </tool>
  <name>
 FTP wildcard download - skip/parser_correctness/CURLOPT_FNMATCH_FUNCTION (Unix)
index 525549264cdbc7a93bb26a208c71973f8b777560..d880f282d994d55dd2f08c0d068132eea2cb2289 100644 (file)
@@ -34,13 +34,13 @@ lib567
 Funny RTSP version in response
 </name>
 <command>
-rtsp://%HOSTIP:%RTSPPORT/577
+rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
 </command>
 </client>
 
 <verify>
 <protocol>
-OPTIONS rtsp://%HOSTIP:%RTSPPORT/577 RTSP/1.0\r
+OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER RTSP/1.0\r
 CSeq: 1\r
 User-Agent: test567\r
 Test-Number: 567\r
index 7c2e205c45e124ea3421031ae52c09782c36f432..2ff8a1f1b0f5f5ace4e990f2b29b18f6c749792c 100644 (file)
@@ -31,21 +31,21 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib578
+lib%TESTNUMBER
 </tool>
 
  <name>
 HTTP POST lower than MAX_INITIAL_POST_SIZE with progress callback
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/578 log/ip578
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER log/ip%TESTNUMBER
 </command>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/ip578">
+<file name="log/ip%TESTNUMBER">
 PASSED, UL data matched data size
 </file>
 </verify>
index e352e3d602ec244eb4e8cb71190edda449abee58..e4b072bc2399342650066b1a326130ed7fa49142 100644 (file)
@@ -61,21 +61,21 @@ crypto
 </features>
 # tool is what to use instead of 'curl'
 <tool>
-lib579
+lib%TESTNUMBER
 </tool>
 
  <name>
 small chunked HTTP POSTs with digest auth. and progress callback
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/579 log/ip579
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER log/ip%TESTNUMBER
 </command>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/ip579">
+<file name="log/ip%TESTNUMBER">
 Progress callback called with UL 0 out of 0
 Progress callback called with UL 8 out of 0
 Progress callback called with UL 16 out of 0
index 0ca34b11788cb5de020d5106423e8cc592ee8f6f..01d7189a81a95d98c1aa89a2f9e50881d22f2dce 100644 (file)
@@ -26,9 +26,9 @@ http
 HTTP PUT from file with weird letters
 </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/ -T log/58te[]st.txt -g
+http://%HOSTIP:%HTTPPORT/we/want/ -T log/%TESTNUMBERte[]st.txt -g
 </command>
-<file name="log/58te[]st.txt">
+<file name="log/%TESTNUMBERte[]st.txt">
 a few bytes
 </file>
 </client>
@@ -36,7 +36,7 @@ a few bytes
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /we/want/58te%5B%5Dst.txt HTTP/1.1\r
+PUT /we/want/%TESTNUMBERte%5B%5Dst.txt HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index a3811a2f341ad6a03c93efd2475c81dc2a6ffd71..c19a52a30fd31c6fd9bb1c9f38c22942346674e4 100644 (file)
@@ -39,14 +39,14 @@ lib507
 multi interface, multiple Location: headers
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/580
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /580 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
index bcfb6dce9f5c9d42b6e65bb8f64f89a81ef81cf5..50b99e3911fd7d638d2e8f74e3d21e7f7ed5e7d5 100644 (file)
@@ -39,14 +39,14 @@ lib507
 multi interface, multiple Content-Type: headers
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/581
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /581 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
index 8ac6bc86a19d6ec730f329d2aaf657bc175e5e6a..ddf17e3e39c8da71b109cb5858d9eb648c629621 100644 (file)
@@ -18,15 +18,15 @@ multi
 sftp
 </server>
 <tool>
-lib582
+lib%TESTNUMBER
 </tool>
  <name>
 SFTP upload using multi interface
  </name>
  <command>
-Sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/upload582.txt %PWD/log/file582.txt %USER:
+Sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/upload%TESTNUMBER.txt %PWD/log/file%TESTNUMBER.txt %USER:
 </command>
-<file name="log/file582.txt">
+<file name="log/file%TESTNUMBER.txt">
 Moooooooooooo
  upload this
 </file>
@@ -41,7 +41,7 @@ disable
 </strip>
 <protocol>
 </protocol>
-<file name="log/file582.txt">
+<file name="log/file%TESTNUMBER.txt">
 Moooooooooooo
  upload this
 </file>
index e7d95960b99bb6991e087ccdd3ed8749c035960a..029cdac327f57c1d84ffad1b1d465721f25decde 100644 (file)
@@ -18,7 +18,7 @@ multi
 sftp
 </server>
 <tool>
-lib583
+lib%TESTNUMBER
 </tool>
  <name>
 SFTP with multi interface, remove handle early
@@ -29,7 +29,7 @@ SFTP with multi interface, remove handle early
 # name resolve will cause it to return rather quickly and thus we could trigger
 # the problem we're looking to verify.
  <command>
-sftp://localhost:%SSHPORT%SSH_PWD/log/upload583.txt %USER:
+sftp://localhost:%SSHPORT%SSH_PWD/log/upload%TESTNUMBER.txt %USER:
 </command>
 </client>
 
index 6808561378c0ea2b0c9daed5c43468e6fbf559cb..fb234440b7d5edd93711f04a5edb993cc292d61e 100644 (file)
@@ -41,14 +41,14 @@ http
 </server>
 # tool to invoke
 <tool>
-lib584
+lib%TESTNUMBER
 </tool>
 
  <name>
 CURLOPT_MIMEPOST first set then set to NULL
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/584
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -60,7 +60,7 @@ s/^--------------------------[a-z0-9]*/--------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=------------------------/
 </strippart>
 <protocol>
-POST /584 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Content-Length: 144\r
@@ -71,7 +71,7 @@ Content-Disposition: form-data; name="fake"
 \r
 party\r
 ----------------------------\r
-POST /584 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Content-Length: 0\r
index 64f5567d4d58a5905deafe878f573debd0b6d1c9..213edef2c6c6bf08503a6f1c9bc180196f1b7aed 100644 (file)
@@ -43,21 +43,21 @@ http
 </features>
 # tool is what to use instead of 'curl'
 <tool>
-lib585
+lib%TESTNUMBER
 </tool>
 
  <name>
 socket open/close callbacks
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/585
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /585 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
index c0857bdd8de22ae7b25462d081e94c7bebc6925b..18d614b5d18f4c2518909253d30ec650d82e0fbf 100644 (file)
@@ -38,7 +38,7 @@ lib585
 FTP and open/close socket callbacks
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/586
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -51,8 +51,8 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 586\r
-RETR 586\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 0d9530e933962774d1a1b41126fa7a00e6a98ba6..a40e4bf80f3f283f2ad47846337d1d7c9e0ad4f7 100644 (file)
@@ -21,14 +21,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib587
+lib%TESTNUMBER
 </tool>
 
  <name>
 HTTP multi-part formpost with aborted read callback
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/587
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -40,7 +40,7 @@ s/^--------------------------[a-z0-9]*/------------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
 </strippart>
 <protocol>
-POST /587 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Content-Length: 744\r
index b30828c140350204d1b2f6eae7c65187095db83e..1eb262f5c621e2a2b1aff533f86e137bf4674c24 100644 (file)
@@ -35,9 +35,9 @@ lib525
 FTP PORT upload using multi interface, EPRT doesn't work
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/588 log/upload588
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER log/upload%TESTNUMBER
 </command>
-<file name="log/upload588">
+<file name="log/upload%TESTNUMBER">
 Moooooooooooo
  upload this
 </file>
@@ -58,7 +58,7 @@ CWD path
 EPRT |1|
 PORT
 TYPE I\r
-STOR 588\r
+STOR %TESTNUMBER\r
 QUIT\r
 </protocol>
 <upload>
index 3111070e3f5a264abd766d8b7826c0e3a100da68..02fe54315fd6c46a1ed48f4ad380ecc304edd555 100644 (file)
@@ -27,14 +27,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib589
+lib%TESTNUMBER
 </tool>
 
  <name>
 make a HTTP MIME POST set to NULL
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/589
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -42,7 +42,7 @@ http://%HOSTIP:%HTTPPORT/589
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST /589 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Content-Length: 0\r
index 4056e5234a7948558e424fe9213836f9c473abfd..809e4723d96b54d6e598f6a9e6313f40a0aeb0c3 100644 (file)
@@ -27,7 +27,7 @@ http
 HTTP URL with slash but with "parameter"
  </name>
  <command>
-"http://%HOSTIP:%HTTPPORT?mooo/59"
+"http://%HOSTIP:%HTTPPORT?mooo/%TESTNUMBER"
 </command>
 </client>
 
@@ -35,7 +35,7 @@ HTTP URL with slash but with "parameter"
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /?mooo/59 HTTP/1.1\r
+GET /?mooo/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index cb24cbb5697aca026142d4e4b04c22e8d93f3155..94516da4bcdcefc9c643a37842cc83561928e4b3 100644 (file)
@@ -70,7 +70,7 @@ http
 </server>
 # tool to use
 <tool>
-lib590
+lib%TESTNUMBER
 </tool>
 <features>
 NTLM
@@ -89,7 +89,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://test.remote.example.com/path/590 http://%HOSTIP:%HTTPPORT
+http://test.remote.example.com/path/%TESTNUMBER http://%HOSTIP:%HTTPPORT
 </command>
 <precheck>
 chkhostname curlhost
@@ -100,18 +100,18 @@ chkhostname curlhost
 <verify>
 
 <protocol>
-GET http://test.remote.example.com/path/590 HTTP/1.1\r
+GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1\r
 Host: test.remote.example.com\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://test.remote.example.com/path/590 HTTP/1.1\r
+GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1\r
 Host: test.remote.example.com\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://test.remote.example.com/path/590 HTTP/1.1\r
+GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1\r
 Host: test.remote.example.com\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAAAgACAHAAAAAIAAgAcgAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAAIWYOdZV0iKA8ytf+dU+Bz9TpMJ4mBKu221lY3VybGhvc3Q=\r
 Accept: */*\r
index e1dfcd374b77a43834c884c95af35840ea1d7e00..843ddb3973a455db932e5270bf5c4accd4123f47 100644 (file)
@@ -1,7 +1,7 @@
 <testcase>
 #
 # For this test the server rejects the EPRT command,
-# code in lib591 makes use of curl_multi_timeout()
+# code in lib%TESTNUMBER makes use of curl_multi_timeout()
 # and server does not establish data connection.
 #
 <info>
@@ -31,16 +31,16 @@ REPLY EPRT 500 we don't like EPRT now
 ftp
 </server>
 <tool>
-lib591
+lib%TESTNUMBER
 </tool>
  <name>
 FTP multi PORT and 425 on upload
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/591 %FTPTIME2 log/upload591
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 log/upload%TESTNUMBER
 </command>
-<file name="log/upload591">
-Moooooooooooo for 591
+<file name="log/upload%TESTNUMBER">
+Moooooooooooo for %TESTNUMBER
  upload this
 </file>
 </client>
@@ -60,7 +60,7 @@ CWD path
 EPRT |1|
 PORT
 TYPE I\r
-STOR 591\r
+STOR %TESTNUMBER\r
 QUIT\r
 </protocol>
 # CURLE_FTP_ACCEPT_FAILED = 10
index 6151ccc43af8e0593bb6554cf989c54ade4f3630..fc9f15d1deb68c733f34d2c41bbc62d40b943a07 100644 (file)
@@ -37,10 +37,10 @@ lib591
 FTP multi PORT and 421 on upload
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/592 %FTPTIME2 log/upload592
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 log/upload%TESTNUMBER
 </command>
-<file name="log/upload592">
-Moooooooooooo for 592
+<file name="log/upload%TESTNUMBER">
+Moooooooooooo for %TESTNUMBER
  upload this
 </file>
 </client>
@@ -61,7 +61,7 @@ CWD path
 EPRT |1|
 PORT
 TYPE I\r
-STOR 592\r
+STOR %TESTNUMBER\r
 QUIT\r
 </protocol>
 # CURLE_FTP_ACCEPT_FAILED = 10
index a136000be164ad6223c8c44304be1ab5aa4401a8..47c1d94346204d574f09f7836aa43cef4d34bf4e 100644 (file)
@@ -37,10 +37,10 @@ lib591
 FTP multi PORT upload, no data conn and no transient neg. reply
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/593 %FTPTIME2 log/upload593
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 log/upload%TESTNUMBER
 </command>
-<file name="log/upload593">
-Moooooooooooo for 593
+<file name="log/upload%TESTNUMBER">
+Moooooooooooo for %TESTNUMBER
  upload this
 </file>
 </client>
@@ -60,7 +60,7 @@ CWD path
 EPRT |1|
 PORT
 TYPE I\r
-STOR 593\r
+STOR %TESTNUMBER\r
 QUIT\r
 </protocol>
 <errorcode>
index d6144ae6bc42ac7687528bb7276bcf63b8a9c1a4..5a4645092587d00bd503b24b5674a3640d479e60 100644 (file)
@@ -37,10 +37,10 @@ lib591
 FTP multi PORT upload, no data conn and no positive prelim. reply
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/594 %FTPTIME2 log/upload594
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 log/upload%TESTNUMBER
 </command>
-<file name="log/upload594">
-Moooooooooooo for 594
+<file name="log/upload%TESTNUMBER">
+Moooooooooooo for %TESTNUMBER
  upload this
 </file>
 </client>
@@ -60,7 +60,7 @@ CWD path
 EPRT |1|
 PORT
 TYPE I\r
-STOR 594\r
+STOR %TESTNUMBER\r
 QUIT\r
 </protocol>
 <errorcode>
index 0099a857cdcda53163838603c67b6f99ada80923..4d2f62b6de21450c4e1b390cfd1bcc485c05231d 100644 (file)
@@ -36,7 +36,7 @@ lib585
 verify close callbacks with passive FTP
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/595 log/ip595
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER log/ip%TESTNUMBER
 </command>
 </client>
 
@@ -49,8 +49,8 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 595\r
-RETR 595\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 9377289dc4420fcb8fba6e061e5029028c187550..64bd52b57713d6111cd23383843f26f0bc4ebc2c 100644 (file)
@@ -36,7 +36,7 @@ lib585
 verify close callbacks with active FTP
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/596 log/ip596 activeftp
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER log/ip%TESTNUMBER activeftp
 </command>
 </client>
 
@@ -52,8 +52,8 @@ PASS ftp@example.com
 PWD\r
 EPRT |1|
 TYPE I\r
-SIZE 596\r
-RETR 596\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 3eb9ed8b8b48018ce4323c74342bead172de52c3..6ab57887795c9732fc68f2618e31a776c6c7aa73 100644 (file)
@@ -12,7 +12,7 @@ CONNECT_ONLY
 ftp
 </server>
 <tool>
-lib597
+lib%TESTNUMBER
 </tool>
  <name>
 FTP connect only option
index 3082a8cf577780d3afeae62c048fc86aec07137a..5e52315ebb41830b931f0629337f51993ab75b41 100644 (file)
@@ -49,14 +49,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib598
+lib%TESTNUMBER
 </tool>
 
  <name>
 curl_easy_reset with referer and other strings set
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/598
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -64,14 +64,14 @@ http://%HOSTIP:%HTTPPORT/598
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /598 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: the-moo agent next generation\r
 Accept: */*\r
 Referer: http://example.com/the-moo\r
 Cookie: name=moo\r
 \r
-GET /598 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
index 9e7083cfb8695a4e8d0dba51c7feb4fb80aa0021..269b8c663bf7722b42f34ec831dd0d4fb6b4dd8f 100644 (file)
@@ -13,7 +13,7 @@ chunked Transfer-Encoding
 HTTP/1.1 302 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
-Location: 5990001\r
+Location: %TESTNUMBER0001\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
@@ -39,7 +39,7 @@ this data is slightly larger than the first piece
 HTTP/1.1 302 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
-Location: 5990001\r
+Location: %TESTNUMBER0001\r
 Content-Length: 6\r
 Connection: close\r
 Content-Type: text/html\r
@@ -63,7 +63,7 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib599
+lib%TESTNUMBER
 </tool>
 
 # Bug 3510057 pointed out that when following a location to a larger chunked
@@ -72,14 +72,14 @@ lib599
 HTTP GET with progress callback and redirects changing content sizes
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/599 log/ip599
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER log/ip%TESTNUMBER
 </command>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/ip599">
+<file name="log/ip%TESTNUMBER">
 CL: -1
 </file>
 </verify>
index bbd67cbf89d04401020ba7ab1fcb4428984d672e..d8231cbdb90113381a22ba2141b7cd8a38a25053 100644 (file)
@@ -29,14 +29,14 @@ http
 HTTP with simple cookie send
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/that/page/6 -b "name=contents;name2=content2" -b name3=content3
+http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER -b "name=contents;name2=content2" -b name3=content3
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/that/page/6 HTTP/1.1\r
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 4c9db51096b2c23dd010b086d5f4187e2a316688..d23918ba88ad57b9d0666160183817e74a8a432b 100644 (file)
@@ -28,7 +28,7 @@ http
 HTTP PUT from stdin with wrong content-length
 </name>
  <command>
-http://%HOSTIP:%HTTPPORT/bzz/60 -T - -H "Content-Length: 1"
+http://%HOSTIP:%HTTPPORT/bzz/%TESTNUMBER -T - -H "Content-Length: 1"
 </command>
 <stdin>
 more than one byte
@@ -38,7 +38,7 @@ more than one byte
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /bzz/60 HTTP/1.1\r
+PUT /bzz/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index f9415e0e0544cba29c7cabfbcc43934f576db7ec..88a6055c39057a220a07407e1e623011d677c934 100644 (file)
@@ -24,9 +24,9 @@ sftp
 SFTP retrieval
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file600.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
-<file name="log/file600.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>
index c89b645356312648ea7cdeaca8960e4bbf9c6714..cadeeafe0d3d695b3d61632ed6466f3230b4cb8b 100644 (file)
@@ -24,9 +24,9 @@ scp
 SCP retrieval
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file601.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
-<file name="log/file601.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>
index dd300c74d651d5f7d61f65d32a5fa7cae803d9a0..56d2747f225590cc3f156b0d1b1263dc65e0e43e 100644 (file)
@@ -21,9 +21,9 @@ sftp
 SFTP put
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file602.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/upload.602 --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/upload.%TESTNUMBER --insecure
 </command>
-<file name="log/file602.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh upload test
 </file>
index b96c4057fd710a96e270e401ab5c5e4498043453..b873f1587ef43ba09e11e863cdcd83f00bef88c3 100644 (file)
@@ -21,9 +21,9 @@ scp
 SCP upload
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file603.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/log/upload.603 --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file%TESTNUMBER.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/log/upload.%TESTNUMBER --insecure
 </command>
-<file name="log/file603.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh upload test
 </file>
index b4d010556e9658168a2b683d2dabcec12d23fa76..f919e9c7376db34ff2107fd786994474ff69e516 100644 (file)
@@ -24,14 +24,14 @@ sftp
 SFTP post-quote rename
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-rename %PWD/log/file608.txt %PWD/log/file608-renamed.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file608.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-rename %PWD/log/file%TESTNUMBER.txt %PWD/log/file%TESTNUMBER-renamed.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
 # Verify that the file was renamed properly, then rename the file back to what
 # it was so the verify section works and the file can be cleaned up.
 <postcheck>
-perl %SRCDIR/libtest/test610.pl gone %PWD/log/file608.txt move %PWD/log/file608-renamed.txt %PWD/log/file608.txt
+perl %SRCDIR/libtest/test610.pl gone %PWD/log/file%TESTNUMBER.txt move %PWD/log/file%TESTNUMBER-renamed.txt %PWD/log/file%TESTNUMBER.txt
 </postcheck>
-<file name="log/file608.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test file for rename test
 </file>
 </client>
@@ -39,7 +39,7 @@ Test file for rename test
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/file608.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test file for rename test
 </file>
 <valgrind>
index 5aa9eecfc0f8b8c2993b8939298aff6689d2934f..66057d255650dc84779d6012a38a4784b3af3a97 100644 (file)
@@ -25,9 +25,9 @@ sftp
 SFTP post-quote mkdir failure
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-mkdir %PWD/log/file609.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file609.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-mkdir %PWD/log/file%TESTNUMBER.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
-<file name="log/file609.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test file for mkdir test
 </file>
 </client>
index 20a0f898bb7fa6e7c93f5492d65b3ec5fa5bd6bd..6d98ba77064940972b31b4eb678170666ffc0ca7 100644 (file)
@@ -45,20 +45,20 @@ HTTP with various cookies and custom Host:
 TZ=GMT
 </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/61 -c log/jar61.txt -H "Host: www.host.foo.com"
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -c log/jar%TESTNUMBER.txt -H "Host: www.host.foo.com"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/61 HTTP/1.1\r
+GET /we/want/%TESTNUMBER HTTP/1.1\r
 Host: www.host.foo.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file name="log/jar61.txt" mode="text">
+<file name="log/jar%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
index d097421517c884b11e24e636cdeafbb62b0c1559..d9eb2e6be49b447dd1d258b1d3768febd2542948 100644 (file)
@@ -21,18 +21,18 @@ Dummy test file for rmdir test
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test610.pl mkdir %PWD/log/test610.dir
+perl %SRCDIR/libtest/test%TESTNUMBER.pl mkdir %PWD/log/test%TESTNUMBER.dir
 </precheck>
  <name>
 SFTP post-quote rmdir
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-rmdir %PWD/log/test610.dir" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file610.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-rmdir %PWD/log/test%TESTNUMBER.dir" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test610.pl gone %PWD/log/test610.dir
+perl %SRCDIR/libtest/test%TESTNUMBER.pl gone %PWD/log/test%TESTNUMBER.dir
 </postcheck>
-<file name="log/file610.txt">
+<file name="log/file%TESTNUMBER.txt">
 Dummy test file for rmdir test
 </file>
 </client>
index 6362002e346ebe057b78a33a60589ba0dbbcc3ea..ee2a185b13f8d98dba12c6533cb5d8d029c9acb1 100644 (file)
@@ -21,18 +21,18 @@ Dummy test file for rename test
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test610.pl mkdir %PWD/log/test611.dir
+perl %SRCDIR/libtest/test610.pl mkdir %PWD/log/test%TESTNUMBER.dir
 </precheck>
  <name>
 SFTP post-quote rename
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-rename %PWD/log/test611.dir %PWD/log/test611.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file611.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-rename %PWD/log/test%TESTNUMBER.dir %PWD/log/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test610.pl rmdir %PWD/log/test611.new
+perl %SRCDIR/libtest/test610.pl rmdir %PWD/log/test%TESTNUMBER.new
 </postcheck>
-<file name="log/file611.txt">
+<file name="log/file%TESTNUMBER.txt">
 Dummy test file for rename test
 </file>
 </client>
index ae18afbc14a8c5f29833fade9f87a05d8beab928..1d6fadec8c06052647b991bedf9e27a0a82fa6e0 100644 (file)
@@ -24,12 +24,12 @@ sftp
 SFTP post-quote remove file
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file612.txt -Q "-rm %PWD/log/file612.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/upload.612  --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file%TESTNUMBER.txt -Q "-rm %PWD/log/file%TESTNUMBER.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/upload.%TESTNUMBER  --insecure
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test610.pl gone %PWD/log/test612.txt
+perl %SRCDIR/libtest/test610.pl gone %PWD/log/test%TESTNUMBER.txt
 </postcheck>
-<file name="log/file612.txt">
+<file name="log/file%TESTNUMBER.txt">
 Dummy test file for remove test
 </file>
 </client>
index 0383987e52ff88f0fee56eafa79bd3b451513103..d02e3bbecd58bba0429200b453b8f84b7e977733 100644 (file)
@@ -23,16 +23,16 @@ d?????????    N U         U               N ???  N NN:NN asubdir
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test613.dir
+perl %SRCDIR/libtest/test%TESTNUMBER.pl prepare %PWD/log/test%TESTNUMBER.dir
 </precheck>
  <name>
 SFTP directory retrieval
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test613.dir/ --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.dir/ --insecure
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test613.dir %PWD/log/curl613.out
+perl %SRCDIR/libtest/test%TESTNUMBER.pl postprocess %PWD/log/test%TESTNUMBER.dir %PWD/log/curl%TESTNUMBER.out
 </postcheck>
 </client>
 
index c6fe4919da741dead47257c0856f269d63912727..c0af2630a64cbbbc70287760e0628d89e3f94a76 100644 (file)
@@ -24,16 +24,16 @@ d?????????    N U         U               N ???  N NN:NN asubdir
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test614.dir
+perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test%TESTNUMBER.dir
 </precheck>
  <name>
 SFTP pre-quote chmod
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "chmod 444 %PWD/log/test614.dir/plainfile.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test614.dir/ --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "chmod 444 %PWD/log/test%TESTNUMBER.dir/plainfile.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.dir/ --insecure
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test614.dir %PWD/log/curl614.out
+perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test%TESTNUMBER.dir %PWD/log/curl%TESTNUMBER.out
 </postcheck>
 </client>
 
index 5f4859c2f6078582d363af0a2e06bd6770179728..09a825b035227e7797be320690c6a89642e4b0fd 100644 (file)
@@ -14,18 +14,18 @@ FAILURE
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test615.dir
+perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test%TESTNUMBER.dir
 </precheck>
  <name>
 SFTP put remote failure
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file615.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test615.dir/rofile.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.dir/rofile.txt --insecure
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test615.dir
+perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test%TESTNUMBER.dir
 </postcheck>
-<file name="log/file615.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh upload test
 </file>
index 14c3d3376e3977dc27b49f5d9935e2a20f179c64..ec03c31ba994de4eb31265ae36a924f9f93cabaf 100644 (file)
@@ -23,9 +23,9 @@ sftp
 SFTP retrieval of empty file
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file616.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
-<file name="log/file616.txt">
+<file name="log/file%TESTNUMBER.txt">
 </file>
 </client>
 
index 67f0c9a16d059dab82cd2b13b0ecb921378fdec8..3c067e399011a855f68d8ec6675263c3c6fc1bd4 100644 (file)
@@ -23,9 +23,9 @@ scp
 SCP retrieval of empty file
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file617.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
-<file name="log/file617.txt">
+<file name="log/file%TESTNUMBER.txt">
 </file>
 </client>
 
index feb095ebeb959895a6d5df41f4fb5e028f1e8056..f5e2c7b33d6cc06a4de2891c0401317737778039 100644 (file)
@@ -15,9 +15,9 @@ sftp
 SFTP retrieval of two files
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file618.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file618.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
-<file name="log/file618.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>
index 6c1273c0484dc727cc311dea0368789650fd05e6..0f86d8a54a5e62f436a3756aaf4815f98e83c8bd 100644 (file)
@@ -15,9 +15,9 @@ scp
 SCP retrieval of two files
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file619.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file619.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
-<file name="log/file619.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>
index 6bc793f13be75000544a63d2088e943dd0c4e1fb..92396d9f66ed35daaf6be120957e5a963dc575d6 100644 (file)
@@ -29,9 +29,9 @@ http
 HTTP, send cookies when using custom Host:
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/62 http://%HOSTIP:%HTTPPORT/we/want/62?hoge=fuga -b log/jar62.txt -H "Host: www.host.foo.com"
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER?hoge=fuga -b log/jar%TESTNUMBER.txt -H "Host: www.host.foo.com"
 </command>
-<file name="log/jar62.txt">
+<file name="log/jar%TESTNUMBER.txt">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
@@ -47,13 +47,13 @@ http://%HOSTIP:%HTTPPORT/we/want/62 http://%HOSTIP:%HTTPPORT/we/want/62?hoge=fug
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/62 HTTP/1.1\r
+GET /we/want/%TESTNUMBER HTTP/1.1\r
 Host: www.host.foo.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Cookie: test2=yes; test=yes\r
 \r
-GET /we/want/62?hoge=fuga HTTP/1.1\r
+GET /we/want/%TESTNUMBER?hoge=fuga HTTP/1.1\r
 Host: www.host.foo.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 4638255133d28eb64535966dfdc9ffebd7c39ffe..fea44acf38e073fb94886cc9f11e0a45f2cf1a63 100644 (file)
@@ -16,9 +16,9 @@ sftp
 SFTP retrieval of missing file followed by good file
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/not-a-valid-file-moooo sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file620.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/not-a-valid-file-moooo sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
-<file name="log/file620.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>
index f0ac9b728476c4be7b31a3a0e30187bfde400a29..368baf6a0d60760df2d7ad3ae0c7e63506507d1b 100644 (file)
@@ -16,9 +16,9 @@ scp
 SCP retrieval of missing file followed by good file
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/not-a-valid-file-moooo scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file621.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/not-a-valid-file-moooo scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
-<file name="log/file621.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>
index 7b5fd5b2ee27dc606c2e2ee109160c2380c4d6b4..c4f8508d341d437d8d044d62d80e64eb3e226e8d 100644 (file)
@@ -22,9 +22,9 @@ sftp
 SFTP put failure
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file622.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/nonexistent-directory/nonexistent-file --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/nonexistent-directory/nonexistent-file --insecure
 </command>
-<file name="log/file622.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh upload test
 </file>
index e2914c9d04d8aba5a69f4ebd2f400c965847ace5..d1afb405f9b4b0494e058b3fb976dacb2d22221e 100644 (file)
@@ -22,9 +22,9 @@ scp
 SCP upload failure
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file623.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/log/nonexistent-directory/nonexistent-file --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file%TESTNUMBER.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/log/nonexistent-directory/nonexistent-file --insecure
 </command>
-<file name="log/file623.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh upload test
 </file>
index 8aaf527e5a1e6c55e283424b5171d6ddd264bdb0..8daa93530e47c17ee88c6eaf71735b013e51ff6a 100644 (file)
@@ -22,12 +22,12 @@ sftp
 SFTP put with --ftp-create-dirs
  </name>
  <command>
---ftp-create-dirs --key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file624.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test624.dir/upload.624 --insecure
+--ftp-create-dirs --key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.dir/upload.%TESTNUMBER --insecure
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test610.pl move %PWD/log/test624.dir/upload.624 %PWD/log/upload.624 rmdir %PWD/log/test624.dir
+perl %SRCDIR/libtest/test610.pl move %PWD/log/test%TESTNUMBER.dir/upload.%TESTNUMBER %PWD/log/upload.%TESTNUMBER rmdir %PWD/log/test%TESTNUMBER.dir
 </postcheck>
-<file name="log/file624.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh upload test
 </file>
index 1fe9b55c0ca632e0a0b3420146c496e9923e8ded..e6f0d77f0eb2c0729e96d66b615c92b17de46d29 100644 (file)
@@ -22,12 +22,12 @@ sftp
 SFTP put with --ftp-create-dirs twice
  </name>
  <command>
---ftp-create-dirs --key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file625.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test625.a/upload.625 -T log/file625.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test625.b/upload.625 --insecure
+--ftp-create-dirs --key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.a/upload.%TESTNUMBER -T log/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.b/upload.%TESTNUMBER --insecure
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test610.pl move %PWD/log/test625.a/upload.625 %PWD/log/upload.625 rmdir %PWD/log/test625.a rm %PWD/log/test625.b/upload.625 rmdir %PWD/log/test625.b
+perl %SRCDIR/libtest/test610.pl move %PWD/log/test%TESTNUMBER.a/upload.%TESTNUMBER %PWD/log/upload.%TESTNUMBER rmdir %PWD/log/test%TESTNUMBER.a rm %PWD/log/test%TESTNUMBER.b/upload.%TESTNUMBER rmdir %PWD/log/test%TESTNUMBER.b
 </postcheck>
-<file name="log/file625.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh upload test
 </file>
index edf2aa52087411ee995b363423758726e9c26a63..0580f535b5942744870b78fb4d6af2e8d16345b3 100644 (file)
@@ -22,9 +22,9 @@ sftp
 SFTP invalid quote command
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "invalid-command foo bar" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file626.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "invalid-command foo bar" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
-<file name="log/file626.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test file for rename test
 </file>
 </client>
index 01c5221ac5e127b9f7454c918c35b75d21b9f870..60b830e9221d9414db98de0e2a5c231695cd370b 100644 (file)
@@ -24,12 +24,12 @@ sftp
 SFTP quote remove file with NOBODY
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -I -Q "rm %PWD/log/file627.txt" sftp://%HOSTIP:%SSHPORT --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -I -Q "rm %PWD/log/file%TESTNUMBER.txt" sftp://%HOSTIP:%SSHPORT --insecure
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test610.pl gone %PWD/log/test627.txt
+perl %SRCDIR/libtest/test610.pl gone %PWD/log/test%TESTNUMBER.txt
 </postcheck>
-<file name="log/file627.txt">
+<file name="log/file%TESTNUMBER.txt">
 Dummy test file for remove test
 </file>
 </client>
index 4270da700af6158316095fc7a6d2ec37a09d7e8a..bf8ebfcf85e09bf183d174fcaefb38cb6f76465b 100644 (file)
@@ -31,7 +31,7 @@ HTTP with proxy authorization set in environment
 http_proxy=http://fake:user@%HOSTIP:%HTTPPORT/
 </setenv>
  <command>
-http://we.want.that.site.com/63
+http://we.want.that.site.com/%TESTNUMBER
 </command>
 <features>
 proxy
@@ -41,7 +41,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://we.want.that.site.com/63 HTTP/1.1\r
+GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1\r
 Host: we.want.that.site.com\r
 Proxy-Authorization: Basic ZmFrZTp1c2Vy\r
 User-Agent: curl/%VERSION\r
index 913d981f5fe064ca72a38e671650fe717e657164..f9ad869f18913664bab2fa9222b4883a33498587 100644 (file)
@@ -24,9 +24,9 @@ sftp
 SFTP retrieval with byte range
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file633.txt -r 5-9 --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt -r 5-9 --insecure
 </command>
-<file name="log/file633.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>
index fc250f9c90a60ab8644b4b1696794c78947b13ad..9cf9320fec0ddc78f930821013b2493713b71aee 100644 (file)
@@ -25,9 +25,9 @@ sftp
 SFTP retrieval with byte range past end of file
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file634.txt -r 5-99 --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt -r 5-99 --insecure
 </command>
-<file name="log/file634.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>
index 16ef66c0fae1983b9f70a30836dfb6e6c1927702..5974ee8d3d48f823f4a37edd874671ef2faca1a1 100644 (file)
@@ -24,9 +24,9 @@ sftp
 SFTP retrieval with byte range relative to end of file
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file635.txt -r -9 --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt -r -9 --insecure
 </command>
-<file name="log/file635.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>
index 0ea350904f98039cb6aaca9065cf3cf9691496ae..6bce35b90776b642703f1db062cc244902e5db22 100644 (file)
@@ -25,9 +25,9 @@ sftp
 SFTP retrieval with X- byte range
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file636.txt -r 5- --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt -r 5- --insecure
 </command>
-<file name="log/file636.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>
index 71b81268b937f504c42759a49fd77f9a58205079..542506749b952d7eeb733d2e41763075fff9a497 100644 (file)
@@ -23,9 +23,9 @@ sftp
 SFTP retrieval with invalid X- range
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file637.txt -r 99- --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt -r 99- --insecure
 </command>
-<file name="log/file637.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>
index fdc140c6fef24db84fca37c14c0bc5cb5e7d6d65..85d59096fc5fa32746664d2ca8a22156ddf55b45 100644 (file)
@@ -23,18 +23,18 @@ Dummy test file for rename test
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test610.pl mkdir %PWD/log/test638.dir
+perl %SRCDIR/libtest/test610.pl mkdir %PWD/log/test%TESTNUMBER.dir
 </precheck>
  <name>
 SFTP post-quote rename * asterisk accept-fail
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-*rename %PWD/log/test638.dir %PWD/log/test638.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file638.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-*rename %PWD/log/test%TESTNUMBER.dir %PWD/log/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test610.pl rmdir %PWD/log/test638.new
+perl %SRCDIR/libtest/test610.pl rmdir %PWD/log/test%TESTNUMBER.new
 </postcheck>
-<file name="log/file638.txt">
+<file name="log/file%TESTNUMBER.txt">
 Dummy test file for rename test
 </file>
 </client>
index d80c8c14ca6eff3fc4800fdd05a876ee1d5a85bf..e63cdf61f900f29c97f0b074edeca4dfcdf3f74f 100644 (file)
@@ -23,18 +23,18 @@ Dummy test file for rename test
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test610.pl mkdir %PWD/log/test639.dir
+perl %SRCDIR/libtest/test610.pl mkdir %PWD/log/test%TESTNUMBER.dir
 </precheck>
  <name>
 SFTP post-quote rename * asterisk accept-fail
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-*rename %PWD/log/test639-not-exists-dir %PWD/log/test639.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file639.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-*rename %PWD/log/test%TESTNUMBER-not-exists-dir %PWD/log/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test610.pl rmdir %PWD/log/test639.dir
+perl %SRCDIR/libtest/test610.pl rmdir %PWD/log/test%TESTNUMBER.dir
 </postcheck>
-<file name="log/file639.txt">
+<file name="log/file%TESTNUMBER.txt">
 Dummy test file for rename test
 </file>
 </client>
index 1e7a96eed95098665c9a88738590f4078304e669..8067f1a8589fcbff61fa11ce58fb62faa2e49c29 100644 (file)
@@ -59,21 +59,21 @@ crypto
 HTTP with Digest authorization
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/64 -u testuser:testpass --digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /64 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /64 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/64", response="c55f7f30d83d774a3d2dcacf725abaca"\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="c55f7f30d83d774a3d2dcacf725abaca"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index 9d1ade4c09d67869cfeea9eebdb5480120f19fce..2046dabd8586b85aae248dac1b636b15c73b19c1 100644 (file)
@@ -23,9 +23,9 @@ sftp
 SFTP --head retrieval
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file640.txt --insecure --head
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure --head
 </command>
-<file name="log/file640.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>
index 9f168aaef43b20c1cd52202dd5d6225104d0da22..df1788a0b73652eb4fa452acc681ba7d0a50ae89 100644 (file)
@@ -23,9 +23,9 @@ scp
 SCP --head retrieval
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file641.txt --insecure --head
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure --head
 </command>
-<file name="log/file641.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>
index 6ae52bb82fc20c73569a74f0f0ef5135b793b244..4fa5282c9260f160a367c67067e804f0aef769cc 100644 (file)
@@ -24,9 +24,9 @@ sftp
 SFTP retrieval
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: --compressed-ssh sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file642.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: --compressed-ssh sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
-<file name="log/file642.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>
index 5778fbffb2d2ad3174c884cc45fb0280b1595071..65bb99059d6b41425abb820474c7e21615f0495f 100644 (file)
@@ -44,14 +44,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib643
+lib%TESTNUMBER
 </tool>
 
  <name>
 HTTP multi-part mimepost using read callback for the file part
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/643
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -66,7 +66,7 @@ s/boundary=------------------------[a-z0-9]*/boundary=--------------------------
 # boundary string and since 5 of them are in the body contents, we see
 # (5*12) == 60 bytes less
 <protocol>
-POST /643 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Content-Length: 640\r
@@ -96,7 +96,7 @@ Content-Type: text/plain
 \r
 blah blah\r
 --------------------------------\r
-POST /643 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Content-Length: 654\r
index 99337ae0f8fe38e7b2793e6d1f8ef3ad5bc6d5ed..3a3b1c1ce5ff044f6cd10f1cd7feb6f1d21dd817 100644 (file)
@@ -22,14 +22,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib644
+lib%TESTNUMBER
 </tool>
 
  <name>
 HTTP multi-part formpost with aborted read callback
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/644
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -41,7 +41,7 @@ s/^--------------------------[a-z0-9]*/------------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
 </strippart>
 <protocol>
-POST /644 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Content-Length: 640\r
index 8e8a209a585350017bd9d26eb01f300c87422f99..10b6bef165a2b1a30b7b91a555f7dd4a59392cca 100644 (file)
@@ -44,14 +44,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib645
+lib%TESTNUMBER
 </tool>
 
  <name>
 HTTP multi-part chunked mimepost using read callback for the file part
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/645
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -66,7 +66,7 @@ s/boundary=------------------------[a-z0-9]*/boundary=--------------------------
 # boundary string and since 5 of them are in the body contents, we see
 # (5*12) == 60 bytes less
 <protocol>
-POST /645 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Transfer-Encoding: chunked\r
@@ -127,7 +127,7 @@ blah blah
 \r
 0\r
 \r
-POST /645 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Transfer-Encoding: chunked\r
index a53c340905f29853c31e81ed4423a321bce971af..4c4297c920a7ca9cc6785f3d0c130af82252a287 100644 (file)
@@ -27,14 +27,14 @@ To: another
 body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/646 --mail-rcpt recipient@example.com --mail-from sender@example.com -F "=(;type=multipart/alternative" -F "= <body>This is the html version</body>;headers=X-test1: this is a header;type=text/html;headers=X-test2: this is another header " -F "=This is the plain text version;headers=@log/headers646" -F "=)" -F "=@log/test646.txt;headers=<log/headers646" -H "From: different" -H "To: another" -H "Reply-To: <followup@example.com>"
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -F "=(;type=multipart/alternative" -F "= <body>This is the html version</body>;headers=X-test1: this is a header;type=text/html;headers=X-test2: this is another header " -F "=This is the plain text version;headers=@log/headers%TESTNUMBER" -F "=)" -F "=@log/test%TESTNUMBER.txt;headers=<log/headers%TESTNUMBER" -H "From: different" -H "To: another" -H "Reply-To: <followup@example.com>"
 </command>
-<file1 name="log/test646.txt">
+<file1 name="log/test%TESTNUMBER.txt">
 This is an attached file.
 
 It may contain any type of data.
 </file1>
-<file2 name="log/headers646">
+<file2 name="log/headers%TESTNUMBER">
 # This line is a comment
 X-fileheader1: This is a header from a file \r
 
@@ -52,7 +52,7 @@ s/^--------------------------[a-z0-9]*/------------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
 </strippart>
 <protocol>
-EHLO 646\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient@example.com>\r
 DATA\r
@@ -83,7 +83,7 @@ This is the plain text version
 --------------------------------\r
 \r
 ------------------------------\r
-Content-Disposition: attachment; filename="test646.txt"\r
+Content-Disposition: attachment; filename="test%TESTNUMBER.txt"\r
 X-fileheader1: This is a header from a file\r
 X-fileheader2: This is #a folded header\r
 \r
index de2b467fc5ca995712aefac04eb95b409a0116de..a609ad97d147489e07d03fd95a85c12ed489f0b0 100644 (file)
@@ -22,9 +22,9 @@ imap
 IMAP APPEND multipart using mime API
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT/647 -F "=(;type=multipart/alternative" -F "= <body>This is the html version</body>;type=text/html" -F "=This is the plain text version" -F "=)" -F "=@log/test647.txt" -H "Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)" -H "From: Fred Foobar <foobar@example.com>" -H "To: joe@example.com" -H "Message-Id: <B27397-0100000@example.com>" -H "Subject: afternoon meeting" -u user:secret
+imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -F "=(;type=multipart/alternative" -F "= <body>This is the html version</body>;type=text/html" -F "=This is the plain text version" -F "=)" -F "=@log/test%TESTNUMBER.txt" -H "Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)" -H "From: Fred Foobar <foobar@example.com>" -H "To: joe@example.com" -H "Message-Id: <B27397-0100000@example.com>" -H "Subject: afternoon meeting" -u user:secret
 </command>
-<file name="log/test647.txt">
+<file name="log/test%TESTNUMBER.txt">
 This is an attached file.
 
 It may contain any type of data.
@@ -41,7 +41,7 @@ s/boundary=------------------------[a-z0-9]*/boundary=--------------------------
 <protocol>
 A001 CAPABILITY\r
 A002 LOGIN user secret\r
-A003 APPEND 647 (\Seen) {892}\r
+A003 APPEND %TESTNUMBER (\Seen) {892}\r
 A004 LOGOUT\r
 </protocol>
 <upload>
@@ -67,7 +67,7 @@ This is the plain text version
 --------------------------------\r
 \r
 ------------------------------\r
-Content-Disposition: attachment; filename="test647.txt"\r
+Content-Disposition: attachment; filename="test%TESTNUMBER.txt"\r
 \r
 This is an attached file.
 
index a2b227bcf1623e73d324e9c029694014792fd0b6..15a75e7cd19258ce87c6e219c0ac7bd712f85973 100644 (file)
@@ -27,9 +27,9 @@ To: another
 body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/648 --mail-rcpt recipient@example.com --mail-from sender@example.com -F '=This is the e-mail inline text with a very long line containing the special character = and that should be split by encoder.;headers=Content-disposition: "inline";encoder=quoted-printable' -F "=@log/test648.txt;encoder=base64" -H "From: different" -H "To: another"
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -F '=This is the e-mail inline text with a very long line containing the special character = and that should be split by encoder.;headers=Content-disposition: "inline";encoder=quoted-printable' -F "=@log/test%TESTNUMBER.txt;encoder=base64" -H "From: different" -H "To: another"
 </command>
-<file name="log/test648.txt">
+<file name="log/test%TESTNUMBER.txt">
 This is an attached file.
 
 It may contain any type of data and will be encoded in base64 for transfer.
@@ -44,7 +44,7 @@ s/^--------------------------[a-z0-9]*/------------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
 </strippart>
 <protocol>
-EHLO 648\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient@example.com>\r
 DATA\r
@@ -63,7 +63,7 @@ Content-disposition: "inline"
 This is the e-mail inline text with a very long line containing the special=\r
  character =3D and that should be split by encoder.\r
 ------------------------------\r
-Content-Disposition: attachment; filename="test648.txt"\r
+Content-Disposition: attachment; filename="test%TESTNUMBER.txt"\r
 Content-Transfer-Encoding: base64\r
 \r
 VGhpcyBpcyBhbiBhdHRhY2hlZCBmaWxlLgoKSXQgbWF5IGNvbnRhaW4gYW55IHR5cGUgb2YgZGF0\r
index 46c01cd00301af72500837889273c05d3719d123..0f759f0de95b40f540cee61a03a2f3e8f8465ca2 100644 (file)
@@ -27,9 +27,9 @@ To: another
 body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/649 --mail-rcpt recipient@example.com --mail-from sender@example.com -F '=This is valid;encoder=7bit' -F "=@log/test649.txt;encoder=7bit" -H "From: different" -H "To: another"
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -F '=This is valid;encoder=7bit' -F "=@log/test%TESTNUMBER.txt;encoder=7bit" -H "From: different" -H "To: another"
 </command>
-<file name="log/test649.txt">
+<file name="log/test%TESTNUMBER.txt">
 This is an attached file (in french: pièce jointe).
 
 It contains at least an 8-bit byte value.
@@ -44,7 +44,7 @@ s/^--------------------------[a-z0-9]*/------------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
 </strippart>
 <protocol>
-EHLO 649\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient@example.com>\r
 DATA\r
@@ -60,7 +60,7 @@ Content-Transfer-Encoding: 7bit
 \r
 This is valid\r
 ------------------------------\r
-Content-Disposition: attachment; filename="test649.txt"\r
+Content-Disposition: attachment; filename="test%TESTNUMBER.txt"\r
 Content-Transfer-Encoding: 7bit\r
 \r
 This is an attached file (in french: pi
index 606523183f4ebf6b3a66af1a8d2ac842653ced9b..f1ce72bb219a983ff3447fb5f5d5a132835fde43 100644 (file)
@@ -59,21 +59,21 @@ crypto
 HTTP with Digest authorization with bad password
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/65 -u testuser:test2pass --digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:test2pass --digest
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /65 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /65 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/65", response="66d68d3251f1839576ba7c766cf9205b"\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/%TESTNUMBER", response="66d68d3251f1839576ba7c766cf9205b"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index 19cc10a4ad704a644e1c4a88d12ce2a63f257b91..7045d3626ff645c9642cada5d946c20cee5f51eb 100644 (file)
@@ -28,7 +28,7 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib650
+lib%TESTNUMBER
 </tool>
 
  <name>
@@ -38,9 +38,9 @@ HTTP formpost using form API
  Some data from stdin
 </stdin>
  <command>
-http://%HOSTIP:%HTTPPORT/650 log/test650.filedata
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER log/test%TESTNUMBER.filedata
 </command>
-<file name="log/test650.filedata">
+<file name="log/test%TESTNUMBER.filedata">
 This is data from a file.
 </file>
 </client>
@@ -56,7 +56,7 @@ s/boundary=------------------------[a-z0-9]*/boundary=--------------------------
 # boundary string and since 5 of them are in the body contents, we see
 # (5*12) == 60 bytes less
 <protocol>
-POST /650 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Transfer-Encoding: chunked\r
@@ -80,13 +80,13 @@ Content-Disposition: form-data; name="multifile"
 Content-Type: multipart/mixed; boundary=----------------------------\r
 \r
 ------------------------------\r
-Content-Disposition: attachment; filename="test650.filedata"\r
+Content-Disposition: attachment; filename="test%TESTNUMBER.filedata"\r
 Content-Type: application/octet-stream\r
 \r
 This is data from a file.
 \r
 ------------------------------\r
-Content-Disposition: attachment; filename="test650.filedata"\r
+Content-Disposition: attachment; filename="test%TESTNUMBER.filedata"\r
 Content-Type: text/whatever\r
 \r
 \r
@@ -94,7 +94,7 @@ a5
 This is data from a file.
 \r
 ------------------------------\r
-Content-Disposition: attachment; filename="test650.filedata"\r
+Content-Disposition: attachment; filename="test%TESTNUMBER.filedata"\r
 Content-Type: text/whatever\r
 \r
 \r
index fd370f24d7366b54fe0edb59a271ccabaaa38254..be2cbe405d0aeead0d78095e56df7989d6bfef64 100644 (file)
@@ -28,7 +28,7 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib651
+lib%TESTNUMBER
 </tool>
 
  <name>
@@ -38,9 +38,9 @@ curl_formadd with huge COPYCONTENTS
  Some data from stdin
 </stdin>
  <command>
-http://%HOSTIP:%HTTPPORT/651 log/test651.filedata
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER log/test%TESTNUMBER.filedata
 </command>
-<file name="log/test651.filedata">
+<file name="log/test%TESTNUMBER.filedata">
 This is data from a file.
 </file>
 </client>
@@ -56,7 +56,7 @@ s/boundary=------------------------[a-z0-9]*/boundary=--------------------------
 # boundary string and since 5 of them are in the body contents, we see
 # (5*12) == 60 bytes less
 <protocol>
-POST /651 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Content-Length: 17139\r
index c91dcf2fe54432c311c0614350edf4289ac77650..f4b997216bc76ad3ed8cfa7973d62a96a828208d 100644 (file)
@@ -18,14 +18,14 @@ MIME
 smtp
 </server>
 <tool>
-lib652
+lib%TESTNUMBER
 </tool>
 
  <name>
 SMTP with encoded huge mime data contents
  </name>
  <command>
-smtp://%HOSTIP:%SMTPPORT/652
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -37,7 +37,7 @@ s/^--------------------------[a-z0-9]*/------------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
 </strippart>
 <protocol>
-EHLO 652\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<somebody@example.com>\r
 RCPT TO:<someone@example.com>\r
 DATA\r
index 86516c469a6f14449c1f2c855b4097a39d7ad84c..db62c985b3ca63de08a2c579561b6c22efce0c60 100644 (file)
@@ -44,14 +44,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib653
+lib%TESTNUMBER
 </tool>
 
  <name>
 Reuse of handle after altering mime data
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/653
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -66,7 +66,7 @@ s/boundary=------------------------[a-z0-9]*/boundary=--------------------------
 # boundary string and since 5 of them are in the body contents, we see
 # (5*12) == 60 bytes less
 <protocol>
-POST /653 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Content-Length: 150\r
@@ -77,7 +77,7 @@ Content-Disposition: form-data; name="name"
 \r
 short value\r
 --------------------------------\r
-POST /653 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Content-Length: 167\r
index a4623fbe55de616e4f6d9f0e06c19271ada68d7c..4de65d07bac387283dcd99322030a04e79677ba9 100644 (file)
@@ -44,16 +44,16 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib654
+lib%TESTNUMBER
 </tool>
 
  <name>
 HTTP duplicate easy handle with mime data
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/654
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
-<file name="log/file654.txt">
+<file name="log/file%TESTNUMBER.txt">
 This is data from a file
 </file>
 </client>
@@ -69,12 +69,12 @@ s/boundary=------------------------[a-z0-9]*/boundary=--------------------------
 # boundary string and since 5 of them are in the body contents, we see
 # (5*12) == 60 bytes less
 <protocol>
-POST /654 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Content-Length: 0\r
 \r
-POST /654 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Transfer-Encoding: chunked\r
@@ -86,11 +86,11 @@ Expect: 100-continue
 Content-Disposition: form-data; name="greeting"\r
 Content-Type: application/X-Greeting\r
 Content-Transfer-Encoding: base64\r
-X-Test-Number: 654\r
+X-Test-Number: %TESTNUMBER\r
 \r
 aGVsbG8=\r
 ------------------------------\r
-Content-Disposition: form-data; filename="file654.txt"\r
+Content-Disposition: form-data; filename="file%TESTNUMBER.txt"\r
 Content-Type: text/plain\r
 \r
 This is data from a file
index 3f5019fdf2c4e0ad5cddcfd33800c0e1ba60719b..3f9bc785fbc8c1f8b1b0d125cd6ea18e2e91d564 100644 (file)
@@ -29,14 +29,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib655
+lib%TESTNUMBER
 </tool>
 
  <name>
 resolver start callback
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/655
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
index c004ee3a68558b4ea5465195afe7641ff23e8c87..df5be763f9cb9fa17eef347b87ee6c7d4809ef8a 100644 (file)
@@ -27,19 +27,19 @@ Funny-head: yesyes
 http
 </server>
 <tool>
-lib658
+lib%TESTNUMBER
 </tool>
 <name>
 Pass URL to libcurl with CURLOPT_CURLU
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/658
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 <verify>
 <protocol>
-GET /658 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
index ab89756cf38decfb593768592e3a5ad46608d124..476edcc4c79490cadc636ba6cb59cfa2b8dccb57 100644 (file)
@@ -28,7 +28,7 @@ Funny-head: yesyes
 http
 </server>
 <tool>
-lib659
+lib%TESTNUMBER
 </tool>
 <name>
 CURLOPT_CURLU without the path set - over proxy
index 8fa725ecebc187f4ebafa53f7692e0be98c7abd0..0e66289bbaf2e007d9162043e77cf320775eaccf 100644 (file)
@@ -25,7 +25,7 @@ http
 HTTP GET without headers in the response
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/66 --http0.9
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http0.9
 </command>
 </client>
 
@@ -33,7 +33,7 @@ http://%HOSTIP:%HTTPPORT/66 --http0.9
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /66 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 0847375dc8e4ef8a9c006e629c99ab8368c60edb..3b1964b906fdf29f3f262a59a7a4c70bae4b5973 100644 (file)
@@ -19,7 +19,7 @@ IMAP CONNECT_ONLY option
  </name>
 
 <command>
-imap://%HOSTIP:%IMAPPORT/660
+imap://%HOSTIP:%IMAPPORT/%TESTNUMBER
 </command>
 
 </client>
index 067612be5b8f9b76e5b4c62f4b0fd5207dfe6ee3..ccfdf41ff36ea436c43b55c50c19f4367ea02637 100644 (file)
@@ -19,7 +19,7 @@ ftp
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib661
+lib%TESTNUMBER
 </tool>
 
  <name>
@@ -40,22 +40,22 @@ PWD
 CWD /folderA\r
 EPSV\r
 TYPE I\r
-RETR 661\r
+RETR %TESTNUMBER\r
 CWD /folderB\r
 EPSV\r
-RETR 661\r
+RETR %TESTNUMBER\r
 QUIT\r
 USER anonymous\r
 PASS ftp@example.com\r
 PWD\r
 EPSV\r
 TYPE I\r
-RETR /folderA/661\r
+RETR /folderA/%TESTNUMBER\r
 CWD /folderB\r
 EPSV\r
-RETR 661\r
+RETR %TESTNUMBER\r
 EPSV\r
-RETR /folderA/661\r
+RETR /folderA/%TESTNUMBER\r
 QUIT\r
 USER anonymous\r
 PASS ftp@example.com\r
index b680b864d657af81eb683cba45046fd1f82952e4..5edaf05e7f62a5599268f195af0c7b0ea39b4ceb 100644 (file)
@@ -12,7 +12,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 302 OK\r
-Location: http://example.net/tes t case=/6620002\r
+Location: http://example.net/tes t case=/%TESTNUMBER0002\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Content-Length: 0\r
 \r
@@ -27,7 +27,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 302 OK\r
-Location: http://example.net/tes t case=/6620002\r
+Location: http://example.net/tes t case=/%TESTNUMBER0002\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Content-Length: 0\r
 \r
@@ -50,7 +50,7 @@ http
 HTTP redirect with whitespace in absolute Location: URL
  </name>
  <command>
-http://example.com/please/gimme/662 -L -x http://%HOSTIP:%HTTPPORT
+http://example.com/please/gimme/%TESTNUMBER -L -x http://%HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -61,13 +61,13 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://example.com/please/gimme/662 HTTP/1.1\r
+GET http://example.com/please/gimme/%TESTNUMBER HTTP/1.1\r
 Host: example.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://example.net/tes%20t%20case=/6620002 HTTP/1.1\r
+GET http://example.net/tes%20t%20case=/%TESTNUMBER0002 HTTP/1.1\r
 Host: example.net\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index e654450e495965541ce345b1971e5f19d6eb6628..72692585fdc28ae01affdb4c1e828f9778dae646 100644 (file)
@@ -16,7 +16,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 302 OK\r
-Location: http://example.net/there/it/is/../../tes t case=/6630002? yes no\r
+Location: http://example.net/there/it/is/../../tes t case=/%TESTNUMBER0002? yes no\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Content-Length: 0\r
 \r
@@ -31,7 +31,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 302 OK\r
-Location: http://example.net/there/it/is/../../tes t case=/6630002? yes no\r
+Location: http://example.net/there/it/is/../../tes t case=/%TESTNUMBER0002? yes no\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Content-Length: 0\r
 \r
@@ -54,7 +54,7 @@ http
 HTTP redirect with dotdots and whitespaces in absolute Location: URL
  </name>
  <command>
-http://example.com/please/../gimme/663?foobar#hello -L -x http://%HOSTIP:%HTTPPORT
+http://example.com/please/../gimme/%TESTNUMBER?foobar#hello -L -x http://%HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -65,13 +65,13 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://example.com/gimme/663?foobar HTTP/1.1\r
+GET http://example.com/gimme/%TESTNUMBER?foobar HTTP/1.1\r
 Host: example.com\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://example.net/there/tes%20t%20case=/6630002?+yes+no HTTP/1.1\r
+GET http://example.net/there/tes%20t%20case=/%TESTNUMBER0002?+yes+no HTTP/1.1\r
 Host: example.net\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 6bea4ed1a0e8978b66671cf21319c9cedd3f0c60..69a75df3f8c446aea719aa4da97339894dca9917 100644 (file)
@@ -24,9 +24,9 @@ sftp
 SFTP correct host key
  </name>
  <command>
---hostpubmd5 %SSHSRVMD5 --key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file664.txt
+--hostpubmd5 %SSHSRVMD5 --key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt
 </command>
-<file name="log/file664.txt">
+<file name="log/file%TESTNUMBER.txt">
 test
 </file>
 </client>
index 689fa31b68143a4dc7e24e3dbb01c3140eaad15f..aa20bbfe1949b09e9a7bc7daed56efafd1d372c2 100644 (file)
@@ -24,9 +24,9 @@ scp
 SCP correct host key
  </name>
  <command>
---hostpubmd5 %SSHSRVMD5 --key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file665.txt
+--hostpubmd5 %SSHSRVMD5 --key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt
 </command>
-<file name="log/file665.txt">
+<file name="log/file%TESTNUMBER.txt">
 test
 </file>
 </client>
index 2f6f4284b103da61856836cb19f0a9774e00105b..d8b3356bc91115db3e10ff4606edda12b6bfa9ed 100644 (file)
@@ -36,14 +36,14 @@ OK
 http
 </server>
 <tool>
-lib666
+lib%TESTNUMBER
 </tool>
 
  <name>
 HTTP mime post with binary-encoded huge data contents
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/666
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -55,7 +55,7 @@ s/^--------------------------[a-z0-9]*/------------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
 </strippart>
 <protocol>
-POST /666 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Content-Length: 17225\r
index c6e290fac46ba21f3ce77d576cec08a82a4a8c74..8ae4fd597f9da4843b5ae2d8a908a77b5d152cb0 100644 (file)
@@ -37,14 +37,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib667
+lib%TESTNUMBER
 </tool>
 
  <name>
 HTTP chunked mimepost using single-byte read callback with encoder
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/667
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -59,7 +59,7 @@ s/boundary=------------------------[a-z0-9]*/boundary=--------------------------
 # boundary string and since 5 of them are in the body contents, we see
 # (5*12) == 60 bytes less
 <protocol>
-POST /667 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Transfer-Encoding: chunked\r
index a9c14a5f50afb1e785420e351a885883fffc24e8..dfb9347e81b78cb999cbc2f5feb523deefe1ad89 100644 (file)
@@ -37,16 +37,16 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib668
+lib%TESTNUMBER
 </tool>
 
  <name>
 HTTP mimepost early end of data detection
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/668
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
-<file name="log/file668.txt">
+<file name="log/file%TESTNUMBER.txt">
 This is data from a file
 </file>
 </client>
@@ -62,7 +62,7 @@ s/boundary=------------------------[a-z0-9]*/boundary=--------------------------
 # boundary string and since 5 of them are in the body contents, we see
 # (5*12) == 60 bytes less
 <protocol>
-POST /668 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Transfer-Encoding: chunked\r
@@ -83,7 +83,7 @@ dummy
 91\r
 \r
 ------------------------------\r
-Content-Disposition: form-data; name="field3"; filename="file668.txt"\r
+Content-Disposition: form-data; name="field3"; filename="file%TESTNUMBER.txt"\r
 Content-Type: text/plain\r
 \r
 \r
index 603671f431bec68bbc349846ec3b94edd8112483..20c02a63801f28893c2c1b3431a52fac60a20e55 100644 (file)
@@ -28,7 +28,7 @@ http
 HTTP custom Content-Type with parameter
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/669 -H 'Content-type: multipart/form-data; charset=utf-8' -F name=daniel -F tool=curl
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -H 'Content-type: multipart/form-data; charset=utf-8' -F name=daniel -F tool=curl
 </command>
 </client>
 
@@ -39,7 +39,7 @@ s/^--------------------------[a-z0-9]*/------------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
 </strippart>
 <protocol>
-POST /we/want/669 HTTP/1.1\r
+POST /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 8138c7418b0a85fd11bb00bd3c2b32c4f91a1ca4..c842cf7738161c562a6eeb33f5c8e8766d0fcd36 100644 (file)
@@ -73,7 +73,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/67 -u testuser:testpass --ntlm
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm
 </command>
 <precheck>
 chkhostname curlhost
@@ -83,13 +83,13 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /67 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /67 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
 User-Agent: curl/%VERSION\r
index 2234f0c19624a23f7a16adf315dc96fb0838d075..4d1056c55baf03a29d25d3fe05ccca1f23466604 100644 (file)
@@ -37,14 +37,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib670
+lib%TESTNUMBER
 </tool>
 
  <name>
 Request pause from mime read callback: multi
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/670
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -56,7 +56,7 @@ s/^--------------------------[a-z0-9]*/------------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
 </strippart>
 <protocol>
-POST /670 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Content-Length: 142\r
index 46946abf962a7b77b6fcc9b5d499fa2eb505720a..b6550aa3dcec6d725a46e439100c08b225b3dd98 100644 (file)
@@ -37,14 +37,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib671
+lib%TESTNUMBER
 </tool>
 
  <name>
 Request pause from mime read callback: easy
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/671
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -56,7 +56,7 @@ s/^--------------------------[a-z0-9]*/------------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
 </strippart>
 <protocol>
-POST /671 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Content-Length: 142\r
index e22b8bf22fea67dabf54141eb93c3db0cec83484..43d183e2da3a372e06adbccd33c58435f4480471 100644 (file)
@@ -37,14 +37,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib672
+lib%TESTNUMBER
 </tool>
 
  <name>
 Request pause from form read callback: multi
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/672
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -56,7 +56,7 @@ s/^--------------------------[a-z0-9]*/------------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
 </strippart>
 <protocol>
-POST /672 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Content-Length: 142\r
index 975277909c85482045f3ba675d627e48977c94f0..e263810fd3b1e3d62141eeb758108cef729f9f6a 100644 (file)
@@ -37,14 +37,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib673
+lib%TESTNUMBER
 </tool>
 
  <name>
 Request pause from form read callback: easy
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/673
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -56,7 +56,7 @@ s/^--------------------------[a-z0-9]*/------------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
 </strippart>
 <protocol>
-POST /673 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Content-Length: 142\r
index ae737ef29daec78611ccc7d13be235495155c64c..1afe1f695ed98e327669ca97f063fc02759e9da3 100644 (file)
@@ -28,23 +28,23 @@ Funny-head: yesyes
 http
 </server>
 <tool>
-lib674
+lib%TESTNUMBER
 </tool>
 <name>
 Set CURLOPT_CURLU and dupe the handle
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/674
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 <verify>
 <protocol>
-GET /674 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
-GET /674 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
index 19549dd699a47b37ab1c92e658ea665aedc31882..b0933bede6df744c8d3ac6d15f79abaceb578c06 100644 (file)
@@ -28,7 +28,7 @@ HTTP connection re-use and different credentials
  </name>
 
 <command>
-http://user1:foo1@%HOSTIP:%HTTPPORT/user1/675 http://user2:foo2@%HOSTIP:%HTTPPORT/user2/675
+http://user1:foo1@%HOSTIP:%HTTPPORT/user1/%TESTNUMBER http://user2:foo2@%HOSTIP:%HTTPPORT/user2/%TESTNUMBER
 </command>
 <features>
 proxy
@@ -38,13 +38,13 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /user1/675 HTTP/1.1\r
+GET /user1/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dXNlcjE6Zm9vMQ==\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /user2/675 HTTP/1.1\r
+GET /user2/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dXNlcjI6Zm9vMg==\r
 User-Agent: curl/%VERSION\r
index 57ab2580ce3973ff24ac4630e15ce544e2cb88a1..c26f4c6b8db0b9839c658ff31466e08c273a7206 100644 (file)
@@ -72,7 +72,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/68 -u testuser:testpass --ntlm
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm
 </command>
 <precheck>
 chkhostname curlhost
@@ -82,13 +82,13 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /68 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /68 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
 User-Agent: curl/%VERSION\r
index cc3178a6c0250ed6aa85d84f7465dfb2a197ec9b..f4cd06f2541a845f0c3473baf7bcf76dfd88a407 100644 (file)
@@ -89,7 +89,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/69 -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth
 </command>
 <precheck>
 chkhostname curlhost
@@ -99,18 +99,18 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /69 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /69 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /69 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
 User-Agent: curl/%VERSION\r
index 92ff46f5fea2af77aa759d447fcaba858aa0d712..06df71d3cf89b546033cdb059c77beed9b4a6739 100644 (file)
@@ -32,20 +32,20 @@ http
 HTTP with cookie parser and header recording
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/7 -b none -D log/heads7.txt
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b none -D log/heads%TESTNUMBER.txt
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/7 HTTP/1.1\r
+GET /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file name="log/heads7.txt">
+<file name="log/heads%TESTNUMBER.txt">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
index 7057153e95478509591830dce69bf16e0cedcd8e..622b9a9c52dc8cc9325f669d944ad489482ebcda 100644 (file)
@@ -62,21 +62,21 @@ http
 HTTP with Digest *OR* NTLM authorization
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/70 -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /70 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /70 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604199", uri="/70", response="2c9a6f00af0d86497b177b90e90c688a"\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604199", uri="/%TESTNUMBER", response="2c9a6f00af0d86497b177b90e90c688a"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index af17b8060fd5596a6b7251ea4e4d4e0e7c462683..23e00376647a4e9ea26481afaf5288ef5f8f7b37 100644 (file)
@@ -37,7 +37,7 @@ socks4
 HTTP GET via SOCKS4 proxy
  </name>
  <command>
---socks4 %HOSTIP:%SOCKSPORT http://%HOSTIP:%HTTPPORT/700
+--socks4 %HOSTIP:%SOCKSPORT http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -45,7 +45,7 @@ HTTP GET via SOCKS4 proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /700 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 0e81953798b7566acdabc1c6af05a2dc0f53a676..db22d668ed57518c13c2bf70e16778d306b90c2a 100644 (file)
@@ -37,7 +37,7 @@ socks5
 HTTP GET via SOCKS5 proxy
  </name>
  <command>
---socks5 %HOSTIP:%SOCKSPORT http://%HOSTIP:%HTTPPORT/701
+--socks5 %HOSTIP:%SOCKSPORT http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -45,7 +45,7 @@ HTTP GET via SOCKS5 proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /701 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 9e821c6084b924ee9f2c00907555bd6925d5017a..b9abc45e1212a7302f5cb1533910e4a50408a713 100644 (file)
@@ -23,7 +23,7 @@ http
 Attempt connect to non-listening SOCKS4 proxy
  </name>
  <command>
---socks4 %HOSTIP:%NOLISTENPORT http://%HOSTIP:%HTTPPORT/704
+--socks4 %HOSTIP:%NOLISTENPORT http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 <features>
 proxy
index e7ba01220493a332fd643bcca06f263658e386d1..5d3692dc4057782e25528652395389746f930a1e 100644 (file)
@@ -23,7 +23,7 @@ http
 Attempt connect to non-listening SOCKS5 proxy
  </name>
  <command>
---socks5 %HOSTIP:%NOLISTENPORT http://%HOSTIP:%HTTPPORT/705
+--socks5 %HOSTIP:%NOLISTENPORT http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 <features>
 proxy
index 0b88728b52f8c6fff5a66f2ac329e27fc4669cfa..ff5b91444a52c9ad75cfded6e1360431331d12f3 100644 (file)
@@ -40,7 +40,7 @@ all_proxy=socks4://%HOSTIP:%SOCKSPORT
 HTTP GET via SOCKS4 proxy
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/708
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -48,7 +48,7 @@ http://%HOSTIP:%HTTPPORT/708
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /708 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 9e9da130287deecf8494bb4a7e37ed4651ef3410..9d43c7521a4f943d50630ab6c71029eea476bf79 100644 (file)
@@ -40,7 +40,7 @@ http_proxy=socks5://%HOSTIP:%SOCKSPORT
 HTTP GET via SOCKS5 set in http_proxy environment variable
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/709
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -48,7 +48,7 @@ http://%HOSTIP:%HTTPPORT/709
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /709 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index fe06e9cff6c861413bacb14cfe5871f71633f283..7f8b049b23c379e6472b74de0195cf0d4c426e33 100644 (file)
@@ -30,14 +30,14 @@ HTTP and -F upload in config file
 <stdin>
 -F name=daniel
 -F tool=curl
--F file=@log/test71.txt
+-F file=@log/test%TESTNUMBER.txt
 user-agent = ""
 </stdin>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/71 -K -
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -K -
 </command>
 # We create this file before the command is invoked!
-<file name="log/test71.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo-
 This is a moo-
 bar
@@ -50,7 +50,7 @@ bar
 ^(Content-Type: multipart/form-data;|------------).*
 </strip>
 <protocol>
-POST /we/want/71 HTTP/1.1\r
+POST /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 Content-Length: 408\r
@@ -65,7 +65,7 @@ Content-Disposition: form-data; name="tool"
 \r
 curl\r
 ------------------------------9ef8d6205763\r
-Content-Disposition: form-data; name="file"; filename="test71.txt"\r
+Content-Disposition: form-data; name="file"; filename="test%TESTNUMBER.txt"\r
 Content-Type: text/plain\r
 \r
 foo-
index ba803cbce17bca38ed70f0c27dcf81db6b21ca7d..5302022fe1d15b0ec157a22202899484717acc35 100644 (file)
@@ -37,7 +37,7 @@ socks5
 HTTP GET via SOCKS5 set with --proxy
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/710 --proxy socks5://%HOSTIP:%SOCKSPORT 
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy socks5://%HOSTIP:%SOCKSPORT 
 </command>
 </client>
 
@@ -45,7 +45,7 @@ http://%HOSTIP:%HTTPPORT/710 --proxy socks5://%HOSTIP:%SOCKSPORT
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /710 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 3efbb797719ea7c39dea47bbff74eb4cbae0139c..a70631a08e5ba5849e5a76a899f2a88485a1419b 100644 (file)
@@ -33,7 +33,7 @@ all_proxy=socks5://%HOSTIP:%SOCKSPORT
 FTP fetch with all_proxy set to socks5
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/711
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -46,8 +46,8 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 711\r
-RETR 711\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 252c9ef0e16cd90281f23489bfa034c30d812e2d..0c6a643383a8266d6f5487b83a1d10938a48ba36 100644 (file)
@@ -27,7 +27,7 @@ socks5
 FTP fetch with --proxy set to socks5://
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/712 --proxy socks5://%HOSTIP:%SOCKSPORT 
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --proxy socks5://%HOSTIP:%SOCKSPORT 
 </command>
 </client>
 
@@ -40,8 +40,8 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 712\r
-RETR 712\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index bb79994f59460fe31d50e3745a354823ece00e50..1803f8e9ea8a54ffbfd9bdb4a50747b41cf5f469 100644 (file)
@@ -28,7 +28,7 @@ socks5
 FTP fetch with --proxy set to socks5:// and with --connect-to
  </name>
  <command>
-ftp://ftp.example.com/713 --connect-to ::%HOSTIP:%FTPPORT --proxy socks5://%HOSTIP:%SOCKSPORT 
+ftp://ftp.example.com/%TESTNUMBER --connect-to ::%HOSTIP:%FTPPORT --proxy socks5://%HOSTIP:%SOCKSPORT 
 </command>
 </client>
 
@@ -41,8 +41,8 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 713\r
-RETR 713\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 776d8b29230df53c2409a0c4b69c600282e879b2..b405bcd96d2761b13f73472dbc5feb2a22bfe5da 100644 (file)
@@ -47,7 +47,7 @@ proxy
 FTP fetch with --proxy set to http:// and with --connect-to
  </name>
  <command>
-ftp://ftp.example.com.714/714 --connect-to ::connect.example.com.714:%FTPPORT --proxytunnel --proxy http://%HOSTIP:%PROXYPORT 
+ftp://ftp.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.com.%TESTNUMBER:%FTPPORT --proxytunnel --proxy http://%HOSTIP:%PROXYPORT 
 </command>
 </client>
 
@@ -60,8 +60,8 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 714\r
-RETR 714\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 85372ca24fb68efdc3f85a28d994540d515ac842..1bbceb7900de03fd92468c7af98e7a38b3a1077b 100644 (file)
@@ -49,7 +49,7 @@ proxy
 FTP fetch with --preproxy, --proxy and --connect-to
  </name>
  <command>
-ftp://ftp.example.com.715/715 --connect-to ::connect.example.com.715:%FTPPORT --proxytunnel --proxy %HOSTIP:%PROXYPORT --preproxy socks5://%HOSTIP:%SOCKSPORT 
+ftp://ftp.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.com.%TESTNUMBER:%FTPPORT --proxytunnel --proxy %HOSTIP:%PROXYPORT --preproxy socks5://%HOSTIP:%SOCKSPORT 
 </command>
 </client>
 
@@ -62,8 +62,8 @@ PASS ftp@example.com
 PWD\r
 EPSV\r
 TYPE I\r
-SIZE 715\r
-RETR 715\r
+SIZE %TESTNUMBER\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 531e272fa8a339631be0ded3ab4d2461bec62ff5..4de1cd95fd3690cff5725733eb40dce2ba1975ea 100644 (file)
@@ -31,7 +31,7 @@ SOCKS5 proxy with too long user name
 
 # it should never connect to the target server
  <command>
-http://hohoho.example.com:99/716 -x socks5://AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:b@%HOSTIP:%SOCKSPORT
+http://hohoho.example.com:99/%TESTNUMBER -x socks5://AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:b@%HOSTIP:%SOCKSPORT
 </command>
 </client>
 
index b84a50e9ca4759dd4d253aa034f86da280c2995d..bbbc9ed3fcd707e9edd9448e5061102117b8bc56 100644 (file)
@@ -45,7 +45,7 @@ SOCKS5 proxy auth
 
 # target a port that won't work without the SOCKS magic
  <command>
-http://%HOSTIP:1/717 -x socks5://uz3r:p4ssworm@%HOSTIP:%SOCKSPORT
+http://%HOSTIP:1/%TESTNUMBER -x socks5://uz3r:p4ssworm@%HOSTIP:%SOCKSPORT
 </command>
 <features>
 proxy
@@ -56,7 +56,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /717 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:1\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 1160121b26e63dbe589de30e76763bb8ca1e1939..00c4c6421a345dcb1c6cef8a6c9267ca90526c53 100644 (file)
@@ -61,21 +61,21 @@ crypto
 HTTP with Digest *OR* Basic authorization
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/72 -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /72 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /72 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604199", uri="/72", response="9fcd1330377365a09bbcb33b2cbb25bd"\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604199", uri="/%TESTNUMBER", response="9fcd1330377365a09bbcb33b2cbb25bd"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
index 80208dba748f8bc043f640fdb57fc53acccfb3fd..e211f214862924b59c3330f02478c7b43932429a 100644 (file)
@@ -29,20 +29,20 @@ http
 HTTP, receive cookies when using custom Host:, domain using only two dots
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/73 -c log/jar73.txt -H "Host: host.NOT_DISCLOSED.se"
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -c log/jar%TESTNUMBER.txt -H "Host: host.NOT_DISCLOSED.se"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/73 HTTP/1.1\r
+GET /we/want/%TESTNUMBER HTTP/1.1\r
 Host: host.NOT_DISCLOSED.se\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file name="log/jar73.txt" mode="text">
+<file name="log/jar%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
index 556f8cc1dab0f3bec8a06503c4032bc7bfb1a5d3..524a70eb8c3e2b8ce7b008e217fc497a4109d483 100644 (file)
@@ -43,7 +43,7 @@ http
 HTTP, urlglob {}-retrieval and -o #[num] usage
  </name>
  <command option="no-output">
-"http://%HOSTIP:%HTTPPORT/{74,740001}" -o "log/dumpit#1.dump"
+"http://%HOSTIP:%HTTPPORT/{%TESTNUMBER,%TESTNUMBER0001}" -o "log/dumpit#1.dump"
 </command>
 </client>
 
@@ -51,18 +51,18 @@ HTTP, urlglob {}-retrieval and -o #[num] usage
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /74 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /740001 HTTP/1.1\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<file name="log/dumpit740001.dump">
+<file name="log/dumpit%TESTNUMBER0001.dump">
 HTTP/1.0 200 OK
 Content-Type: text/html
 Funny-head: swsclose
index fc4a30d03b31e0adc6b80959cd5fa3718499c0c1..8aae75aecb7bf4269fed5456c216d06592d9455d 100644 (file)
@@ -22,7 +22,7 @@ http
 HTTP, -O with no file name part in the URL
  </name>
  <command option="no-output">
-http://%HOSTIP:%NOLISTENPORT/76/ -O
+http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER/ -O
 </command>
 </client>
 
index 9720a5e1ac7ad54eabfb8ed515a1b3c8c71c79e0..d7cce4035d18e9cf48c8c2dd06eb82a8c5a21326 100644 (file)
@@ -35,7 +35,7 @@ http
 HTTP with -z "older date"
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/77 -z "dec 12 12:00:00 1999 GMT"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT"
 </command>
 </client>
 
@@ -43,7 +43,7 @@ http://%HOSTIP:%HTTPPORT/77 -z "dec 12 12:00:00 1999 GMT"
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /77 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index d7f7d0fb0cc93676dc23ab383aaba7952ab96e11..60c4029b7fb3fd9c190585278c57a373daa6d9d1 100644 (file)
@@ -47,7 +47,7 @@ http
 HTTP with -z "newer date"
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/78 -z "dec 12 11:00:00 1999 GMT"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 11:00:00 1999 GMT"
 </command>
 </client>
 
@@ -55,7 +55,7 @@ http://%HOSTIP:%HTTPPORT/78 -z "dec 12 11:00:00 1999 GMT"
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /78 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 7e22ca6b400139a1d6c210fe5fe4851cbe66df20..88e9b78e4c469a2a5120887a05625c5242d24ea5 100644 (file)
@@ -35,7 +35,7 @@ proxy
 FTP over HTTP proxy
  </name>
  <command>
-ftp://%HOSTIP:%HTTPPORT/we/want/that/page/79 -x %HOSTIP:%HTTPPORT
+ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT
 </command>
 </client>
 
@@ -43,7 +43,7 @@ ftp://%HOSTIP:%HTTPPORT/we/want/that/page/79 -x %HOSTIP:%HTTPPORT
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/79 HTTP/1.1\r
+GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 439e8cd4552eb65980f6c342eaaa7348c0de341e..a8548e6c2ea5a49a898e1e3a0576bd016c55b406 100644 (file)
@@ -25,11 +25,11 @@ http
 HTTP with cookie parsing from header file
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/8 -b log/heads8.txt
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b log/heads%TESTNUMBER.txt
 </command>
 
 # We create this file before the command is invoked!
-<file name="log/heads8.txt">
+<file name="log/heads%TESTNUMBER.txt">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
@@ -56,7 +56,7 @@ perl -e 'if ("%HOSTIP" !~ /\.0\.0\.1$/) {print "Test only works for HOSTIPs endi
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/8 HTTP/1.1\r
+GET /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index c947dcdbdc7d1c00029dae1ba0d1ebc6fdfcd802..ef62f5228b8888376ce1578ee4152c90d832f4a4 100644 (file)
@@ -53,7 +53,7 @@ http-proxy
 HTTP 1.0 CONNECT with proxytunnel and proxy+host Basic authentication
  </name>
  <command>
-http://test.80:%HTTPPORT/we/want/that/page/80 -p --proxy1.0 %HOSTIP:%PROXYPORT --user iam:myself --proxy-user youare:yourself
+http://test.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -p --proxy1.0 %HOSTIP:%PROXYPORT --user iam:myself --proxy-user youare:yourself
 </command>
 <features>
 proxy
@@ -64,16 +64,16 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT test.80:%HTTPPORT HTTP/1.0\r
-Host: test.80:%HTTPPORT\r
+CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.0\r
+Host: test.%TESTNUMBER:%HTTPPORT\r
 Proxy-Authorization: Basic eW91YXJlOnlvdXJzZWxm\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>
-GET /we/want/that/page/80 HTTP/1.1\r
-Host: test.80:%HTTPPORT\r
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1\r
+Host: test.%TESTNUMBER:%HTTPPORT\r
 Authorization: Basic aWFtOm15c2VsZg==\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 6b74da90fec210f989f1113e04d48668906690c6..9f961ebc9828d85a69bc5871c5dc0e717b3ea59e 100644 (file)
@@ -31,7 +31,7 @@ imap
 IMAP FETCH message
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/800/;MAILINDEX=1' -u '"user:sec"ret{'
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u '"user:sec"ret{'
 </command>
 </client>
 
@@ -41,7 +41,7 @@ IMAP FETCH message
 <protocol>
 A001 CAPABILITY\r
 A002 LOGIN "\"user" "sec\"ret{"\r
-A003 SELECT 800\r
+A003 SELECT %TESTNUMBER\r
 A004 FETCH 1 BODY[]\r
 A005 LOGOUT\r
 </protocol>
index 90766f79fd115da4a5fda571a2eabb53fa5e662a..dcfa18cf6356ad779367447e1bd3ca98f1d98620 100644 (file)
@@ -28,7 +28,7 @@ imap
 IMAP FETCH message by MAILINDEX and SECTION
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/801/;MAILINDEX=123/;SECTION=1' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=123/;SECTION=1' -u user:secret
 </command>
 </client>
 
@@ -38,7 +38,7 @@ IMAP FETCH message by MAILINDEX and SECTION
 <protocol>
 A001 CAPABILITY\r
 A002 LOGIN user secret\r
-A003 SELECT 801\r
+A003 SELECT %TESTNUMBER\r
 A004 FETCH 123 BODY[1]\r
 A005 LOGOUT\r
 </protocol>
index 19206a75da12511ab362f810b6bc9ea7a6574ff8..76ede9e9da95cd15cf268dd1cd70ee146df809ed 100644 (file)
@@ -29,7 +29,7 @@ imap
 IMAP SELECT UIDVALIDITY Success
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/802;UIDVALIDITY=3857529045/;MAILINDEX=123/;SECTION=TEXT' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER;UIDVALIDITY=3857529045/;MAILINDEX=123/;SECTION=TEXT' -u user:secret
 </command>
 </client>
 
@@ -39,7 +39,7 @@ IMAP SELECT UIDVALIDITY Success
 <protocol>
 A001 CAPABILITY\r
 A002 LOGIN user secret\r
-A003 SELECT 802\r
+A003 SELECT %TESTNUMBER\r
 A004 FETCH 123 BODY[TEXT]\r
 A005 LOGOUT\r
 </protocol>
index 834e4211d20079d15c42aac2f0db67b68cfc6f80..f16a419aa2b8eceb7c83dd8c42a9c59b2be56899 100644 (file)
@@ -24,7 +24,7 @@ imap
 IMAP SELECT UIDVALIDITY Failure
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/803;UIDVALIDITY=12345/;MAILINDEX=123' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER;UIDVALIDITY=12345/;MAILINDEX=123' -u user:secret
 </command>
 </client>
 
@@ -38,7 +38,7 @@ IMAP SELECT UIDVALIDITY Failure
 <protocol>
 A001 CAPABILITY\r
 A002 LOGIN user secret\r
-A003 SELECT 803\r
+A003 SELECT %TESTNUMBER\r
 A004 LOGOUT\r
 </protocol>
 </verify>
index 90635c22cc4832db6b75ab6d4e0af0af0184378d..1626cf88c64fc6f5bc385d8ef6185e8f34451cfe 100644 (file)
@@ -28,7 +28,7 @@ imap
 IMAP doesn't perform SELECT if re-using the same mailbox
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/804/;MAILINDEX=123/;SECTION=1' 'imap://%HOSTIP:%IMAPPORT/804/;MAILINDEX=456/;SECTION=2.3' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=123/;SECTION=1' 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=456/;SECTION=2.3' -u user:secret
 </command>
 </client>
 
@@ -38,7 +38,7 @@ IMAP doesn't perform SELECT if re-using the same mailbox
 <protocol>
 A001 CAPABILITY\r
 A002 LOGIN user secret\r
-A003 SELECT 804\r
+A003 SELECT %TESTNUMBER\r
 A004 FETCH 123 BODY[1]\r
 A005 FETCH 456 BODY[2.3]\r
 A006 LOGOUT\r
index e70c1a667b3741252d721db57de1a2e14563a870..5ce64a791aba6859fed95103bbdfc53afbe8a76a 100644 (file)
@@ -23,9 +23,9 @@ imap
 IMAP APPEND message
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT/805 -T log/upload805 -u user:secret
+imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -T log/upload%TESTNUMBER -u user:secret
 </command>
-<file name="log/upload805">
+<file name="log/upload%TESTNUMBER">
 Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)\r
 From: Fred Foobar <foobar@example.COM>\r
 Subject: afternoon meeting\r
@@ -44,7 +44,7 @@ Hello Joe, do you think we can meet at 3:30 tomorrow?
 <protocol>
 A001 CAPABILITY\r
 A002 LOGIN user secret\r
-A003 APPEND 805 (\Seen) {295}\r
+A003 APPEND %TESTNUMBER (\Seen) {295}\r
 A004 LOGOUT\r
 </protocol>
 <upload>
index 37822a47f369f323edf877e03fda1070355f37c6..128ad85bc2863ea077790fca56df0ce29a32b72c 100644 (file)
@@ -11,9 +11,9 @@ LIST
 # Server-side
 <reply>
 <data>
-* LIST () "/" /806/blurdybloop\r
-* LIST (\Noselect) "/" /806/foo\r
-* LIST () "/" /806/foo/bar\r
+* LIST () "/" /%TESTNUMBER/blurdybloop\r
+* LIST (\Noselect) "/" /%TESTNUMBER/foo\r
+* LIST () "/" /%TESTNUMBER/foo/bar\r
 </data>
 </reply>
 
@@ -27,7 +27,7 @@ imap
 IMAP LIST mailbox
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT/806 -u user:secret
+imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -u user:secret
 </command>
 </client>
 
@@ -37,7 +37,7 @@ imap://%HOSTIP:%IMAPPORT/806 -u user:secret
 <protocol>
 A001 CAPABILITY\r
 A002 LOGIN user secret\r
-A003 LIST "806" *\r
+A003 LIST "%TESTNUMBER" *\r
 A004 LOGOUT\r
 </protocol>
 </verify>
index 1271b6d641c3fb4ee8c6bf7ebd452959a22ffaec..59c12eb288bd247f9b24e5572f8e313e122a5de9 100644 (file)
@@ -12,9 +12,9 @@ CUSTOMREQUEST
 # Server-side
 <reply>
 <data>
-* LSUB () "/" /807/blurdybloop\r
-* LSUB (\Noselect) "/" /807/foo\r
-* LSUB () "/" /807/foo/bar\r
+* LSUB () "/" /%TESTNUMBER/blurdybloop\r
+* LSUB (\Noselect) "/" /%TESTNUMBER/foo\r
+* LSUB () "/" /%TESTNUMBER/foo/bar\r
 </data>
 </reply>
 
@@ -28,7 +28,7 @@ imap
 IMAP LSUB mailbox
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT -u user:secret -X 'LSUB "807" *'
+imap://%HOSTIP:%IMAPPORT -u user:secret -X 'LSUB "%TESTNUMBER" *'
 </command>
 </client>
 
@@ -38,7 +38,7 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'LSUB "807" *'
 <protocol>
 A001 CAPABILITY\r
 A002 LOGIN user secret\r
-A003 LSUB "807" *\r
+A003 LSUB "%TESTNUMBER" *\r
 A004 LOGOUT\r
 </protocol>
 </verify>
index 30c8bdfd22c412bb85f44db4e5e1ededad9468dd..a77589a7cc57b0e2385b8a1983303e00dcfe3b04 100644 (file)
@@ -32,7 +32,7 @@ imap
 IMAP EXAMINE mailbox (CUSTOMREQUEST)
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT -u user:secret -X 'EXAMINE 808'
+imap://%HOSTIP:%IMAPPORT -u user:secret -X 'EXAMINE %TESTNUMBER'
 </command>
 </client>
 
@@ -42,7 +42,7 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'EXAMINE 808'
 <protocol>
 A001 CAPABILITY\r
 A002 LOGIN user secret\r
-A003 EXAMINE 808\r
+A003 EXAMINE %TESTNUMBER\r
 A004 LOGOUT\r
 </protocol>
 </verify>
index 4283179d74e7615ae8609cf86603457c203a3499..8122eaf698d036f610614651a905f646b80dcee6 100644 (file)
@@ -12,7 +12,7 @@ CUSTOMREQUEST
 # Server-side
 <reply>
 <data>
-* STATUS 809 (MESSAGES 231 UIDNEXT 44292)\r
+* STATUS %TESTNUMBER (MESSAGES 231 UIDNEXT 44292)\r
 </data>
 </reply>
 
@@ -26,7 +26,7 @@ imap
 IMAP mailbox STATUS (CUSTOMREQUEST)
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT -u user:secret -X 'STATUS 809 (UIDNEXT MESSAGES)'
+imap://%HOSTIP:%IMAPPORT -u user:secret -X 'STATUS %TESTNUMBER (UIDNEXT MESSAGES)'
 </command>
 </client>
 
@@ -36,7 +36,7 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'STATUS 809 (UIDNEXT MESSAGES)'
 <protocol>
 A001 CAPABILITY\r
 A002 LOGIN user secret\r
-A003 STATUS 809 (UIDNEXT MESSAGES)\r
+A003 STATUS %TESTNUMBER (UIDNEXT MESSAGES)\r
 A004 LOGOUT\r
 </protocol>
 </verify>
index 6a49125576ceed41df23037159481967a1bd962f..3392ec3f54b1049cf49962d6aaec1578952c6abc 100644 (file)
@@ -73,7 +73,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/81 --proxy-user testuser:testpass -x http://%HOSTIP:%HTTPPORT --proxy-ntlm
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy-user testuser:testpass -x http://%HOSTIP:%HTTPPORT --proxy-ntlm
 </command>
 <precheck>
 chkhostname curlhost
@@ -83,14 +83,14 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/81 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
-GET http://%HOSTIP:%HTTPPORT/81 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
 User-Agent: curl/%VERSION\r
index 6b4d243fd62406f7ccda920458a37003e5d2e702..80aac560e15eafce801c1efab051e797afc80e24 100644 (file)
@@ -11,7 +11,7 @@ SEARCH
 # Server-side
 <reply>
 <data>
-* SEARCH 1 123 456 810\r
+* SEARCH 1 123 456 %TESTNUMBER\r
 </data>
 </reply>
 
@@ -25,7 +25,7 @@ imap
 IMAP SEARCH for NEW messages
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT/810?NEW -u user:secret
+imap://%HOSTIP:%IMAPPORT/%TESTNUMBER?NEW -u user:secret
 </command>
 </client>
 
@@ -35,7 +35,7 @@ imap://%HOSTIP:%IMAPPORT/810?NEW -u user:secret
 <protocol>
 A001 CAPABILITY\r
 A002 LOGIN user secret\r
-A003 SELECT 810\r
+A003 SELECT %TESTNUMBER\r
 A004 SEARCH NEW\r
 A005 LOGOUT\r
 </protocol>
index 8fb3aa7a72fdfd4c0b148d13ffe342d041598be7..f0938be118079c406928d62529e3238a7442ce60 100644 (file)
@@ -23,7 +23,7 @@ imap
 IMAP CREATE mailbox (CUSTOMREQUEST)
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT -u user:secret -X 'CREATE 811'
+imap://%HOSTIP:%IMAPPORT -u user:secret -X 'CREATE %TESTNUMBER'
 </command>
 </client>
 
@@ -33,7 +33,7 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'CREATE 811'
 <protocol>
 A001 CAPABILITY\r
 A002 LOGIN user secret\r
-A003 CREATE 811\r
+A003 CREATE %TESTNUMBER\r
 A004 LOGOUT\r
 </protocol>
 </verify>
index 6d1b42df9623ea05eabbe33898a693e88b74ffe2..8374ea093646801610b04ea2bedaa262442a5516 100644 (file)
@@ -23,7 +23,7 @@ imap
 IMAP DELETE mailbox (CUSTOMREQUEST)
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT -u user:secret -X 'DELETE 812'
+imap://%HOSTIP:%IMAPPORT -u user:secret -X 'DELETE %TESTNUMBER'
 </command>
 </client>
 
@@ -33,7 +33,7 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'DELETE 812'
 <protocol>
 A001 CAPABILITY\r
 A002 LOGIN user secret\r
-A003 DELETE 812\r
+A003 DELETE %TESTNUMBER\r
 A004 LOGOUT\r
 </protocol>
 </verify>
index 3544da6707cd2a407d11e620cd43eb0a33c16475..2e8c42d0cfc3627e1e169a56e7e8d7d8f1814ada 100644 (file)
@@ -23,7 +23,7 @@ imap
 IMAP RENAME mailbox (CUSTOMREQUEST)
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT -u user:secret -X 'RENAME 666 813'
+imap://%HOSTIP:%IMAPPORT -u user:secret -X 'RENAME 666 %TESTNUMBER'
 </command>
 </client>
 
@@ -33,7 +33,7 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'RENAME 666 813'
 <protocol>
 A001 CAPABILITY\r
 A002 LOGIN user secret\r
-A003 RENAME 666 813\r
+A003 RENAME 666 %TESTNUMBER\r
 A004 LOGOUT\r
 </protocol>
 </verify>
index 0b90e5bcb0a3d43e3a44ed5fa016c46ff0d47714..c673c43558a04a09dc79e2bef60399b942661831 100644 (file)
@@ -23,7 +23,7 @@ imap
 IMAP CHECK mailbox (CUSTOMREQUEST)
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT/814 -u user:secret -X 'CHECK'
+imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -u user:secret -X 'CHECK'
 </command>
 </client>
 
@@ -33,7 +33,7 @@ imap://%HOSTIP:%IMAPPORT/814 -u user:secret -X 'CHECK'
 <protocol>
 A001 CAPABILITY\r
 A002 LOGIN user secret\r
-A003 SELECT 814\r
+A003 SELECT %TESTNUMBER\r
 A004 CHECK\r
 A005 LOGOUT\r
 </protocol>
index 6ebe5bf65feb699e576dbabc2598888b0f566ca7..4ac24f3adf7128a0bef172561db823cb8b4bdbda 100644 (file)
@@ -27,7 +27,7 @@ imap
 IMAP STORE - delete message (CUSTOMREQUEST)
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT/815 -X 'STORE 123 +Flags \Deleted' -u user:secret -: imap://%HOSTIP:%IMAPPORT/815 -X CLOSE -u user:secret
+imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -X 'STORE 123 +Flags \Deleted' -u user:secret -: imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -X CLOSE -u user:secret
 </command>
 </client>
 
@@ -37,7 +37,7 @@ imap://%HOSTIP:%IMAPPORT/815 -X 'STORE 123 +Flags \Deleted' -u user:secret -: im
 <protocol>
 A001 CAPABILITY\r
 A002 LOGIN user secret\r
-A003 SELECT 815\r
+A003 SELECT %TESTNUMBER\r
 A004 STORE 123 +Flags \Deleted\r
 A005 CLOSE\r
 A006 LOGOUT\r
index 6df9b7dfafcee15d9ad6eab7057808a8b1ceed3f..cf4702d149ed2cca957dd244ab7bfba1c46ea4ba 100644 (file)
@@ -30,7 +30,7 @@ imap
 IMAP STORE - delete message with confirmation (CUSTOMREQUEST)
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT/816 -X 'STORE 123 +Flags \Deleted' -u user:secret -: imap://%HOSTIP:%IMAPPORT/816 -X EXPUNGE -u user:secret
+imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -X 'STORE 123 +Flags \Deleted' -u user:secret -: imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -X EXPUNGE -u user:secret
 </command>
 </client>
 
@@ -40,7 +40,7 @@ imap://%HOSTIP:%IMAPPORT/816 -X 'STORE 123 +Flags \Deleted' -u user:secret -: im
 <protocol>
 A001 CAPABILITY\r
 A002 LOGIN user secret\r
-A003 SELECT 816\r
+A003 SELECT %TESTNUMBER\r
 A004 STORE 123 +Flags \Deleted\r
 A005 EXPUNGE\r
 A006 LOGOUT\r
index 9b44ae9b18742e56eceb1973b836c949a61ef842..9efa06d46eed210e28d183eda89e9802eee75e57 100644 (file)
@@ -23,7 +23,7 @@ imap
 IMAP COPY message to mailbox (CUSTOMREQUEST)
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT -u user:secret -X 'COPY 123 817'
+imap://%HOSTIP:%IMAPPORT -u user:secret -X 'COPY 123 %TESTNUMBER'
 </command>
 </client>
 
@@ -33,7 +33,7 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'COPY 123 817'
 <protocol>
 A001 CAPABILITY\r
 A002 LOGIN user secret\r
-A003 COPY 123 817\r
+A003 COPY 123 %TESTNUMBER\r
 A004 LOGOUT\r
 </protocol>
 </verify>
index 4213e3ea68b6eed0e56c0c5fc99c442345ca6386..d2f0db201ca8ee88877956fb6039ea90df515504 100644 (file)
@@ -37,7 +37,7 @@ imap
 IMAP plain authentication
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/819/;MAILINDEX=1' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>
 
@@ -48,7 +48,7 @@ IMAP plain authentication
 A001 CAPABILITY\r
 A002 AUTHENTICATE PLAIN\r
 AHVzZXIAc2VjcmV0\r
-A003 SELECT 819\r
+A003 SELECT %TESTNUMBER\r
 A004 FETCH 1 BODY[]\r
 A005 LOGOUT\r
 </protocol>
index 138c8ee40e7c2f7c8223f409ce411ed46ad48de7..9139833230a80e064e0a13f4881dacbf8830cf64 100644 (file)
@@ -35,14 +35,14 @@ http
 HTTP with proxy requiring NTLM, but we send Basic
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/82 --proxy-user testuser:testpass -x http://%HOSTIP:%HTTPPORT
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy-user testuser:testpass -x http://%HOSTIP:%HTTPPORT
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/82 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Proxy-Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=\r
 User-Agent: curl/%VERSION\r
index 0fe9bf2d6914526f9a99a96f818e133eb9a40010..8b684acad6c8124434d4282c0fb3142ff6aa2bef 100644 (file)
@@ -37,7 +37,7 @@ imap
 IMAP login authentication
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/820/;MAILINDEX=1' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>
 
@@ -49,7 +49,7 @@ A001 CAPABILITY
 A002 AUTHENTICATE LOGIN\r
 dXNlcg==\r
 c2VjcmV0\r
-A003 SELECT 820\r
+A003 SELECT %TESTNUMBER\r
 A004 FETCH 1 BODY[]\r
 A005 LOGOUT\r
 </protocol>
index 6c511c1ef3217002d7ecb1c874d65bf464ae0833..179574beed025d54083fc31c8d97f02e24090bee 100644 (file)
@@ -40,7 +40,7 @@ crypto
 IMAP CRAM-MD5 authentication
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/821/;MAILINDEX=1' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>
 
@@ -51,7 +51,7 @@ IMAP CRAM-MD5 authentication
 A001 CAPABILITY\r
 A002 AUTHENTICATE CRAM-MD5\r
 dXNlciA3MDMxNzI1NTk5ZmRiYjVkNDEyNjg5YWEzMjNlM2UwYg==\r
-A003 SELECT 821\r
+A003 SELECT %TESTNUMBER\r
 A004 FETCH 1 BODY[]\r
 A005 LOGOUT\r
 </protocol>
index aa264edd6bb8c120eb7702ffc270d2f77d2e6d38..2e2f6f14e6ee5a10d654bb5ad3b90d00227b2d65 100644 (file)
@@ -49,7 +49,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-'imap://%HOSTIP:%IMAPPORT/822/;MAILINDEX=1' -u testuser:testpass
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u testuser:testpass
 </command>
 <precheck>
 chkhostname curlhost
@@ -64,7 +64,7 @@ A001 CAPABILITY
 A002 AUTHENTICATE NTLM\r
 TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
-A003 SELECT 822\r
+A003 SELECT %TESTNUMBER\r
 A004 FETCH 1 BODY[]\r
 A005 LOGOUT\r
 </protocol>
index 32bd9d18978970cc890a0e08420125dbfba0205c..b179a1807b9cf2d8364ff788f0f2aee676ef35ac 100644 (file)
@@ -43,7 +43,7 @@ crypto
 IMAP DIGEST-MD5 authentication
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/823/;MAILINDEX=1' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>
 
@@ -55,7 +55,7 @@ A001 CAPABILITY
 A002 AUTHENTICATE DIGEST-MD5\r
 dXNlcm5hbWU9InVzZXIiLHJlYWxtPSJjdXJsIixub25jZT0iNTMwMGQxN2ExZDY5NWJkNDExZTRjZGY5NmY5NTQ4YzIzY2VkNjE3NSIsY25vbmNlPSIzNDMzMzIzMTM1MzMzMjMxMzYzMzMyMzEzNzMzMzIzMSIsbmM9IjAwMDAwMDAxIixkaWdlc3QtdXJpPSJpbWFwL2N1cmwiLHJlc3BvbnNlPTVlNzk5N2ZhZDZjMzNiZWJmZjk3OWJkY2I4ZmU3MTZiLHFvcD1hdXRo\r
 \r
-A003 SELECT 823\r
+A003 SELECT %TESTNUMBER\r
 A004 FETCH 1 BODY[]\r
 A005 LOGOUT\r
 </protocol>
index 96c8e87b9999e1dfca86a2161db8402a70dfa704..28630e48039b7b1f1fadbd55cbc6f74a1d53579c 100644 (file)
@@ -37,7 +37,7 @@ imap
 IMAP OAuth 2.0 (XOAUTH2) authentication
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/824/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 </client>
 
@@ -48,7 +48,7 @@ IMAP OAuth 2.0 (XOAUTH2) authentication
 A001 CAPABILITY\r
 A002 AUTHENTICATE XOAUTH2\r
 dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB\r
-A003 SELECT 824\r
+A003 SELECT %TESTNUMBER\r
 A004 FETCH 1 BODY[]\r
 A005 LOGOUT\r
 </protocol>
index d28b6a519a0361d013a0dd8c130736c46b636b91..fd4e047a385c021a382896493cb35e5de1adbea4 100644 (file)
@@ -38,7 +38,7 @@ imap
 IMAP plain authentication with initial response
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/825/;MAILINDEX=1' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>
 
@@ -48,7 +48,7 @@ IMAP plain authentication with initial response
 <protocol>
 A001 CAPABILITY\r
 A002 AUTHENTICATE PLAIN AHVzZXIAc2VjcmV0\r
-A003 SELECT 825\r
+A003 SELECT %TESTNUMBER\r
 A004 FETCH 1 BODY[]\r
 A005 LOGOUT\r
 </protocol>
index a1125e2f40ce974f489a0975106d08ee4f8bf5c6..19247f0ec1a16912ee0546c1b35e632c103d52ab 100644 (file)
@@ -38,7 +38,7 @@ imap
 IMAP login authentication with initial response
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/826/;MAILINDEX=1' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>
 
@@ -49,7 +49,7 @@ IMAP login authentication with initial response
 A001 CAPABILITY\r
 A002 AUTHENTICATE LOGIN dXNlcg==\r
 c2VjcmV0\r
-A003 SELECT 826\r
+A003 SELECT %TESTNUMBER\r
 A004 FETCH 1 BODY[]\r
 A005 LOGOUT\r
 </protocol>
index 9cefb5005378d76707a35759f0ba556e7f3ac854..b828c9bf3e0d2ca07844ddc09da4a133ed4efe56 100644 (file)
@@ -50,7 +50,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-'imap://%HOSTIP:%IMAPPORT/827/;MAILINDEX=1' -u testuser:testpass
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u testuser:testpass
 </command>
 <precheck>
 chkhostname curlhost
@@ -64,7 +64,7 @@ chkhostname curlhost
 A001 CAPABILITY\r
 A002 AUTHENTICATE NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
-A003 SELECT 827\r
+A003 SELECT %TESTNUMBER\r
 A004 FETCH 1 BODY[]\r
 A005 LOGOUT\r
 </protocol>
index 912aeff3d805f18a8af063ba07f47ebfff809f0a..40f2b1252fa3745df371df0a0e999bc63ac91f4c 100644 (file)
@@ -38,7 +38,7 @@ imap
 IMAP OAuth 2.0 (XOAUTH2) authentication with initial response
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/828/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 </client>
 
@@ -48,7 +48,7 @@ IMAP OAuth 2.0 (XOAUTH2) authentication with initial response
 <protocol>
 A001 CAPABILITY\r
 A002 AUTHENTICATE XOAUTH2 dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB\r
-A003 SELECT 828\r
+A003 SELECT %TESTNUMBER\r
 A004 FETCH 1 BODY[]\r
 A005 LOGOUT\r
 </protocol>
index cefba0d79090d45973be06a2070bcb5dc1cebbf9..46ff4e165af4834ef46aba68d84e6613d2bc14da 100644 (file)
@@ -15,7 +15,7 @@ imap
 IMAP with URL-encoded CR LF in the URL
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT/%0d%0a/829
+imap://%HOSTIP:%IMAPPORT/%0d%0a/%TESTNUMBER
 </command>
 </client>
 
index dead5db3f509a3cc5ca318afe5d5a8b624f6e9d6..dffdb92a588224a10dbcf3bfacaf09f897db5483 100644 (file)
@@ -50,7 +50,7 @@ http-proxy
 HTTP over proxy-tunnel with site authentication
  </name>
  <command>
-http://test.83:%HTTPPORT/we/want/that/page/83 -p -x %HOSTIP:%PROXYPORT --user 'iam:my:;self'
+http://test.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -p -x %HOSTIP:%PROXYPORT --user 'iam:my:;self'
 </command>
 <features>
 proxy
@@ -61,15 +61,15 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT test.83:%HTTPPORT HTTP/1.1\r
-Host: test.83:%HTTPPORT\r
+CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
+Host: test.%TESTNUMBER:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>
-GET /we/want/that/page/83 HTTP/1.1\r
-Host: test.83:%HTTPPORT\r
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1\r
+Host: test.%TESTNUMBER:%HTTPPORT\r
 Authorization: Basic aWFtOm15OjtzZWxm\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index c7812b7944813f0ff501c028ec638b4dfe294383..d02ed6b08f0567348af23d845614bce7fecf6504 100644 (file)
@@ -33,7 +33,7 @@ crypto
 IMAP CRAM-MD5 graceful cancellation
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/830/;MAILINDEX=1' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>
 
index eae10f048e98178d4433f628b1ff676d830951a4..99e0fa4b29fb045e69802af0b7055b76e736a0fb 100644 (file)
@@ -41,7 +41,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-'imap://%HOSTIP:%IMAPPORT/831/;MAILINDEX=1' -u testuser:testpass
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u testuser:testpass
 </command>
 <precheck>
 chkhostname curlhost
index 360654ab032218055d05372641078cc92acaa829..dc15aa716fcb2679b1491c646a5042a3145c53db 100644 (file)
@@ -35,7 +35,7 @@ crypto
 IMAP DIGEST-MD5 graceful cancellation
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/832/;MAILINDEX=1' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>
 
index 2c694adccafce3f61838378c1c041f30a0ddea78..5784c416408ff687d86469ea8fef8637850fbaa9 100644 (file)
@@ -44,7 +44,7 @@ crypto
 IMAP CRAM-MD5 authentication with SASL downgrade
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/833/;MAILINDEX=1' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>
 
@@ -57,7 +57,7 @@ A002 AUTHENTICATE CRAM-MD5
 *\r
 A003 AUTHENTICATE PLAIN\r
 AHVzZXIAc2VjcmV0\r
-A004 SELECT 833\r
+A004 SELECT %TESTNUMBER\r
 A005 FETCH 1 BODY[]\r
 A006 LOGOUT\r
 </protocol>
index 8ecc22322d9d2a3f8cbf48b8c0b5f96570bda33a..f99d9dd5dc35f287579c0a35d5575f46431a7fb9 100644 (file)
@@ -52,7 +52,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-'imap://%HOSTIP:%IMAPPORT/834/;MAILINDEX=1' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 <precheck>
 chkhostname curlhost
@@ -69,7 +69,7 @@ TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 *\r
 A003 AUTHENTICATE PLAIN\r
 AHVzZXIAc2VjcmV0\r
-A004 SELECT 834\r
+A004 SELECT %TESTNUMBER\r
 A005 FETCH 1 BODY[]\r
 A006 LOGOUT\r
 </protocol>
index b44e877ec453ed3885c78bc3b6db294fe90ed794..fd6badde12e985ec7ce72517f31943f8e52a4584 100644 (file)
@@ -46,7 +46,7 @@ crypto
 IMAP DIGEST-MD5 authentication with SASL downgrade
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/835/;MAILINDEX=1' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>
 
@@ -59,7 +59,7 @@ A002 AUTHENTICATE DIGEST-MD5
 *\r
 A003 AUTHENTICATE PLAIN\r
 AHVzZXIAc2VjcmV0\r
-A004 SELECT 835\r
+A004 SELECT %TESTNUMBER\r
 A005 FETCH 1 BODY[]\r
 A006 LOGOUT\r
 </protocol>
index 9478042ed9744407eecefcb5f8670a52d3b58314..36c5166e59dff5fb41cdc472900643409b148b11 100644 (file)
@@ -36,7 +36,7 @@ imap
 IMAP multiple connection authentication
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/836/;MAILINDEX=1' -u user.one:secret -: 'imap://%HOSTIP:%IMAPPORT/836/;UID=2' -u user.two:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user.one:secret -: 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;UID=2' -u user.two:secret
 </command>
 </client>
 
@@ -46,12 +46,12 @@ IMAP multiple connection authentication
 <protocol>
 A001 CAPABILITY\r
 A002 LOGIN user.one secret\r
-A003 SELECT 836\r
+A003 SELECT %TESTNUMBER\r
 A004 FETCH 1 BODY[]\r
 A005 LOGOUT\r
 B001 CAPABILITY\r
 B002 LOGIN user.two secret\r
-B003 SELECT 836\r
+B003 SELECT %TESTNUMBER\r
 B004 FETCH 2 BODY[]\r
 B005 LOGOUT\r
 </protocol>
index 032726681a6287c411d4d8752d9111277aa8c4ad..2e46be622e2cdb7bb5b13bcc4cffed7fbc799220 100644 (file)
@@ -37,7 +37,7 @@ imap
 IMAP external authentication
  </name>
  <command>
-'imap://user;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/837/;MAILINDEX=1'
+'imap://user;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1'
 </command>
 </client>
 
@@ -48,7 +48,7 @@ IMAP external authentication
 A001 CAPABILITY\r
 A002 AUTHENTICATE EXTERNAL\r
 dXNlcg==\r
-A003 SELECT 837\r
+A003 SELECT %TESTNUMBER\r
 A004 FETCH 1 BODY[]\r
 A005 LOGOUT\r
 </protocol>
index f5378fb4009fbc4146e219c4ae05f15023817712..11ed7aaf09dbc0bf644cf6e5c834bfec77e3704f 100644 (file)
@@ -37,7 +37,7 @@ imap
 IMAP external authentication without credentials
  </name>
  <command>
-'imap://;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/838/;MAILINDEX=1'
+'imap://;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1'
 </command>
 </client>
 
@@ -48,7 +48,7 @@ IMAP external authentication without credentials
 A001 CAPABILITY\r
 A002 AUTHENTICATE EXTERNAL\r
 =\r
-A003 SELECT 838\r
+A003 SELECT %TESTNUMBER\r
 A004 FETCH 1 BODY[]\r
 A005 LOGOUT\r
 </protocol>
index 508fb8e5723ddb30c391c350ecfa10c0709315db..8240bf3973ff0346ce5b78f824b1400df3c27bed 100644 (file)
@@ -38,7 +38,7 @@ imap
 IMAP external authentication with initial response
  </name>
  <command>
-'imap://user;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/839/;MAILINDEX=1'
+'imap://user;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1'
 </command>
 </client>
 
@@ -48,7 +48,7 @@ IMAP external authentication with initial response
 <protocol>
 A001 CAPABILITY\r
 A002 AUTHENTICATE EXTERNAL dXNlcg==\r
-A003 SELECT 839\r
+A003 SELECT %TESTNUMBER\r
 A004 FETCH 1 BODY[]\r
 A005 LOGOUT\r
 </protocol>
index 178244bea5013a0a49e179ee0301f81e9372acc4..cc7626294c1718de780d55f14bfcfe2d32273a75 100644 (file)
@@ -31,7 +31,7 @@ http
 HTTP over proxy with site authentication
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/that/page/84 -x %HOSTIP:%HTTPPORT --user iam:myself
+http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT --user iam:myself
 </command>
 <features>
 proxy
@@ -42,7 +42,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/we/want/that/page/84 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic aWFtOm15c2VsZg==\r
 User-Agent: curl/%VERSION\r
index 1e85af396b2930da51067e9cdbf7745222d6b383..551005359d67ef963f9bfe3e8ba14b1fd66d8357 100644 (file)
@@ -38,7 +38,7 @@ imap
 IMAP external authentication with initial response without credentials
  </name>
  <command>
-'imap://;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/840/;MAILINDEX=1'
+'imap://;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1'
 </command>
 </client>
 
@@ -48,7 +48,7 @@ IMAP external authentication with initial response without credentials
 <protocol>
 A001 CAPABILITY\r
 A002 AUTHENTICATE EXTERNAL =\r
-A003 SELECT 840\r
+A003 SELECT %TESTNUMBER\r
 A004 FETCH 1 BODY[]\r
 A005 LOGOUT\r
 </protocol>
index 839bfe3d0940a1770d83c887ee9d493eaa06b590..c5258c920e4fdcc7635c6babf43a9a161cd64ed4 100644 (file)
@@ -33,7 +33,7 @@ imap
 IMAP custom request doesn't check continuation data
  </name>
  <command>
- imap://%HOSTIP:%IMAPPORT/841/ -u user:secret -X 'FETCH 123 BODY[1]'
+ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/ -u user:secret -X 'FETCH 123 BODY[1]'
 </command>
 </client>
 
@@ -43,7 +43,7 @@ IMAP custom request doesn't check continuation data
 <protocol>
 A001 CAPABILITY\r
 A002 LOGIN user secret\r
-A003 SELECT 841\r
+A003 SELECT %TESTNUMBER\r
 A004 FETCH 123 BODY[1]\r
 A005 LOGOUT\r
 </protocol>
index 2b5ae1c18ada5d72d7010330729d6ba2a50ff521..42148d03eabb5f09cee2b0c1b580891fdf7fb7a9 100644 (file)
@@ -38,7 +38,7 @@ imap
 IMAP OAuth 2.0 (OAUTHBEARER) authentication
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/842/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 # The protocol section doesn't support ways of specifying the raw data in the
 # base64 encoded message so we must assert this
@@ -51,7 +51,7 @@ IMAP OAuth 2.0 (OAUTHBEARER) authentication
 A001 CAPABILITY\r
 A002 AUTHENTICATE OAUTHBEARER\r
 %b64[n,a=user,%01host=127.0.0.1%01port=%IMAPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%\r
-A003 SELECT 842\r
+A003 SELECT %TESTNUMBER\r
 A004 FETCH 1 BODY[]\r
 A005 LOGOUT\r
 </protocol>
index 131188933db4c0c18232994cb8e44f3b7309cb3f..dcf5c1be40ac92908e149be71bf392f957448c3a 100644 (file)
@@ -39,7 +39,7 @@ imap
 IMAP OAuth 2.0 (OAUTHBEARER) authentication with initial response
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/843/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 </client>
 
@@ -49,7 +49,7 @@ IMAP OAuth 2.0 (OAUTHBEARER) authentication with initial response
 <protocol>
 A001 CAPABILITY\r
 A002 AUTHENTICATE OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%IMAPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%\r
-A003 SELECT 843\r
+A003 SELECT %TESTNUMBER\r
 A004 FETCH 1 BODY[]\r
 A005 LOGOUT\r
 </protocol>
index 8573bc2fd62122fe0d2f9d31b3657f6581308c02..83dff8e5977cb5b2d7817777277014fdaa43a8b6 100644 (file)
@@ -29,7 +29,7 @@ imap
 IMAP OAuth 2.0 (OAUTHBEARER) failure as continuation
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/844/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 </client>
 
index 449eef35367bcbad59bd62f63d20bff2e2dfd84e..d622f0cdca9ed41dd646361a55d467bad68fbfc1 100644 (file)
@@ -31,7 +31,7 @@ imap
 IMAP OAuth 2.0 (OAUTHBEARER) failure as continuation with initial response
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/845/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 </client>
 
index 8d4d3c5fcf6ba040d79e7ed7895d3e65342dfa33..b04561b89815de26d18b544d32c005c321a02602 100644 (file)
@@ -33,7 +33,7 @@ imap
 IMAP PREAUTH response
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/846/;MAILINDEX=1' -u notused:still-provided
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u notused:still-provided
 </command>
 </client>
 
@@ -42,7 +42,7 @@ IMAP PREAUTH response
 <verify>
 <protocol>
 A001 CAPABILITY\r
-A002 SELECT 846\r
+A002 SELECT %TESTNUMBER\r
 A003 FETCH 1 BODY[]\r
 A004 LOGOUT\r
 </protocol>
index d4c10433299f5e2ab76110e78af2f70981f871e7..5a68f1c6ef1baa4fe49fbd8984a607c07eac180d 100644 (file)
@@ -31,7 +31,7 @@ imap
 IMAP FETCH message
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/847/;UID=1' -u '"user:sec"ret{'
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;UID=1' -u '"user:sec"ret{'
 </command>
 </client>
 
@@ -41,7 +41,7 @@ IMAP FETCH message
 <protocol>
 A001 CAPABILITY\r
 A002 LOGIN "\"user" "sec\"ret{"\r
-A003 SELECT 847\r
+A003 SELECT %TESTNUMBER\r
 A004 UID FETCH 1 BODY[]\r
 A005 LOGOUT\r
 </protocol>
index 2b4a30b2a34c072f88025a9b060d3119f50b17d1..27efe8ae051cd56438ffe7e4dffabb8603ad84cb 100644 (file)
@@ -37,7 +37,7 @@ imap
 IMAP plain authentication with alternative authorization identity
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/848/;MAILINDEX=1' -u user:secret --sasl-authzid shared-mailbox
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret --sasl-authzid shared-mailbox
 </command>
 </client>
 
@@ -48,7 +48,7 @@ IMAP plain authentication with alternative authorization identity
 A001 CAPABILITY\r
 A002 AUTHENTICATE PLAIN\r
 c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ=\r
-A003 SELECT 848\r
+A003 SELECT %TESTNUMBER\r
 A004 FETCH 1 BODY[]\r
 A005 LOGOUT\r
 </protocol>
index 8a4b39c00d6d6b13dc98e60206eff8f458981044..20fca6b943ec56e1295e6d59b43d91aa0e49178a 100644 (file)
@@ -28,7 +28,7 @@ imap
 IMAP plain authentication with alternative authorization identity (Not authorized)
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/849/;MAILINDEX=1' -u kurt:xipj3plmq --sasl-authzid ursel
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u kurt:xipj3plmq --sasl-authzid ursel
 </command>
 </client>
 
index 6b91a19069696422765286562da2dce31634974c..afddd9ca626c8db0b6f447c4ea398e67d7ca30f9 100644 (file)
@@ -34,7 +34,7 @@ http
 HTTP over proxy with site and proxy authentication
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/that/page/85 -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user testing:this
+http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user testing:this
 </command>
 <features>
 proxy
@@ -45,7 +45,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/we/want/that/page/85 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
 Authorization: Basic aWFtOm15c2VsZg==\r
index 6176101578c54ac795a42577da274ff5e4c60d48..5b6a20f1c5796af902ec393fe036af6d739e5669 100644 (file)
@@ -31,7 +31,7 @@ pop3
 POP3 RETR message
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/850 -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>
 
@@ -42,7 +42,7 @@ pop3://%HOSTIP:%POP3PORT/850 -u user:secret
 CAPA\r
 USER user\r
 PASS secret\r
-RETR 850\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 6269dd776330b45a026c2c4825ef1b1bc750730d..e47517f36aba383ca53503681e19889f59ed9c0a 100644 (file)
@@ -12,7 +12,7 @@ LIST
 <reply>
 <servercmd>
 # include the '.\r\n' 3-byte trailer to end the transfer properly!
-REPLY LIST +OK 851 100\r\n.
+REPLY LIST +OK %TESTNUMBER 100\r\n.
 </servercmd>
 </reply>
 
@@ -26,7 +26,7 @@ pop3
 POP3 LIST one message
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/851 -l -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -l -u user:secret
 </command>
 </client>
 
@@ -37,7 +37,7 @@ pop3://%HOSTIP:%POP3PORT/851 -l -u user:secret
 CAPA\r
 USER user\r
 PASS secret\r
-LIST 851\r
+LIST %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index de9fbe2f073985b71e5c5751806cb230e8a592e8..8e608eb571df1aef08e9e6d634cd4677b6c93d1c 100644 (file)
@@ -26,7 +26,7 @@ pop3
 POP3 LIST invalid message
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/852 -l -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -l -u user:secret
 </command>
 </client>
 
@@ -40,7 +40,7 @@ pop3://%HOSTIP:%POP3PORT/852 -l -u user:secret
 CAPA\r
 USER user\r
 PASS secret\r
-LIST 852\r
+LIST %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 87fe744fd73aa883becfc0abebba14691fdaa725..24b1166c6437c4d372689cbebcf369bfd7f3d2d4 100644 (file)
@@ -26,7 +26,7 @@ pop3
 POP3 RETR invalid message
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/855 -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>
 
@@ -40,7 +40,7 @@ pop3://%HOSTIP:%POP3PORT/855 -u user:secret
 CAPA\r
 USER user\r
 PASS secret\r
-RETR 855\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index dcb07c5a9174a2584b3381e23983ef04344f36bf..efff9d0aa1d017bf25762ad7edc1dc7d281314a4 100644 (file)
@@ -25,7 +25,7 @@ pop3
 POP3 invalid login
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/856 -u user:wrong
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:wrong
 </command>
 </client>
 
index 055e35cf8deee0ff60fd5f6456e0c239a1fa9637..15cc4c805868995a26c476d69c0615f3763bfab3 100644 (file)
@@ -42,7 +42,7 @@ pop3
 POP3 RETR message with dot-prefixed line
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/857 -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>
 
@@ -53,7 +53,7 @@ pop3://%HOSTIP:%POP3PORT/857 -u user:secret
 CAPA\r
 USER user\r
 PASS secret\r
-RETR 857\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 926dcd9e9e926966a4178f045b33db55b3a46d5c..c4af2f7dd708cb8424f4876e993c32ed7e93f7bf 100644 (file)
@@ -23,7 +23,7 @@ pop3
 POP3 DELE message (CUSTOMREQUEST)
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/858 -u user:secret -X DELE -I
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret -X DELE -I
 </command>
 </client>
 
@@ -34,7 +34,7 @@ pop3://%HOSTIP:%POP3PORT/858 -u user:secret -X DELE -I
 CAPA\r
 USER user\r
 PASS secret\r
-DELE 858\r
+DELE %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 00afd9b71f8901bb8503abc824b4111e3121725e..5d4399c7156e387f60a371b54da20f6d6b06b25e 100644 (file)
@@ -57,7 +57,7 @@ http
 HTTP, urlglob []-retrieval and -o #[num] usage
  </name>
  <command option="no-output">
-"http://%HOSTIP:%HTTPPORT/[860001-860003]" -o "log/dumpit#1.dump"
+"http://%HOSTIP:%HTTPPORT/[%TESTNUMBER0001-%TESTNUMBER0003]" -o "log/dumpit#1.dump"
 </command>
 </client>
 
@@ -65,17 +65,17 @@ HTTP, urlglob []-retrieval and -o #[num] usage
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /860001 HTTP/1.1\r
+GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /860002 HTTP/1.1\r
+GET /%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /860003 HTTP/1.1\r
+GET /%TESTNUMBER0003 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
@@ -83,7 +83,7 @@ Accept: */*
 </protocol>
 
 # we check the second file
-<file name="log/dumpit860002.dump">
+<file name="log/dumpit%TESTNUMBER0002.dump">
 HTTP/1.0 200 OK
 Content-Type: text/html
 Funny-head: swsclose
index a21b514407a79699e20b8f2af28f80ba08dfe61f..47b37bba72588c7e73d362048ea34fe22a93009c 100644 (file)
@@ -32,7 +32,7 @@ pop3
 POP3 retrieve message header (CUSTOMREQUEST)
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT -u user:secret -X 'TOP 862 0'
+pop3://%HOSTIP:%POP3PORT -u user:secret -X 'TOP %TESTNUMBER 0'
 </command>
 </client>
 
@@ -43,7 +43,7 @@ pop3://%HOSTIP:%POP3PORT -u user:secret -X 'TOP 862 0'
 CAPA\r
 USER user\r
 PASS secret\r
-TOP 862 0\r
+TOP %TESTNUMBER 0\r
 QUIT\r
 </protocol>
 </verify>
index ebdebd671dbfeefe894ea161dfdef49c73865206..9f2ba125bf2d83cadbc6c53cb80150a18bac88ba 100644 (file)
@@ -37,7 +37,7 @@ crypto
 POP3 APOP authentication
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/864 -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>
 
@@ -47,7 +47,7 @@ pop3://%HOSTIP:%POP3PORT/864 -u user:secret
 <protocol>
 CAPA\r
 APOP user 7501b4cdc224d469940e65e7b5e4d6eb\r
-RETR 864\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 8a262fcc51ea6bfdee07d67022c3a5a726d2a53e..9d931b53a7408557304d6581d52268db2729a0d9 100644 (file)
@@ -39,7 +39,7 @@ pop3
 POP3 plain authentication
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/865 -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>
 
@@ -50,7 +50,7 @@ pop3://%HOSTIP:%POP3PORT/865 -u user:secret
 CAPA\r
 AUTH PLAIN\r
 AHVzZXIAc2VjcmV0\r
-RETR 865\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 8fee23ab06d2230f9496ab95efd564f4923247fa..72e5c0339ef57612cd19e6628a9f548e173ac1af 100644 (file)
@@ -39,7 +39,7 @@ pop3
 POP3 login authentication
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/866 -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>
 
@@ -51,7 +51,7 @@ CAPA
 AUTH LOGIN\r
 dXNlcg==\r
 c2VjcmV0\r
-RETR 866\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 139b467dec70115373cadfbde3d6bde51df82103..5d59aa97c524f9559fbaa45bb4d401bbc0738f33 100644 (file)
@@ -42,7 +42,7 @@ crypto
 POP3 CRAM-MD5 authentication
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/867 -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>
 
@@ -53,7 +53,7 @@ pop3://%HOSTIP:%POP3PORT/867 -u user:secret
 CAPA\r
 AUTH CRAM-MD5\r
 dXNlciA3MDMxNzI1NTk5ZmRiYjVkNDEyNjg5YWEzMjNlM2UwYg==\r
-RETR 867\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 2fa2405adf6e47eb4015e39b3aff7d45544fec3b..00045d348c20c03b5be22a9ff295db9f588018f6 100644 (file)
@@ -51,7 +51,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-pop3://%HOSTIP:%POP3PORT/868 -u testuser:testpass
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u testuser:testpass
 </command>
 <precheck>
 chkhostname curlhost
@@ -66,7 +66,7 @@ CAPA
 AUTH NTLM\r
 TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
-RETR 868\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index ecc422cab14ab17c515556d2f1468e1a8df9bd3a..96d8c837a286b65cc3da29dc6bcccf0a996d25a9 100644 (file)
@@ -45,7 +45,7 @@ crypto
 POP3 DIGEST-MD5 authentication
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/869 -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>
 
@@ -57,7 +57,7 @@ CAPA
 AUTH DIGEST-MD5\r
 dXNlcm5hbWU9InVzZXIiLHJlYWxtPSJjdXJsIixub25jZT0iNTMwMGQxN2ExZDY5NWJkNDExZTRjZGY5NmY5NTQ4YzIzY2VkNjE3NSIsY25vbmNlPSIzNDMzMzIzMTM1MzMzMjMxMzYzMzMyMzEzNzMzMzIzMSIsbmM9IjAwMDAwMDAxIixkaWdlc3QtdXJpPSJwb3AvY3VybCIscmVzcG9uc2U9YzNhMGFiZTc5NDYyNTIyNGY5Njg3YTYzMTc3ZmRhNWIscW9wPWF1dGg=\r
 \r
-RETR 869\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index ee5be78cb5ff07d49fd758399358518abdfdd908..ff702dc47041f7e2059ab33e8574bd504ce04a79 100644 (file)
@@ -40,7 +40,7 @@ http
 urlglob with out of range -o #[num] usage
  </name>
  <command option="no-output">
-"http://%HOSTIP:%HTTPPORT/[870001-870002]" -o "log/dumpit87-#2.dump"
+"http://%HOSTIP:%HTTPPORT/[%TESTNUMBER0001-%TESTNUMBER0002]" -o "log/dumpit%TESTNUMBER-#2.dump"
 </command>
 </client>
 
@@ -50,7 +50,7 @@ urlglob with out of range -o #[num] usage
 # survives
 #
 <verify>
-<file name="log/dumpit87-#2.dump">
+<file name="log/dumpit%TESTNUMBER-#2.dump">
 HTTP/1.1 200 OK\r
 Funny-head: yesyes\r
 Content-Length: 16\r
index f6333f7e09c43247f2511091a2f3aad094214ba2..30f3586c841d2715e1279497acfd6d0e93e30a1a 100644 (file)
@@ -39,7 +39,7 @@ pop3
 POP3 OAuth 2.0 (XOAUTH2) authentication
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/870 -u user --oauth2-bearer mF_9.B5f-4.1JqM
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 </client>
 
@@ -50,7 +50,7 @@ pop3://%HOSTIP:%POP3PORT/870 -u user --oauth2-bearer mF_9.B5f-4.1JqM
 CAPA\r
 AUTH XOAUTH2\r
 dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB\r
-RETR 870\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 27cc2a4b3c6c29a65ce21855333567ae304bcf0e..00adefd3877999dd53130887cbb71fcc002758bf 100644 (file)
@@ -39,7 +39,7 @@ pop3
 POP3 plain authentication with initial response
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/871 -u user:secret --sasl-ir
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --sasl-ir
 </command>
 </client>
 
@@ -49,7 +49,7 @@ pop3://%HOSTIP:%POP3PORT/871 -u user:secret --sasl-ir
 <protocol>
 CAPA\r
 AUTH PLAIN AHVzZXIAc2VjcmV0\r
-RETR 871\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 05cb2a206194fd00c89be16b3d6f8262ec3ddf25..19cd49a9774685131fd6977db9f10f73b15dadc2 100644 (file)
@@ -39,7 +39,7 @@ pop3
 POP3 login authentication with initial response
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/872 -u user:secret --sasl-ir
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --sasl-ir
 </command>
 </client>
 
@@ -50,7 +50,7 @@ pop3://%HOSTIP:%POP3PORT/872 -u user:secret --sasl-ir
 CAPA\r
 AUTH LOGIN dXNlcg==\r
 c2VjcmV0\r
-RETR 872\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 2cabf1f63e243aa7c5552fe67e41ad17ffe81955..533d232a115558920096edaedb7b11e50ac96b6d 100644 (file)
@@ -51,7 +51,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-pop3://%HOSTIP:%POP3PORT/873 -u testuser:testpass --sasl-ir
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u testuser:testpass --sasl-ir
 </command>
 <precheck>
 chkhostname curlhost
@@ -65,7 +65,7 @@ chkhostname curlhost
 CAPA\r
 AUTH NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
-RETR 873\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index d1030da2ef1afa6dba17a16a2c76bd60be97f0da..1f19c5c0f0a4cf4b0d7cc699a3fcd750446a726d 100644 (file)
@@ -39,7 +39,7 @@ pop3
 POP3 OAuth 2.0 (XOAUTH2) authentication with initial response
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/874 -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir
 </command>
 </client>
 
@@ -49,7 +49,7 @@ pop3://%HOSTIP:%POP3PORT/874 -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir
 <protocol>
 CAPA\r
 AUTH XOAUTH2 dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB\r
-RETR 874\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 53e994087f740cb0824a372729521cb1d612b5bd..8850fab050e2291e7acd975858082806475381fd 100644 (file)
@@ -15,7 +15,7 @@ pop3
 POP3 with URL-encoded CR LF in the URL
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/%0d%0a/875
+pop3://%HOSTIP:%POP3PORT/%0d%0a/%TESTNUMBER
 </command>
 </client>
 
index 6d30e538b742a89d5d7521cc60979f9166a1ddac..ae5ea07a1fd7ddbfe7488de3a2ad7478009e2fd5 100644 (file)
@@ -34,7 +34,7 @@ crypto
 POP3 CRAM-MD5 graceful cancellation
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/876 -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>
 
index 114707aad1804e46619734525466e094b896ce33..65070d099895987fc928e275a51a6aa4ac6512f5 100644 (file)
@@ -42,7 +42,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-pop3://%HOSTIP:%POP3PORT/877 -u testuser:testpass
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u testuser:testpass
 </command>
 <precheck>
 chkhostname curlhost
index 98961fbe714e38dc697e26a0881a03ec6b9fb3ce..28bd44a7b8d7ffc6221623bb84be6a20edbed4ee 100644 (file)
@@ -36,7 +36,7 @@ crypto
 POP3 DIGEST-MD5 graceful cancellation
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/878 -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>
 
index 0d45aaa20f659b73967853bfd7c7e575440a5a94..1b7ca564b396338720accca3da8ba9f612c770ea 100644 (file)
@@ -46,7 +46,7 @@ crypto
 POP3 CRAM-MD5 authentication with SASL downgrade
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/879 -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>
 
@@ -59,7 +59,7 @@ AUTH CRAM-MD5
 *\r
 AUTH PLAIN\r
 AHVzZXIAc2VjcmV0\r
-RETR 879\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 40b0e8f4d891e09415a3442a0cec9f2b59e1de65..b7c6207628f41228b152a91a05b5fb07431d76c2 100644 (file)
@@ -63,9 +63,9 @@ crypto
 HTTP PUT with Digest authorization
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/88 -T log/put88 -u testuser:testpass --digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --digest
 </command>
-<file name="log/put88">
+<file name="log/put%TESTNUMBER">
 This is data we upload with PUT
 a second line
 line three
@@ -76,15 +76,15 @@ four is the number of lines
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /88 HTTP/1.1\r
+PUT /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 0\r
 \r
-PUT /88 HTTP/1.1\r
+PUT /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/88", response="78a49fa53d0c228778297687d4168e71"\r
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="78a49fa53d0c228778297687d4168e71"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 85\r
index e0609bbdc4fd6b60b1fbaab35e37fd3872e45e7c..9dc00c0f6195d079174dc056e200d26a3758edb4 100644 (file)
@@ -54,7 +54,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-pop3://%HOSTIP:%POP3PORT/880 -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 <precheck>
 chkhostname curlhost
@@ -71,7 +71,7 @@ TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 *\r
 AUTH PLAIN\r
 AHVzZXIAc2VjcmV0\r
-RETR 880\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index ccb906d9d85a1d2abfe0222d017c31bca0638320..69e31a4319d04e6e06be4568c2166383b98a5b60 100644 (file)
@@ -48,7 +48,7 @@ crypto
 POP3 DIGEST-MD5 authentication with SASL downgrade
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/881 -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>
 
@@ -61,7 +61,7 @@ AUTH DIGEST-MD5
 *\r
 AUTH PLAIN\r
 AHVzZXIAc2VjcmV0\r
-RETR 881\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 1e321ff1d5d4403dbaa3a4190587482aec1cc51a..77a57c89caa86220c942058f5ccfc29d650aaa5d 100644 (file)
@@ -35,7 +35,7 @@ pop3
 POP3 multiple connection authentication
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/882001 -u user.one:secret -: pop3://%HOSTIP:%POP3PORT/882002 -u user.two:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER001 -u user.one:secret -: pop3://%HOSTIP:%POP3PORT/%TESTNUMBER002 -u user.two:secret
 </command>
 </client>
 
@@ -46,12 +46,12 @@ pop3://%HOSTIP:%POP3PORT/882001 -u user.one:secret -: pop3://%HOSTIP:%POP3PORT/8
 CAPA\r
 USER user.one\r
 PASS secret\r
-RETR 882001\r
+RETR %TESTNUMBER001\r
 QUIT\r
 CAPA\r
 USER user.two\r
 PASS secret\r
-RETR 882002\r
+RETR %TESTNUMBER002\r
 QUIT\r
 </protocol>
 </verify>
index 5d5a756a90ed1ba11c3f1a52173c7233d8f4e763..6d5900c2041dd630511193457fd2ef45bc62e36c 100644 (file)
@@ -39,7 +39,7 @@ pop3
 POP3 external authentication
  </name>
  <command>
-'pop3://user;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/883'
+'pop3://user;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/%TESTNUMBER'
 </command>
 </client>
 
@@ -50,7 +50,7 @@ POP3 external authentication
 CAPA\r
 AUTH EXTERNAL\r
 dXNlcg==\r
-RETR 883\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 34fd94d13acd2d8711201db42a2dca3bf66999bc..f0744bf28931b8e93bd5d908536e5ffa40c123f1 100644 (file)
@@ -39,7 +39,7 @@ pop3
 POP3 external authentication without credentials
  </name>
  <command>
-'pop3://;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/884'
+'pop3://;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/%TESTNUMBER'
 </command>
 </client>
 
@@ -50,7 +50,7 @@ POP3 external authentication without credentials
 CAPA\r
 AUTH EXTERNAL\r
 =\r
-RETR 884\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 581e9b24f27c8c1b1601f7fcb1c8bdf7eda0f4da..7131f16b15435660cd2b7316701bab41d4573e13 100644 (file)
@@ -39,7 +39,7 @@ pop3
 POP3 external authentication with initial response
  </name>
  <command>
-'pop3://user;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/885' --sasl-ir
+'pop3://user;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/%TESTNUMBER' --sasl-ir
 </command>
 </client>
 
@@ -49,7 +49,7 @@ POP3 external authentication with initial response
 <protocol>
 CAPA\r
 AUTH EXTERNAL dXNlcg==\r
-RETR 885\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 3aca2f18f9bca117e96e0b37c1804abf107764bb..f777abbaeffee6cc275731baa6f269ce772d0a46 100644 (file)
@@ -39,7 +39,7 @@ pop3
 POP3 external authentication with initial response without credentials
  </name>
  <command>
-'pop3://;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/886' --sasl-ir
+'pop3://;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/%TESTNUMBER' --sasl-ir
 </command>
 </client>
 
@@ -49,7 +49,7 @@ POP3 external authentication with initial response without credentials
 <protocol>
 CAPA\r
 AUTH EXTERNAL =\r
-RETR 886\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index ccf3649552b547321f0a3ca7553510cf964e16e3..2d0f535df9a84337395eb68f952a71ba90a84ba2 100644 (file)
@@ -40,7 +40,7 @@ pop3
 POP3 OAuth 2.0 (OAUTHBEARER) authentication
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/887 -u user --oauth2-bearer mF_9.B5f-4.1JqM
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 </client>
 
@@ -51,7 +51,7 @@ pop3://%HOSTIP:%POP3PORT/887 -u user --oauth2-bearer mF_9.B5f-4.1JqM
 CAPA\r
 AUTH OAUTHBEARER\r
 %b64[n,a=user,%01host=127.0.0.1%01port=%POP3PORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%\r
-RETR 887\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 465a2d0ce8d0196d7b57ac2c294d16c91be2c38c..b35b9d61c9143f36d396019cb1c73424f9d4d7b2 100644 (file)
@@ -40,7 +40,7 @@ pop3
 POP3 OAuth 2.0 (OAUTHBEARER) authentication with initial response
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/888 -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir
 </command>
 </client>
 
@@ -50,7 +50,7 @@ pop3://%HOSTIP:%POP3PORT/888 -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir
 <protocol>
 CAPA\r
 AUTH OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%POP3PORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%\r
-RETR 888\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 9658d386c6ad483091dacc1df1234a83ede31fa1..155268b98a25ecd1ade80b437253e8cac56ee57f 100644 (file)
@@ -32,7 +32,7 @@ pop3
 POP3 OAuth 2.0 (OAUTHBEARER) failure as continuation
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/889 -u user --oauth2-bearer mF_9.B5f-4.1JqM
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 </client>
 
index 0537fa5d4626c7c7cc06f9ea75620692d59e8c46..c09f9b83beba21e84d23b066ab7a48db8e6e90cf 100644 (file)
@@ -31,7 +31,7 @@ This is not the real page either!
 HTTP/1.1 301 Things are fine in server land swsclose\r
 Server: Microsoft-IIS/5.0\r
 Connection: close\r
-Location: /you/890010\r
+Location: /you/%TESTNUMBER0010\r
 \r
 </data1002>
 
@@ -67,7 +67,7 @@ WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4Ab
 HTTP/1.1 301 Things are fine in server land swsclose\r
 Server: Microsoft-IIS/5.0\r
 Connection: close\r
-Location: /you/890010\r
+Location: /you/%TESTNUMBER0010\r
 \r
 HTTP/1.1 401 Now gimme that second round of crap\r
 Server: Microsoft-IIS/5.0\r
@@ -106,7 +106,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/89 -u testuser:testpass --ntlm -L
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm -L
 </command>
 <precheck>
 chkhostname curlhost
@@ -116,25 +116,25 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /89 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /89 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /you/890010 HTTP/1.1\r
+GET /you/%TESTNUMBER0010 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /you/890010 HTTP/1.1\r
+GET /you/%TESTNUMBER0010 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADYzMjE3MzIxAAAAAAAAAAAAAAAAAAAAAEcJ4YHOeb5ga2TCPwDhkyUIuHjBUHcLaHRlc3R1c2VyY3VybGhvc3Q=\r
 User-Agent: curl/%VERSION\r
index 4d6701ab00e1b7eb78869d260855c01405931e0e..e625fcac1aea53cdb625d42c238f6182410ac173 100644 (file)
@@ -32,7 +32,7 @@ pop3
 POP3 OAuth 2.0 (OAUTHBEARER) failure as continuation with initial response
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/890 -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir
 </command>
 </client>
 
index 61eae10c01726332f07901d0f5be7503434d3357..b2496f8164ce3f28c97e19e942a1c4beb3dcd07d 100644 (file)
@@ -27,7 +27,7 @@ crypto
 POP3 with short authentication response
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/891 -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>
 
index 4b8318292d7e7a2865665083e4cb3fd1ebf45be4..5a6a7fd7cffd32ac07b9abb4cdfb17a258daa97d 100644 (file)
@@ -39,7 +39,7 @@ pop3
 POP3 plain authentication with alternative authorization identity
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/892 -u user:secret --sasl-authzid shared-mailbox
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --sasl-authzid shared-mailbox
 </command>
 </client>
 
@@ -50,7 +50,7 @@ pop3://%HOSTIP:%POP3PORT/892 -u user:secret --sasl-authzid shared-mailbox
 CAPA\r
 AUTH PLAIN\r
 c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ=\r
-RETR 892\r
+RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
 </verify>
index 2a762fc218d02e4e8f6ef0a84c3dba1f0098d496..ca68dd0429727c64faa43f9ecb687b5d8158bd40 100644 (file)
@@ -30,7 +30,7 @@ pop3
 POP3 plain authentication with alternative authorization identity (Not authorized)
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/893 -u kurt:xipj3plmq --sasl-authzid ursel
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u kurt:xipj3plmq --sasl-authzid ursel
 </command>
 </client>
 
index db79830cadae07cc5dd60999a13096be84a8c98c..f9866580b2fe3b193f953ddc9f3b797a7c797245 100644 (file)
@@ -22,7 +22,7 @@ pop3
 POP3 with CR in username
  </name>
  <command>
-pop3://user%0dFRIGGING_cmd:secret@%HOSTIP:%POP3PORT/894
+pop3://user%0dFRIGGING_cmd:secret@%HOSTIP:%POP3PORT/%TESTNUMBER
 </command>
 </client>
 
index 78d48c475171f359522b4cd3108c0ca6637fe0dd..520e09410406e93455b905d9ed8690779570445d 100644 (file)
@@ -32,7 +32,7 @@ imap
 IMAP with --login-options 'AUTH=*'
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/895/;MAILINDEX=1' -u '"user:sec"ret{' --login-options 'AUTH=*'
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u '"user:sec"ret{' --login-options 'AUTH=*'
 </command>
 </client>
 
@@ -42,7 +42,7 @@ IMAP with --login-options 'AUTH=*'
 <protocol>
 A001 CAPABILITY\r
 A002 LOGIN "\"user" "sec\"ret{"\r
-A003 SELECT 895\r
+A003 SELECT %TESTNUMBER\r
 A004 FETCH 1 BODY[]\r
 A005 LOGOUT\r
 </protocol>
index b7c561d92d45cce30302c31b7d5e221704e92aae..e3aa2b6af9bcb58e73d1fcece17f28440f8201df 100644 (file)
@@ -27,10 +27,10 @@ http
 HTTP RFC1867-type formposting
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/9 -F name=daniel -F tool=curl -F file=@log/test9.txt
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@log/test%TESTNUMBER.txt
 </command>
 # We create this file before the command is invoked!
-<file name="log/test9.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo-
 This is a moo-
 bar
@@ -43,7 +43,7 @@ bar
 ^(Content-Type: multipart/form-data;|------------).*
 </strip>
 <protocol>
-POST /we/want/9 HTTP/1.1\r
+POST /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 91d569d08ab87038d744c9eb28cdfb048fd6958d..fc5ff14ccbe204fe03288556308c263c91251998 100644 (file)
@@ -41,7 +41,7 @@ This is not the real page either!
 HTTP/1.1 301 Things are fine in server land swsclose\r
 Server: Microsoft-IIS/5.0\r
 Connection: close\r
-Location: /you/900010\r
+Location: /you/%TESTNUMBER0010\r
 \r
 </data1002>
 
@@ -97,7 +97,7 @@ WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4Ab
 HTTP/1.1 301 Things are fine in server land swsclose\r
 Server: Microsoft-IIS/5.0\r
 Connection: close\r
-Location: /you/900010\r
+Location: /you/%TESTNUMBER0010\r
 \r
 HTTP/1.1 401 Authorization Required swsclose\r
 Server: Apache/1.3.27 (Darwin) PHP/4.1.2\r
@@ -144,7 +144,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/90 -u testuser:testpass --anyauth -L
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth -L
 </command>
 <precheck>
 chkhostname curlhost
@@ -154,35 +154,35 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /90 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /90 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /90 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /you/900010 HTTP/1.1\r
+GET /you/%TESTNUMBER0010 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /you/900010 HTTP/1.1\r
+GET /you/%TESTNUMBER0010 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /you/900010 HTTP/1.1\r
+GET /you/%TESTNUMBER0010 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADYzMjE3MzIxAAAAAAAAAAAAAAAAAAAAAEcJ4YHOeb5ga2TCPwDhkyUIuHjBUHcLaHRlc3R1c2VyY3VybGhvc3Q=\r
 User-Agent: curl/%VERSION\r
index 0dd7f527368e24d2289ffb50dd40a5869c2b0e84..a4fc8aa0337839311bd765103c476b16fdc0bb8f 100644 (file)
@@ -26,7 +26,7 @@ To: another
 body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/900 --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -34,7 +34,7 @@ smtp://%HOSTIP:%SMTPPORT/900 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 900\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient@example.com>\r
 DATA\r
index 8148b29e471ac57f44ed3978a2961e33c7c0e0a4..787365bf0f0d044ee3144ace53ee5d34a1435ec9 100644 (file)
@@ -32,7 +32,7 @@ To: another
 body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/901 --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ smtp://%HOSTIP:%SMTPPORT/901 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 901\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient@example.com>\r
 DATA\r
index 8ee105f7a1ec718bca551791047b0d808c6bd077..4f651a83b8f1135e0c0c3f4ee4427f26ed90a524 100644 (file)
@@ -31,7 +31,7 @@ To: another
 body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/902 --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -39,8 +39,8 @@ smtp://%HOSTIP:%SMTPPORT/902 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 902\r
-HELO 902\r
+EHLO %TESTNUMBER\r
+HELO %TESTNUMBER\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient@example.com>\r
 DATA\r
index 8a766e56d319f7cb8872176af377e36c10f646c3..8fe3174d3d2d1bfa897d776c164e70e2a296255c 100644 (file)
@@ -32,7 +32,7 @@ SMTP plain authentication
 mail body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/903 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ smtp://%HOSTIP:%SMTPPORT/903 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 903\r
+EHLO %TESTNUMBER\r
 AUTH PLAIN\r
 AHVzZXIAc2VjcmV0\r
 MAIL FROM:<sender@example.com>\r
index dd3dad09b07e9c2774e278f0d8a8c3529950499d..07914970dd2dcf3e820332e521a71c3fc611d2c4 100644 (file)
@@ -32,7 +32,7 @@ SMTP login authentication
 mail body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/904 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ smtp://%HOSTIP:%SMTPPORT/904 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 904\r
+EHLO %TESTNUMBER\r
 AUTH LOGIN\r
 dXNlcg==\r
 c2VjcmV0\r
index 565b0413698d0d2343eb03f2a24bc86fc2814de6..d29e9a83527d9a75519a4301257610c47fddb812 100644 (file)
@@ -35,7 +35,7 @@ SMTP CRAM-MD5 authentication
 mail body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/905 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>
 
@@ -43,7 +43,7 @@ smtp://%HOSTIP:%SMTPPORT/905 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 905\r
+EHLO %TESTNUMBER\r
 AUTH CRAM-MD5\r
 dXNlciA3MDMxNzI1NTk5ZmRiYjVkNDEyNjg5YWEzMjNlM2UwYg==\r
 MAIL FROM:<sender@example.com>\r
index 6ec59c7b1a143fd1e786ed489aa9ee4420963f75..8b45b56e1cbb06f24eea5fe25b35da4f6b7f7b9f 100644 (file)
@@ -44,7 +44,7 @@ LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
 mail body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/906 --mail-rcpt recipient@example.com --mail-from sender@example.com -u testuser:testpass -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u testuser:testpass -T -
 </command>
 <precheck>
 chkhostname curlhost
@@ -55,7 +55,7 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 906\r
+EHLO %TESTNUMBER\r
 AUTH NTLM\r
 TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
index c19e1e11e969e67f82bcda401e6d59dd0d655215..b2af26b23d064d6958fee7048e9194d82cbdef44 100644 (file)
@@ -38,7 +38,7 @@ SMTP DIGEST-MD5 authentication
 mail body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/907 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>
 
@@ -46,7 +46,7 @@ smtp://%HOSTIP:%SMTPPORT/907 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 907\r
+EHLO %TESTNUMBER\r
 AUTH DIGEST-MD5\r
 dXNlcm5hbWU9InVzZXIiLHJlYWxtPSJjdXJsIixub25jZT0iNTMwMGQxN2ExZDY5NWJkNDExZTRjZGY5NmY5NTQ4YzIzY2VkNjE3NSIsY25vbmNlPSIzNDMzMzIzMTM1MzMzMjMxMzYzMzMyMzEzNzMzMzIzMSIsbmM9IjAwMDAwMDAxIixkaWdlc3QtdXJpPSJzbXRwL2N1cmwiLHJlc3BvbnNlPTk0M2YxNjk1OWYxY2M2ZjA3ZTZmMDk0ZjVkYmQ0NzNlLHFvcD1hdXRo\r
 \r
index bf0b45a1879981cad6fbfa859a02a186e82e5805..b87c4387b78bb1619909f7d2387a5e312576047e 100644 (file)
@@ -32,7 +32,7 @@ SMTP OAuth 2.0 (XOAUTH2) authentication
 mail body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/908 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ smtp://%HOSTIP:%SMTPPORT/908 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 908\r
+EHLO %TESTNUMBER\r
 AUTH XOAUTH2\r
 dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB\r
 MAIL FROM:<sender@example.com>\r
index e3e907ac5b302b0f3258208c86578a83d7daf166..d50ab8131799a96c6d00547ffdea1861d30fcf02 100644 (file)
@@ -19,14 +19,14 @@ smtp
  <name>
 SMTP without SIZE support
  </name>
-<file name="log/test909.eml">
+<file name="log/test%TESTNUMBER.eml">
 From: different\r
 To: another\r
 \r
 body\r
 </file>
  <command>
-smtp://%HOSTIP:%SMTPPORT/909 --mail-rcpt recipient@example.com --mail-from sender@example.com -T log/test909.eml
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T log/test%TESTNUMBER.eml
 </command>
 </client>
 
@@ -34,7 +34,7 @@ smtp://%HOSTIP:%SMTPPORT/909 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 909\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient@example.com>\r
 DATA\r
index 314a655148edb5b352cda1b62f3eb8ec274c3aa3..08f4a203a6d254d98bd3c0f90374a2b5157ab84f 100644 (file)
@@ -90,7 +90,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/91 --anyauth -u mydomain\\myself:secret
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --anyauth -u mydomain\\myself:secret
 </command>
 <precheck>
 chkhostname curlhost
@@ -100,18 +100,18 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /91 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /91 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
-GET /91 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAgACABwAAAABgAGAHgAAAAIAAgAfgAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAAKBS3rdGYZEGsqW8otYHWXWBxC5mCuFmYm15ZG9tYWlubXlzZWxmY3VybGhvc3Q=\r
 User-Agent: curl/%VERSION\r
index c1b84ac06a992c3f50a208ce1b34de3de2962478..8787cc0601f0e95509fba2328a78da9e79ab7847 100644 (file)
@@ -26,7 +26,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/910 --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -34,7 +34,7 @@ smtp://%HOSTIP:%SMTPPORT/910 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 910\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient@example.com>\r
 DATA\r
index f4c545830fd5b26202c483ffa337c061096e52e9..88631cd3d90cbe2d5934965b4872698ab4435756 100644 (file)
@@ -25,7 +25,7 @@ SMTP with no mail data
 </stdin>
 
  <command>
-smtp://%HOSTIP:%SMTPPORT/911 --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -33,7 +33,7 @@ smtp://%HOSTIP:%SMTPPORT/911 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 911\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient@example.com>\r
 DATA\r
index 8970c3f1e43c2b67394c85507d9efa59796d4b39..4a3f6d16f241cec3d65e8396cc22439ab060a828 100644 (file)
@@ -23,14 +23,14 @@ smtp
  <name>
 SMTP with SIZE support
  </name>
-<file name="log/test912.eml">
+<file name="log/test%TESTNUMBER.eml">
 From: different\r
 To: another\r
 \r
 body\r
 </file>
  <command>
-smtp://%HOSTIP:%SMTPPORT/912 --mail-rcpt recipient@example.com --mail-from sender@example.com -T log/test912.eml
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T log/test%TESTNUMBER.eml
 </command>
 </client>
 
@@ -38,7 +38,7 @@ smtp://%HOSTIP:%SMTPPORT/912 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 912\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com> SIZE=38\r
 RCPT TO:<recipient@example.com>\r
 DATA\r
index d13a11ae8929db1794cf3dcb7871a754336dec70..9c19eb2dc9516c3a80c3f5004f17a98219300d31 100644 (file)
@@ -23,14 +23,14 @@ smtp
  <name>
 SMTP with large message SIZE
  </name>
-<file name="log/test913.eml">
+<file name="log/test%TESTNUMBER.eml">
 From: different\r
 To: another\r
 \r
 body\r
 </file>
  <command>
-smtp://%HOSTIP:%SMTPPORT/913 --mail-rcpt recipient@example.com --mail-from sender@example.com -T log/test913.eml
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T log/test%TESTNUMBER.eml
 </command>
 </client>
 
@@ -42,7 +42,7 @@ smtp://%HOSTIP:%SMTPPORT/913 --mail-rcpt recipient@example.com --mail-from sende
 55
 </errorcode>
 <protocol>
-EHLO 913\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com> SIZE=38\r
 QUIT\r
 </protocol>
index 0124b7671d5fb6ae0fffac1bf55f0c16d7c78842..ab895d2cd86c6f052b79c3f82fef15607a762402 100644 (file)
@@ -22,14 +22,14 @@ smtp
  <name>
 SMTP invalid --mail-from
  </name>
-<file name="log/test914.eml">
+<file name="log/test%TESTNUMBER.eml">
 From: different\r
 To: another\r
 \r
 body\r
 </file>
  <command>
-smtp://%HOSTIP:%SMTPPORT/914 --mail-rcpt recipient@example.com --mail-from invalid -T log/test914.eml
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from invalid -T log/test%TESTNUMBER.eml
 </command>
 </client>
 
@@ -41,7 +41,7 @@ smtp://%HOSTIP:%SMTPPORT/914 --mail-rcpt recipient@example.com --mail-from inval
 55
 </errorcode>
 <protocol>
-EHLO 914\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<invalid>\r
 QUIT\r
 </protocol>
index 4d31db3c1fa56a8078853d4d5fb78153e0350897..5d894422173ee5793a054af5a510e9e87bf5fea3 100644 (file)
@@ -26,7 +26,7 @@ To: another
 body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/915 --mail-rcpt recipient@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com -T -
 </command>
 </client>
 
@@ -34,7 +34,7 @@ smtp://%HOSTIP:%SMTPPORT/915 --mail-rcpt recipient@example.com -T -
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 915\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<>\r
 RCPT TO:<recipient@example.com>\r
 DATA\r
index 00211550ad4aaa03275489c361371dc25057b547..2c375ee2e610c3d5538e54099f99db96f1e6b301 100644 (file)
@@ -26,7 +26,7 @@ To: another
 body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/916 --mail-rcpt invalid --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt invalid --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -38,7 +38,7 @@ smtp://%HOSTIP:%SMTPPORT/916 --mail-rcpt invalid --mail-from sender@example.com
 55
 </errorcode>
 <protocol>
-EHLO 916\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<invalid>\r
 QUIT\r
index cc75da3aa0c9e64f87da616156d0da69ef0a7b5a..fcf21ddac411f0d8659c58711ebfe5e070320d5c 100644 (file)
@@ -26,7 +26,7 @@ To: another
 body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/917 --mail-rcpt recipient.one@example.com --mail-rcpt recipient.two@example.com --mail-rcpt recipient.three@example.com --mail-rcpt recipient.four@example.com --mail-rcpt recipient.five@example.com --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient.one@example.com --mail-rcpt recipient.two@example.com --mail-rcpt recipient.three@example.com --mail-rcpt recipient.four@example.com --mail-rcpt recipient.five@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -34,7 +34,7 @@ smtp://%HOSTIP:%SMTPPORT/917 --mail-rcpt recipient.one@example.com --mail-rcpt r
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 917\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient.one@example.com>\r
 RCPT TO:<recipient.two@example.com>\r
index 3756edd758a83b80b1f3e6f655f13044f4fcd37f..817674fb81d15f90d9b3f83e5ef892602229252a 100644 (file)
@@ -26,7 +26,7 @@ To: another
 body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/918 --mail-rcpt recipient.one@example.com --mail-rcpt invalid --mail-rcpt recipient.three@example.com --mail-rcpt sTrAnGe --mail-rcpt recipient.five@example.com --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient.one@example.com --mail-rcpt invalid --mail-rcpt recipient.three@example.com --mail-rcpt sTrAnGe --mail-rcpt recipient.five@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -38,7 +38,7 @@ smtp://%HOSTIP:%SMTPPORT/918 --mail-rcpt recipient.one@example.com --mail-rcpt i
 55
 </errorcode>
 <protocol>
-EHLO 918\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient.one@example.com>\r
 RCPT TO:<invalid>\r
index 39794e30b36096a635c233922cc21e6ab3459fa8..8c49abd264aaf1a679d5458c80b5d5ce759f24f2 100644 (file)
@@ -32,7 +32,7 @@ SMTP plain authentication with initial response
 mail body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/919 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret --sasl-ir -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret --sasl-ir -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ smtp://%HOSTIP:%SMTPPORT/919 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 919\r
+EHLO %TESTNUMBER\r
 AUTH PLAIN AHVzZXIAc2VjcmV0\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient@example.com>\r
index 7e03f0a1292f142320149cbaf1efafd50ec76bc8..1c09e97bfe41eae0d415e5cc772ce2acac12521e 100644 (file)
@@ -48,14 +48,14 @@ http
 HTTP resume transfer with the whole file already downloaded
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/92 -C 87
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -C 87
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/92 HTTP/1.1\r
+GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=87-\r
 User-Agent: curl/%VERSION\r
index 82f6c5601aeb202d0a0ffb86dc69db58ae1d10bd..26255188fe8bd7727ba8844e9f0c468c5d9d2146 100644 (file)
@@ -32,7 +32,7 @@ SMTP login authentication with initial response
 mail body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/920 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret --sasl-ir -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret --sasl-ir -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ smtp://%HOSTIP:%SMTPPORT/920 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 920\r
+EHLO %TESTNUMBER\r
 AUTH LOGIN dXNlcg==\r
 c2VjcmV0\r
 MAIL FROM:<sender@example.com>\r
index f9e56736daa23675c85efb3f5ee6c7f090b2c676..2d90e73da100b82092cd93f7fb691689d9d19a2c 100644 (file)
@@ -44,7 +44,7 @@ LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
 mail body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/921 --mail-rcpt recipient@example.com --mail-from sender@example.com -u testuser:testpass --sasl-ir -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u testuser:testpass --sasl-ir -T -
 </command>
 <precheck>
 chkhostname curlhost
@@ -55,7 +55,7 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>\r
-EHLO 921\r
+EHLO %TESTNUMBER\r
 AUTH NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
 MAIL FROM:<sender@example.com>\r
index aacd684e699681e666143db0760f2ce017e6d7bc..8c16e4311f23825cfc51d0891566919e5dcc75f9 100644 (file)
@@ -32,7 +32,7 @@ SMTP OAuth 2.0 (XOAUTH2) authentication with initial response
 mail body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/922 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ smtp://%HOSTIP:%SMTPPORT/922 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 922\r
+EHLO %TESTNUMBER\r
 AUTH XOAUTH2 dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient@example.com>\r
index 9d9722f9aaa2c9239cf183c14a13ed397476815e..68a013839fde12456d415fab7c8f8e9ba8f5ac97 100644 (file)
@@ -21,7 +21,7 @@ smtp
 SMTP VRFY
  </name>
  <command>
-smtp://%HOSTIP:%SMTPPORT/923 --mail-rcpt recipient
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient
 </command>
 </client>
 
@@ -29,7 +29,7 @@ smtp://%HOSTIP:%SMTPPORT/923 --mail-rcpt recipient
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 923\r
+EHLO %TESTNUMBER\r
 VRFY recipient\r
 QUIT\r
 </protocol>
index 51e373c7edb110f919feef83e6456265af08985d..c87b2a9d586288c522d3e36a4ecf03a259a692d0 100644 (file)
@@ -27,7 +27,7 @@ smtp
 SMTP ambiguous VRFY
  </name>
  <command>
-smtp://%HOSTIP:%SMTPPORT/924 --mail-rcpt smith
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt smith
 </command>
 </client>
 
@@ -35,7 +35,7 @@ smtp://%HOSTIP:%SMTPPORT/924 --mail-rcpt smith
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 924\r
+EHLO %TESTNUMBER\r
 VRFY smith\r
 QUIT\r
 </protocol>
index 2d53100dfc0549cb358c77d252e089966a5b7fa6..3b1801b0c172517e5996b99f1946150e9fed91e4 100644 (file)
@@ -24,7 +24,7 @@ smtp
 SMTP external VRFY
  </name>
  <command>
-smtp://%HOSTIP:%SMTPPORT/925 --mail-rcpt user@example.net
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt user@example.net
 </command>
 </client>
 
@@ -32,7 +32,7 @@ smtp://%HOSTIP:%SMTPPORT/925 --mail-rcpt user@example.net
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 925\r
+EHLO %TESTNUMBER\r
 VRFY user@example.net\r
 QUIT\r
 </protocol>
index 4c4576c894c29c5a22dd3497c3aa4abd330d1fb7..aed6f4b8d80335ea86adbdd79515449f5ceb3c9a 100644 (file)
@@ -24,7 +24,7 @@ smtp
 SMTP unknown user VRFY
  </name>
  <command>
-smtp://%HOSTIP:%SMTPPORT/926 --mail-rcpt recipient
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient
 </command>
 </client>
 
@@ -36,7 +36,7 @@ smtp://%HOSTIP:%SMTPPORT/926 --mail-rcpt recipient
 56
 </errorcode>
 <protocol>
-EHLO 926\r
+EHLO %TESTNUMBER\r
 VRFY recipient\r
 QUIT\r
 </protocol>
index b1997102e32245c593df2a34ab18dc433ed043bc..a982d147aa98cd956bc953bded9548b7af1bea07 100644 (file)
@@ -27,7 +27,7 @@ smtp
 SMTP mailing list EXPN (CUSTOMREQUEST)
  </name>
  <command>
-smtp://%HOSTIP:%SMTPPORT/927 --mail-rcpt Friends -X EXPN
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Friends -X EXPN
 </command>
 </client>
 
@@ -35,7 +35,7 @@ smtp://%HOSTIP:%SMTPPORT/927 --mail-rcpt Friends -X EXPN
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 927\r
+EHLO %TESTNUMBER\r
 EXPN Friends\r
 QUIT\r
 </protocol>
index 81bbdc2fadf665c556ed54ad10f5d69a0206d9c9..3ed097957f76b86fe2d72034a98e170d3b9e34eb 100644 (file)
@@ -25,7 +25,7 @@ smtp
 SMTP HELP
  </name>
  <command>
-smtp://%HOSTIP:%SMTPPORT/928
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -33,7 +33,7 @@ smtp://%HOSTIP:%SMTPPORT/928
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 928\r
+EHLO %TESTNUMBER\r
 HELP\r
 QUIT\r
 </protocol>
index 3761ab5ae0eb5241ec6516631970b193bdc087d3..be2632829a878bdf1ba5d740461c99b3c55bf0b8 100644 (file)
@@ -22,7 +22,7 @@ smtp
 SMTP NOOP (CUSTOMREQUEST)
  </name>
  <command>
-smtp://%HOSTIP:%SMTPPORT/929 -X NOOP -I
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER -X NOOP -I
 </command>
 </client>
 
@@ -30,7 +30,7 @@ smtp://%HOSTIP:%SMTPPORT/929 -X NOOP -I
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 929\r
+EHLO %TESTNUMBER\r
 NOOP\r
 QUIT\r
 </protocol>
index 684e56cd490c65ddb4e597b10e022e023efb4d33..e0266e68c87e9b6a16bb6f5bb6204b3425092df6 100644 (file)
@@ -29,7 +29,7 @@ http
 HTTP GET with failed proxy auth
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/93 -x %HOSTIP:%HTTPPORT
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -x %HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -40,7 +40,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/93 HTTP/1.1\r
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index be633c1fa2b436b15ccafd2bc5b6eed935655668..ebde938c54c93feff7da0e19847d03e3cbea1512 100644 (file)
@@ -22,7 +22,7 @@ smtp
 SMTP RSET (CUSTOMREQUEST)
  </name>
  <command>
-smtp://%HOSTIP:%SMTPPORT/930 -X RSET -I
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER -X RSET -I
 </command>
 </client>
 
@@ -30,7 +30,7 @@ smtp://%HOSTIP:%SMTPPORT/930 -X RSET -I
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 930\r
+EHLO %TESTNUMBER\r
 RSET\r
 QUIT\r
 </protocol>
index 722aa0222e8f94fae7182bea50380984e958055f..226f2dd2d3473409b40dff425109b020c82bdf2a 100644 (file)
@@ -15,7 +15,7 @@ smtp
 SMTP with URL-encoded CR LF in the URL
  </name>
  <command>
-smtp://%HOSTIP:%SMTPPORT/%0d%0a/931
+smtp://%HOSTIP:%SMTPPORT/%0d%0a/%TESTNUMBER
 </command>
 </client>
 
index 13ab790d6f4e477b30d2bf469f59b8be2939c01f..b6f828cfb62fa568b991638488864e12cbf515bd 100644 (file)
@@ -33,7 +33,7 @@ crypto
 SMTP CRAM-MD5 graceful cancellation
  </name>
  <command>
-smtp://%HOSTIP:%SMTPPORT/932 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>
 
@@ -48,7 +48,7 @@ smtp://%HOSTIP:%SMTPPORT/932 --mail-rcpt recipient@example.com --mail-from sende
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "QUIT"
 <protocol>
-EHLO 932\r
+EHLO %TESTNUMBER\r
 AUTH CRAM-MD5\r
 *\r
 </protocol>
index e091de3956bacd585e005a052f010678b1f622f6..518a9b157bc8269093c7d41fed30233d7046e281 100644 (file)
@@ -41,7 +41,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-smtp://%HOSTIP:%SMTPPORT/933 --mail-rcpt recipient@example.com --mail-from sender@example.com -u testuser:testpass -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u testuser:testpass -T -
 </command>
 <precheck>
 chkhostname curlhost
@@ -59,7 +59,7 @@ chkhostname curlhost
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "QUIT"
 <protocol>
-EHLO 933\r
+EHLO %TESTNUMBER\r
 AUTH NTLM\r
 TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 *\r
index 1794d81d899d36271c586ca4b34268d8c5df30d1..87b8571d769588df77f69900b968e44a176771cc 100644 (file)
@@ -35,7 +35,7 @@ crypto
 SMTP DIGEST-MD5 graceful cancellation
  </name>
  <command>
-smtp://%HOSTIP:%SMTPPORT/934 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>
 
@@ -50,7 +50,7 @@ smtp://%HOSTIP:%SMTPPORT/934 --mail-rcpt recipient@example.com --mail-from sende
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "QUIT"
 <protocol>
-EHLO 934\r
+EHLO %TESTNUMBER\r
 AUTH DIGEST-MD5\r
 *\r
 </protocol>
index 946611477d097e0f477e5992c06e1d9159ada537..fe106f8bda5d5915df3627938fbf37ba35da1133 100644 (file)
@@ -39,7 +39,7 @@ SMTP CRAM-MD5 authentication with SASL downgrade
 mail body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/935 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>
 
@@ -47,7 +47,7 @@ smtp://%HOSTIP:%SMTPPORT/935 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 935\r
+EHLO %TESTNUMBER\r
 AUTH CRAM-MD5\r
 *\r
 AUTH PLAIN\r
index b12349968e6d3eb040fe1fc601b8be9a1b75092e..6d8074f2e969281d38c51bd6c08af6d9c5c964a4 100644 (file)
@@ -47,7 +47,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-smtp://%HOSTIP:%SMTPPORT/936 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 <precheck>
 chkhostname curlhost
@@ -58,7 +58,7 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 936\r
+EHLO %TESTNUMBER\r
 AUTH NTLM\r
 TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 *\r
index 5e729e30836fdd4ce5f0e85907f44596d7c2398d..c2a195ab19ada5680f0c783808db378b65014378 100644 (file)
@@ -41,7 +41,7 @@ SMTP DIGEST-MD5 authentication with SASL downgrade
 mail body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/937 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>
 
@@ -49,7 +49,7 @@ smtp://%HOSTIP:%SMTPPORT/937 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 937\r
+EHLO %TESTNUMBER\r
 AUTH DIGEST-MD5\r
 *\r
 AUTH PLAIN\r
index 7931d0aaa50bf734fd60d0d6dfb1c686fa05a411..ec19998c0242e121cccf143972e735fba5b9bd9b 100644 (file)
@@ -30,11 +30,11 @@ smtp
  <name>
 SMTP multiple connection authentication
  </name>
-<file name="log/upload938">
+<file name="log/upload%TESTNUMBER">
 mail body\r
 </file>
  <command>
-smtp://%HOSTIP:%SMTPPORT/938001 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user.one:secret -T log/upload938 -: smtp://%HOSTIP:%SMTPPORT/938002 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user.two:secret -T log/upload938
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER001 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user.one:secret -T log/upload%TESTNUMBER -: smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER002 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user.two:secret -T log/upload%TESTNUMBER
 </command>
 </client>
 
@@ -42,14 +42,14 @@ smtp://%HOSTIP:%SMTPPORT/938001 --mail-rcpt recipient@example.com --mail-from se
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 938001\r
+EHLO %TESTNUMBER001\r
 AUTH PLAIN\r
 dXNlci5vbmUAdXNlci5vbmUAc2VjcmV0\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient@example.com>\r
 DATA\r
 QUIT\r
-EHLO 938002\r
+EHLO %TESTNUMBER002\r
 AUTH PLAIN\r
 dXNlci50d28AdXNlci50d28Ac2VjcmV0\r
 MAIL FROM:<sender@example.com>\r
index 34ba8a0ebbd43140695ead50edb842db6d436ccf..b385798b68c5d2c984cf600d128f1b4a30825366 100644 (file)
@@ -27,7 +27,7 @@ RFC821-only SMTP with username and password
 mail body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/939 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>
 
@@ -35,8 +35,8 @@ smtp://%HOSTIP:%SMTPPORT/939 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 939\r
-HELO 939\r
+EHLO %TESTNUMBER\r
+HELO %TESTNUMBER\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient@example.com>\r
 DATA\r
index 6d54e78703b6a15ecf00bbec754bfc457a5dc504..87b65d13a8876f73308e16d9a09adc2d0b84bf6e 100644 (file)
@@ -35,7 +35,7 @@ proxy
 HTTPS GET with failed proxy auth (CONNECT 1.0)
  </name>
  <command>
-https://test.anything.really.com:94 --proxy1.0 %HOSTIP:%HTTPPORT
+https://test.anything.really.com:%TESTNUMBER --proxy1.0 %HOSTIP:%HTTPPORT
 </command>
 </client>
 
@@ -46,8 +46,8 @@ https://test.anything.really.com:94 --proxy1.0 %HOSTIP:%HTTPPORT
 56
 </errorcode>
 <protocol>
-CONNECT test.anything.really.com:94 HTTP/1.0\r
-Host: test.anything.really.com:94\r
+CONNECT test.anything.really.com:%TESTNUMBER HTTP/1.0\r
+Host: test.anything.really.com:%TESTNUMBER\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
index 4dfb72cad1606c6f26b5d4b4fa3c0d61345521aa..baa0c989448a49c6cf381aeaac86f340d96dc8ee 100644 (file)
@@ -23,7 +23,7 @@ SMTP with username and password but no AUTH capability
 mail body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/940 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>
 
@@ -31,7 +31,7 @@ smtp://%HOSTIP:%SMTPPORT/940 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 940\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient@example.com>\r
 DATA\r
index fd69b8732f86e5f751ddf08f03438196131aac63..f4dc34faea279651765ec31ca42b0a06529c1246 100644 (file)
@@ -20,7 +20,7 @@ smtp
  <name>
 SMTP with --crlf
  </name>
-<file name="log/upload941">
+<file name="log/upload%TESTNUMBER">
 From: different
 To: another
 
@@ -34,7 +34,7 @@ the
 --crlf option
 </file>
  <command>
-smtp://%HOSTIP:%SMTPPORT/941 --mail-rcpt recipient@example.com --mail-from sender@example.com -T log/upload941 --crlf
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T log/upload%TESTNUMBER --crlf
 </command>
 </client>
 
@@ -42,7 +42,7 @@ smtp://%HOSTIP:%SMTPPORT/941 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 941\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient@example.com>\r
 DATA\r
index 26740f7b67ddd6e5eca395d06d24099d07abe96e..ae30a9c6e60a36ccc9711e6dca6565ab98afe4e6 100644 (file)
@@ -32,7 +32,7 @@ SMTP external authentication
 mail body\r
 </stdin>
  <command>
-'smtp://user;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/942' --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
+'smtp://user;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/%TESTNUMBER' --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ mail body
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 942\r
+EHLO %TESTNUMBER\r
 AUTH EXTERNAL\r
 dXNlcg==\r
 MAIL FROM:<sender@example.com>\r
index aef2c6228550fcb84ed27f93b915fcafa175c5e2..4f403cdff0e2fb896159f6c637216f2ccd0d252c 100644 (file)
@@ -32,7 +32,7 @@ SMTP external authentication without credentials
 mail body\r
 </stdin>
  <command>
-'smtp://;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/943' --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
+'smtp://;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/%TESTNUMBER' --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ mail body
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 943\r
+EHLO %TESTNUMBER\r
 AUTH EXTERNAL\r
 =\r
 MAIL FROM:<sender@example.com>\r
index 4b60f120fb3877a640e234b8e4ddde50821bac8c..0539a8ae13c258695d0b043f49095fe6b998eb07 100644 (file)
@@ -32,7 +32,7 @@ SMTP external authentication with initial response
 mail body\r
 </stdin>
  <command>
-'smtp://user;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/944' --mail-rcpt recipient@example.com --mail-from sender@example.com --sasl-ir -T -
+'smtp://user;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/%TESTNUMBER' --mail-rcpt recipient@example.com --mail-from sender@example.com --sasl-ir -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ mail body
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 944\r
+EHLO %TESTNUMBER\r
 AUTH EXTERNAL dXNlcg==\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient@example.com>\r
index 3526408d35d65ca1ba4c8fa8d1d61a43be42861e..5a3fb49376f707788a42466c38c00dea2424f793 100644 (file)
@@ -32,7 +32,7 @@ SMTP external authentication with initial response without credentials
 mail body\r
 </stdin>
  <command>
-'smtp://;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/945' --mail-rcpt recipient@example.com --mail-from sender@example.com --sasl-ir -T -
+'smtp://;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/%TESTNUMBER' --mail-rcpt recipient@example.com --mail-from sender@example.com --sasl-ir -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ mail body
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 945\r
+EHLO %TESTNUMBER\r
 AUTH EXTERNAL =\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient@example.com>\r
index aa88364fa3bde28c65bb75a5b63bd2c13857da74..ea6569380d01d350545fe237cd8466303b9b79a1 100644 (file)
@@ -33,7 +33,7 @@ SMTP OAuth 2.0 (OAUTHBEARER) authentication
 mail body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/946 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM -T -
 </command>
 </client>
 
@@ -41,7 +41,7 @@ smtp://%HOSTIP:%SMTPPORT/946 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 946\r
+EHLO %TESTNUMBER\r
 AUTH OAUTHBEARER\r
 %b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%\r
 MAIL FROM:<sender@example.com>\r
index d2622be8d2373e1a6417c053f015a0f90bcec987..290da7114b12ead8e8a235cc779030641b69af09 100644 (file)
@@ -33,7 +33,7 @@ SMTP OAuth 2.0 (OAUTHBEARER) authentication with initial response
 mail body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/947 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir -T -
 </command>
 </client>
 
@@ -41,7 +41,7 @@ smtp://%HOSTIP:%SMTPPORT/947 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 947\r
+EHLO %TESTNUMBER\r
 AUTH OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient@example.com>\r
index a6eadf5fa96b5a9df5908b2a27b6d6ccd2d1374b..59a492f17939a82eb0ac551b62251530ed908b97 100644 (file)
@@ -34,7 +34,7 @@ SMTP OAuth 2.0 (OAUTHBEARER) failure as continuation
 mail body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/948 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM -T -
 </command>
 </client>
 
@@ -49,7 +49,7 @@ smtp://%HOSTIP:%SMTPPORT/948 --mail-rcpt recipient@example.com --mail-from sende
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "QUIT"
 <protocol>
-EHLO 948\r
+EHLO %TESTNUMBER\r
 AUTH OAUTHBEARER\r
 %b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%\r
 AQ==\r
index 82064f19a69ef41cee2fc8f81ee7406d350421ef..0c90074956d4c251902c01ff6ccb702d9018c999 100644 (file)
@@ -34,7 +34,7 @@ SMTP OAuth 2.0 (OAUTHBEARER) failure as continuation with initial response
 mail body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/949 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir -T -
 </command>
 </client>
 
@@ -49,7 +49,7 @@ smtp://%HOSTIP:%SMTPPORT/949 --mail-rcpt recipient@example.com --mail-from sende
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "QUIT"
 <protocol>
-EHLO 949\r
+EHLO %TESTNUMBER\r
 AUTH OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%\r
 AQ==\r
 </protocol>
index 4e3c1ff4eb6268fa47e2b7079def4a7be4239981..bc82f162f7e099ada44b23865fcd696d6cb6b586 100644 (file)
@@ -50,7 +50,7 @@ http-proxy
 HTTP over proxytunnel using POST
  </name>
  <command>
-http://test.95:%HTTPPORT/we/want/that/page/95 -p -x %HOSTIP:%PROXYPORT -d "datatopost=ohthatsfunyesyes"
+http://test.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -p -x %HOSTIP:%PROXYPORT -d "datatopost=ohthatsfunyesyes"
 </command>
 <features>
 proxy
@@ -61,15 +61,15 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT test.95:%HTTPPORT HTTP/1.1\r
-Host: test.95:%HTTPPORT\r
+CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
+Host: test.%TESTNUMBER:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol nonewline="yes">
-POST /we/want/that/page/95 HTTP/1.1\r
-Host: test.95:%HTTPPORT\r
+POST /we/want/that/page/%TESTNUMBER HTTP/1.1\r
+Host: test.%TESTNUMBER:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 27\r
index 295f8b877bc8fd55a8657731d92924818f8206eb..3198ab214b6cfb38b32cadae6e1fa4a0ebb40c0c 100644 (file)
@@ -27,7 +27,7 @@ SMTP VRFY with custom request
 
 # the custom request just does it lowercase to remain the same command
 <command>
-smtp://%HOSTIP:%SMTPPORT/950 --mail-rcpt recipient --request "vrfy"
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient --request "vrfy"
 </command>
 </client>
 
@@ -35,7 +35,7 @@ smtp://%HOSTIP:%SMTPPORT/950 --mail-rcpt recipient --request "vrfy"
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 950\r
+EHLO %TESTNUMBER\r
 vrfy recipient\r
 QUIT\r
 </protocol>
index 7d2e17b1bef6f579e27c44dca2f3c5f24b80b376..3a3626f7ee0a22bf0d6779d3ac7976f694d236e9 100644 (file)
@@ -23,7 +23,7 @@ SMTP data with dot as first character
 .This first line starts with a dot\r
 </stdin>
 <command>
-smtp://%HOSTIP:%SMTPPORT/951 --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -31,7 +31,7 @@ smtp://%HOSTIP:%SMTPPORT/951 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 951\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient@example.com>\r
 DATA\r
index 54334b21efef7d17150a428cb07b169d3106bdb1..39b9f76084b41210853af25da24862e10bb27f1e 100644 (file)
@@ -23,7 +23,7 @@ SMTP data with single dot-only line
 .\r
 </stdin>
 <command>
-smtp://%HOSTIP:%SMTPPORT/952 --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -31,7 +31,7 @@ smtp://%HOSTIP:%SMTPPORT/952 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 952\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient@example.com>\r
 DATA\r
index 4a70e1f31d6173a0c88b07ae3894d161257610a2..e4d0328a6f07b1afaa2acce6706b8739e6b8c3a2 100644 (file)
@@ -32,7 +32,7 @@ SMTP plain authentication with alternative authorization identity
 mail body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/953 --mail-rcpt recipient@example.com --mail-from sender@example.com -u kurt:xipj3plmq --sasl-authzid ursel -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u kurt:xipj3plmq --sasl-authzid ursel -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ smtp://%HOSTIP:%SMTPPORT/953 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 953\r
+EHLO %TESTNUMBER\r
 AUTH PLAIN\r
 dXJzZWwAa3VydAB4aXBqM3BsbXE=\r
 MAIL FROM:<sender@example.com>\r
index a5e6bb0d3760e48293fcdf6b326ecd2a6519a6ae..fa2d591851fe75d1574179b79ef76b74c8c47ac7 100644 (file)
@@ -5,7 +5,7 @@ SMTP
 SASL
 SASL AUTH PLAIN
 RFC4616
-RFC4954
+RFC4%TESTNUMBER
 </keywords>
 </info>
 
@@ -32,7 +32,7 @@ SMTP plain authentication with alternative authorization identity (Not authorize
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/954 --mail-rcpt recipient@example.com --mail-from sender@example.com -u kurt:xipj3plmq --sasl-authzid ursel -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u kurt:xipj3plmq --sasl-authzid ursel -T -
 </command>
 </client>
 
@@ -47,7 +47,7 @@ smtp://%HOSTIP:%SMTPPORT/954 --mail-rcpt recipient@example.com --mail-from sende
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "QUIT"
 <protocol>
-EHLO 954\r
+EHLO %TESTNUMBER\r
 AUTH PLAIN\r
 dXJzZWwAa3VydAB4aXBqM3BsbXE=\r
 </protocol>
index 97ef295611455792e9a68699a51db0dbd39060af..6525baab3919789ee05bd6dc39a008c74e864965 100644 (file)
@@ -39,7 +39,7 @@ To: another
 body\r
 </stdin>
 <command>
-smtp://%HOSTIP:%SMTPPORT/955 --mail-rcpt recipient@example.com --mail-from Avsändaren@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from Avsändaren@example.com -T -
 </command>
 </client>
 
@@ -51,7 +51,7 @@ smtp://%HOSTIP:%SMTPPORT/955 --mail-rcpt recipient@example.com --mail-from Avsä
 55
 </errorcode>
 <protocol>
-EHLO 955\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<Avsändaren@example.com>\r
 QUIT\r
 </protocol>
index 7fc9bc9afb38251faa42d845215a28b219190a73..52d2454a2584bcce72b11a8402bd980be4ccb09e 100644 (file)
@@ -36,7 +36,7 @@ To: another
 body\r
 </stdin>
 <command>
-smtp://%HOSTIP:%SMTPPORT/956 --mail-rcpt Stödmottagaren@example.com --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Stödmottagaren@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -48,7 +48,7 @@ smtp://%HOSTIP:%SMTPPORT/956 --mail-rcpt Stödmottagaren@example.com --mail-from
 55
 </errorcode>
 <protocol>
-EHLO 956\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<Stödmottagaren@example.com>\r
 QUIT\r
index 28c9c478a2c8fe0261e1c01eba56f696db19c1ad..5859f92fc5826842ed4f4d4cb5ee4251db60fd75 100644 (file)
@@ -31,7 +31,7 @@ perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(lan
 SMTP VRFY without SMTPUTF8 support - UTF-8 based recipient (local part only)
  </name>
 <command>
-smtp://%HOSTIP:%SMTPPORT/957 --mail-rcpt Användaren
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Användaren
 </command>
 </client>
 
@@ -43,7 +43,7 @@ smtp://%HOSTIP:%SMTPPORT/957 --mail-rcpt Användaren
 56
 </errorcode>
 <protocol>
-EHLO 957\r
+EHLO %TESTNUMBER\r
 VRFY Användaren\r
 QUIT\r
 </protocol>
index 66ba414cbba7e495c5d7f3b9afe4d9e94adad76f..ce3de334268e8789a018eb426a6ff907f5b8e9fc 100644 (file)
@@ -31,7 +31,7 @@ perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(lan
 SMTP external VRFY without SMTPUTF8 support - UTF-8 based recipient (local part only)
  </name>
 <command>
-smtp://%HOSTIP:%SMTPPORT/958 --mail-rcpt Användaren@example.com
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Användaren@example.com
 </command>
 </client>
 
@@ -43,7 +43,7 @@ smtp://%HOSTIP:%SMTPPORT/958 --mail-rcpt Användaren@example.com
 56
 </errorcode>
 <protocol>
-EHLO 958\r
+EHLO %TESTNUMBER\r
 VRFY Användaren@example.com\r
 QUIT\r
 </protocol>
index 1b2d65842cc9bdbc6627fdaa5cd213a14d26a9a6..8bebe40ad2766109f6e7a334fbc17100b0e3cc39 100644 (file)
@@ -40,7 +40,7 @@ To: another
 body\r
 </stdin>
 <command>
-smtp://%HOSTIP:%SMTPPORT/959 --mail-rcpt recipient@example.com --mail-from sender@åäö.se -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@åäö.se -T -
 </command>
 </client>
 
@@ -52,7 +52,7 @@ smtp://%HOSTIP:%SMTPPORT/959 --mail-rcpt recipient@example.com --mail-from sende
 55
 </errorcode>
 <protocol>
-EHLO 959\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@åäö.se>\r
 QUIT\r
 </protocol>
index 32834cda0867246a21228a3d6780a78930aa015e..68d8eda7246c2509f88da6ba8b0760959ccd533d 100644 (file)
@@ -37,7 +37,7 @@ To: another
 body\r
 </stdin>
 <command>
-smtp://%HOSTIP:%SMTPPORT/960 --mail-rcpt recipient@åäö.se --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@åäö.se --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -49,7 +49,7 @@ smtp://%HOSTIP:%SMTPPORT/960 --mail-rcpt recipient@åäö.se --mail-from sender@
 55
 </errorcode>
 <protocol>
-EHLO 960\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient@åäö.se>\r
 QUIT\r
index 2148a0ce551aed9df31302f5d4b00c867193f0b2..02e2653532e674968c5aec671791758cea466f8e 100644 (file)
@@ -32,7 +32,7 @@ perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(lan
 SMTP external VRFY without SMTPUTF8 support - UTF-8 based recipient (host part only)
  </name>
 <command>
-smtp://%HOSTIP:%SMTPPORT/961 --mail-rcpt user@åäö.se
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt user@åäö.se
 </command>
 </client>
 
@@ -44,7 +44,7 @@ smtp://%HOSTIP:%SMTPPORT/961 --mail-rcpt user@åäö.se
 56
 </errorcode>
 <protocol>
-EHLO 961\r
+EHLO %TESTNUMBER\r
 VRFY user@åäö.se\r
 QUIT\r
 </protocol>
index 35b368cfd069d726b4166f048ac1cbc530de999e..0977ab326cac50a3ba6932c5bba61ffa8275f617 100644 (file)
@@ -38,7 +38,7 @@ To: another
 body\r
 </stdin>
 <command>
-smtp://%HOSTIP:%SMTPPORT/962 --mail-rcpt recipient@example.com --mail-from sender@åäö.se -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@åäö.se -T -
 </command>
 </client>
 
@@ -46,7 +46,7 @@ smtp://%HOSTIP:%SMTPPORT/962 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 962\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@xn--4cab6c.se>\r
 RCPT TO:<recipient@example.com>\r
 DATA\r
index 7ea121507df3104c60d8da55855e2a0a34b8daef..22b252a96a38ee328f7e4d4696b14d0431fa438a 100644 (file)
@@ -38,7 +38,7 @@ To: another
 body\r
 </stdin>
 <command>
-smtp://%HOSTIP:%SMTPPORT/963 --mail-rcpt recipient@åäö.se --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@åäö.se --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -46,7 +46,7 @@ smtp://%HOSTIP:%SMTPPORT/963 --mail-rcpt recipient@åäö.se --mail-from sender@
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 963\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient@xn--4cab6c.se>\r
 DATA\r
index 5448d0f2109de5cf55ae435171611bdcdae5576d..7901e0aebf7bdd73529a405ed359aac71cf748cf 100644 (file)
@@ -33,7 +33,7 @@ perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(lan
 SMTP external VRFY without SMTPUTF8 support (IDN Enabled) - UTF-8 based recipient (host part only)
  </name>
 <command>
-smtp://%HOSTIP:%SMTPPORT/964 --mail-rcpt user@åäö.se
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt user@åäö.se
 </command>
 </client>
 
@@ -41,7 +41,7 @@ smtp://%HOSTIP:%SMTPPORT/964 --mail-rcpt user@åäö.se
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 964\r
+EHLO %TESTNUMBER\r
 VRFY user@xn--4cab6c.se\r
 QUIT\r
 </protocol>
index 8c93bc0c8541e6a23e8ed10e68c03c04e78a4195..ada2d8e703a044db31176a023a1ea5e16f6b5db8 100644 (file)
@@ -41,7 +41,7 @@ To: another
 body\r
 </stdin>
 <command>
-smtp://%HOSTIP:%SMTPPORT/965 --mail-rcpt recipient@example.com --mail-from Avsändaren@åäö.se -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from Avsändaren@åäö.se -T -
 </command>
 </client>
 
@@ -49,7 +49,7 @@ smtp://%HOSTIP:%SMTPPORT/965 --mail-rcpt recipient@example.com --mail-from Avsä
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 965\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<Avsändaren@xn--4cab6c.se> SMTPUTF8\r
 RCPT TO:<recipient@example.com>\r
 DATA\r
index 499fdda612a88026217d89f27768f1e265caf7ec..d2eb7c17c3b285e0e3dd191d9bed58b4f3702f02 100644 (file)
@@ -41,7 +41,7 @@ To: another
 body\r
 </stdin>
 <command>
-smtp://%HOSTIP:%SMTPPORT/966 --mail-rcpt Stödmottagaren@åäö.se --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Stödmottagaren@åäö.se --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -49,7 +49,7 @@ smtp://%HOSTIP:%SMTPPORT/966 --mail-rcpt Stödmottagaren@åäö.se --mail-from s
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 966\r
+EHLO %TESTNUMBER\r
 MAIL FROM:<sender@example.com> SMTPUTF8\r
 RCPT TO:<Stödmottagaren@xn--4cab6c.se>\r
 DATA\r
index 2813f508ba150c452ee512b1783a5b1d6094d00c..87a37ae05de0f2d734c9736595ec10df148ecb6c 100644 (file)
@@ -39,7 +39,7 @@ perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(lan
 SMTP external VRFY with SMTPUTF8 support
  </name>
 <command>
-smtp://%HOSTIP:%SMTPPORT/967 --mail-rcpt Användaren@åäö.se
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Användaren@åäö.se
 </command>
 </client>
 
@@ -47,7 +47,7 @@ smtp://%HOSTIP:%SMTPPORT/967 --mail-rcpt Användaren@åäö.se
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 967\r
+EHLO %TESTNUMBER\r
 VRFY Användaren@xn--4cab6c.se SMTPUTF8\r
 QUIT\r
 </protocol>
index ca58970c280c67bedf7c9da16d17a69cc214db78..89b543ae45d7e53da8e2974179aec7501d16f2b0 100644 (file)
@@ -36,7 +36,7 @@ perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(lan
 SMTP VRFY with SMTPUTF8 support
  </name>
 <command>
-smtp://%HOSTIP:%SMTPPORT/968 --mail-rcpt Användaren
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Användaren
 </command>
 </client>
 
@@ -44,7 +44,7 @@ smtp://%HOSTIP:%SMTPPORT/968 --mail-rcpt Användaren
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 968\r
+EHLO %TESTNUMBER\r
 VRFY Användaren SMTPUTF8\r
 QUIT\r
 </protocol>
index 9d3fa93e8eb4f857c459a0c38fdf684bb865f96a..860c9d47b4f9e30ed75092a12bdd9aad60af8746 100644 (file)
@@ -35,7 +35,7 @@ idn
 SMTP mailing list EXPN (CUSTOMREQUEST) with SMTPUTF8 support
  </name>
  <command>
-smtp://%HOSTIP:%SMTPPORT/969 --mail-rcpt Friends -X EXPN
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Friends -X EXPN
 </command>
 </client>
 
@@ -43,7 +43,7 @@ smtp://%HOSTIP:%SMTPPORT/969 --mail-rcpt Friends -X EXPN
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 969\r
+EHLO %TESTNUMBER\r
 EXPN Friends SMTPUTF8\r
 QUIT\r
 </protocol>
index d76941196dbbd37803f974846507a5b1ee98b639..db36eeb70145e7781cc10c370ee8890d5982e2d1 100644 (file)
@@ -29,7 +29,7 @@ http
 HTTP POST with custom content-type
  </name>
  <command>
- -d "hejsanallabarn" -H "Content-Type: silly/type" http://%HOSTIP:%HTTPPORT/97
+ -d "hejsanallabarn" -H "Content-Type: silly/type" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -37,7 +37,7 @@ HTTP POST with custom content-type
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /97 HTTP/1.1\r
+POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index 44c640c94e22ff510c1bbc92b0d5a44379ec3529..d052e809d9f0d92f34e3b354ea34aac46e87b598 100644 (file)
@@ -44,7 +44,7 @@ CURL_VERSION=curl-unit-test-fake-version
 HTTP GET with JSON output
 </name>
 <command option="no-include">
-http://%HOSTIP:%HTTPPORT/970 --write-out '%{json}' -o log/out970
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --write-out '%{json}' -o log/out%TESTNUMBER
 </command>
 </client>
 
@@ -52,14 +52,14 @@ http://%HOSTIP:%HTTPPORT/970 --write-out '%{json}' -o log/out970
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /970 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
 <stdout nonewline="yes">
-{"content_type":"text/html","errormsg":null,"exitcode":0,"filename_effective":"log/out970","ftp_entry_path":null,"http_code":200,"http_connect":000,"http_version":"1.1","local_ip":"127.0.0.1","local_port":13,"method":"GET","num_connects":1,"num_headers":9,"num_redirects":0,"proxy_ssl_verify_result":0,"redirect_url":null,"referer":null,"remote_ip":"%HOSTIP","remote_port":%HTTPPORT,"response_code":200,"scheme":"HTTP","size_download":445,"size_header":4019,"size_request":4019,"size_upload":0,"speed_download":13,"speed_upload":13,"ssl_verify_result":0,"time_appconnect":0.000013,"time_connect":0.000013,"time_namelookup":0.000013,"time_pretransfer":0.000013,"time_redirect":0.000013,"time_starttransfer":0.000013,"time_total":0.000013,"url":"http://%HOSTIP:%HTTPPORT/970","url_effective":"http://%HOSTIP:%HTTPPORT/970","urlnum":0,"curl_version":"curl-unit-test-fake-version"}
+{"content_type":"text/html","errormsg":null,"exitcode":0,"filename_effective":"log/out%TESTNUMBER","ftp_entry_path":null,"http_code":200,"http_connect":000,"http_version":"1.1","local_ip":"127.0.0.1","local_port":13,"method":"GET","num_connects":1,"num_headers":9,"num_redirects":0,"proxy_ssl_verify_result":0,"redirect_url":null,"referer":null,"remote_ip":"%HOSTIP","remote_port":%HTTPPORT,"response_code":200,"scheme":"HTTP","size_download":445,"size_header":4019,"size_request":4019,"size_upload":0,"speed_download":13,"speed_upload":13,"ssl_verify_result":0,"time_appconnect":0.000013,"time_connect":0.000013,"time_namelookup":0.000013,"time_pretransfer":0.000013,"time_redirect":0.000013,"time_starttransfer":0.000013,"time_total":0.000013,"url":"http://%HOSTIP:%HTTPPORT/%TESTNUMBER","url_effective":"http://%HOSTIP:%HTTPPORT/%TESTNUMBER","urlnum":0,"curl_version":"curl-unit-test-fake-version"}
 </stdout>
 </verify>
 </testcase>
index ef0cded2ffcd9f5ebd1059bebb5f95669d5e3973..1d89c34fe9849600f49883121382f875390d2e21 100644 (file)
@@ -29,7 +29,7 @@ http
 HTTP PUT from stdin with set size, disabling chunked transfer-encoding
  </name>
  <command>
- -T - -H "Transfer-Encoding:" -H "Content-Length: 14" http://%HOSTIP:%HTTPPORT/98
+ -T - -H "Transfer-Encoding:" -H "Content-Length: 14" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 <stdin>
 data on stdin
@@ -40,7 +40,7 @@ data on stdin
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /98 HTTP/1.1\r
+PUT /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
index cc7b8d765aafa179397e4373d20cb92cd18dcbc9..1ed74b0ba75ecc2ef230bb7a0eb5d1435ab3e142 100644 (file)
@@ -44,7 +44,7 @@ http
 HTTP GET with large-file resume point and failed resume
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/99 -C 9999999999
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 9999999999
 </command>
 </client>
 
@@ -56,7 +56,7 @@ http://%HOSTIP:%HTTPPORT/99 -C 9999999999
 33
 </errorcode>
 <protocol>
-GET /99 HTTP/1.1\r
+GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=9999999999-\r
 User-Agent: curl/%VERSION\r