1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
|
"""
Driver for running the tests on Windows.
For a list of options, run this script with the --help option.
"""
# $HeadURL: http://svn.apache.org/repos/asf/subversion/branches/1.6.x/win-tests.py $
# $LastChangedRevision: 1033425 $
import os, sys
import filecmp
import shutil
import traceback
try:
# Python >=3.0
import configparser
except ImportError:
# Python <3.0
import ConfigParser as configparser
import string
import random
import getopt
try:
my_getopt = getopt.gnu_getopt
except AttributeError:
my_getopt = getopt.getopt
def _usage_exit():
"print usage, exit the script"
print("Driver for running the tests on Windows.")
print("Usage: python win-tests.py [option] [test-path]")
print("")
print("Valid options:")
print(" -r, --release : test the Release configuration")
print(" -d, --debug : test the Debug configuration (default)")
print(" --bin=PATH : use the svn binaries installed in PATH")
print(" -u URL, --url=URL : run ra_dav or ra_svn tests against URL;")
print(" will start svnserve for ra_svn tests")
print(" -v, --verbose : talk more")
print(" -f, --fs-type=type : filesystem type to use (fsfs is default)")
print(" -c, --cleanup : cleanup after running a test")
print(" --svnserve-args=list : comma-separated list of arguments for")
print(" svnserve")
print(" default is '-d,-r,<test-path-root>'")
print(" --asp.net-hack : use '_svn' instead of '.svn' for the admin")
print(" dir name")
print(" --httpd-dir : location where Apache HTTPD is installed")
print(" --httpd-port : port for Apache HTTPD; random port number")
print(" will be used, if not specified")
print(" --httpd-daemon : Run Apache httpd as daemon")
print(" --httpd-service : Run Apache httpd as Windows service (default)")
print(" --http-library : dav library to use, neon (default) or serf")
print(" --list : print test doc strings only")
print(" --enable-sasl : enable Cyrus SASL authentication for")
print(" svnserve")
print(" -p, --parallel : run multiple tests in parallel")
print(" --server-minor-version : the minor version of the server being")
print(" tested")
print(" --config-file : Configuration file for tests")
print(" --fsfs-sharding : Specify shard size (for fsfs)")
print(" --fsfs-packing : Run 'svnadmin pack' automatically")
sys.exit(0)
CMDLINE_TEST_SCRIPT_PATH = 'subversion/tests/cmdline/'
CMDLINE_TEST_SCRIPT_NATIVE_PATH = CMDLINE_TEST_SCRIPT_PATH.replace('/', os.sep)
sys.path.insert(0, os.path.join('build', 'generator'))
sys.path.insert(1, 'build')
import gen_win
version_header = os.path.join('subversion', 'include', 'svn_version.h')
cp = configparser.ConfigParser()
cp.read('gen-make.opts')
gen_obj = gen_win.GeneratorBase('build.conf', version_header,
cp.items('options'))
all_tests = gen_obj.test_progs + gen_obj.bdb_test_progs \
+ gen_obj.scripts + gen_obj.bdb_scripts
client_tests = [x for x in all_tests if x.startswith(CMDLINE_TEST_SCRIPT_PATH)]
svn_dlls = []
for section in gen_obj.sections.values():
if section.options.get("msvc-export"):
dll_basename = section.name + "-" + str(gen_obj.version) + ".dll"
svn_dlls.append(os.path.join("subversion", section.name, dll_basename))
opts, args = my_getopt(sys.argv[1:], 'hrdvcpu:f:',
['release', 'debug', 'verbose', 'cleanup', 'url=',
'svnserve-args=', 'fs-type=', 'asp.net-hack',
'httpd-dir=', 'httpd-port=', 'httpd-daemon',
'httpd-server', 'http-library=', 'help',
'fsfs-packing', 'fsfs-sharding=',
'list', 'enable-sasl', 'bin=', 'parallel',
'config-file=', 'server-minor-version='])
if len(args) > 1:
print('Warning: non-option arguments after the first one will be ignored')
# Interpret the options and set parameters
base_url, fs_type, verbose, cleanup = None, None, None, None
repo_loc = 'local repository.'
objdir = 'Debug'
log = 'tests.log'
faillog = 'fails.log'
run_svnserve = None
svnserve_args = None
run_httpd = None
httpd_port = None
httpd_service = None
http_library = 'neon'
list_tests = None
enable_sasl = None
svn_bin = None
parallel = None
fsfs_sharding = None
fsfs_packing = None
server_minor_version = None
config_file = None
for opt, val in opts:
if opt in ('-h', '--help'):
_usage_exit()
elif opt in ('-u', '--url'):
base_url = val
elif opt in ('-f', '--fs-type'):
fs_type = val
elif opt in ('-v', '--verbose'):
verbose = 1
elif opt in ('-c', '--cleanup'):
cleanup = 1
elif opt in ['-r', '--release']:
objdir = 'Release'
elif opt in ['-d', '--debug']:
objdir = 'Debug'
elif opt == '--svnserve-args':
svnserve_args = val.split(',')
run_svnserve = 1
elif opt == '--asp.net-hack':
os.environ['SVN_ASP_DOT_NET_HACK'] = opt
elif opt == '--httpd-dir':
abs_httpd_dir = os.path.abspath(val)
run_httpd = 1
elif opt == '--httpd-port':
httpd_port = int(val)
elif opt == '--httpd-daemon':
httpd_service = 0
elif opt == '--httpd-service':
httpd_service = 1
elif opt == '--http-library':
http_library = val
elif opt == '--fsfs-sharding':
fsfs_sharding = int(val)
elif opt == '--fsfs-packing':
fsfs_packing = 1
elif opt == '--list':
list_tests = 1
elif opt == '--enable-sasl':
enable_sasl = 1
base_url = "svn://localhost/"
elif opt == '--server-minor-version':
server_minor_version = val
elif opt == '--bin':
svn_bin = val
elif opt in ('-p', '--parallel'):
parallel = 1
elif opt in ('--config-file'):
config_file = val
# Calculate the source and test directory names
abs_srcdir = os.path.abspath("")
abs_objdir = os.path.join(abs_srcdir, objdir)
if len(args) == 0:
abs_builddir = abs_objdir
create_dirs = 0
else:
abs_builddir = os.path.abspath(args[0])
create_dirs = 1
# Default to fsfs explicitly
if not fs_type:
fs_type = 'fsfs'
# Don't run bdb tests if they want to test fsfs
if fs_type == 'fsfs':
all_tests = gen_obj.test_progs + gen_obj.scripts
if run_httpd:
if not httpd_port:
httpd_port = random.randrange(1024, 30000)
if not base_url:
base_url = 'http://localhost:' + str(httpd_port)
if base_url:
all_tests = client_tests
repo_loc = 'remote repository ' + base_url + '.'
if base_url[:4] == 'http':
log = 'dav-tests.log'
faillog = 'dav-fails.log'
elif base_url[:3] == 'svn':
log = 'svn-tests.log'
faillog = 'svn-fails.log'
run_svnserve = 1
else:
# Don't know this scheme, but who're we to judge whether it's
# correct or not?
log = 'url-tests.log'
faillog = 'url-fails.log'
# Have to move the executables where the tests expect them to be
copied_execs = [] # Store copied exec files to avoid the final dir scan
def create_target_dir(dirname):
tgt_dir = os.path.join(abs_builddir, dirname)
if not os.path.exists(tgt_dir):
if verbose:
print("mkdir: %s" % tgt_dir)
os.makedirs(tgt_dir)
def copy_changed_file(src, tgt):
if not os.path.isfile(src):
print('Could not find ' + src)
sys.exit(1)
if os.path.isdir(tgt):
tgt = os.path.join(tgt, os.path.basename(src))
if os.path.exists(tgt):
assert os.path.isfile(tgt)
if filecmp.cmp(src, tgt):
if verbose:
print("same: %s" % src)
print(" and: %s" % tgt)
return 0
if verbose:
print("copy: %s" % src)
print(" to: %s" % tgt)
shutil.copy(src, tgt)
return 1
def copy_execs(baton, dirname, names):
copied_execs = baton
for name in names:
ext = os.path.splitext(name)[1]
if ext != ".exe":
continue
src = os.path.join(dirname, name)
tgt = os.path.join(abs_builddir, dirname, name)
create_target_dir(dirname)
if copy_changed_file(src, tgt):
copied_execs.append(tgt)
def locate_libs():
"Move DLLs to a known location and set env vars"
dlls = []
# look for APR 1.x dll's and use those if found
apr_test_path = os.path.join(gen_obj.apr_path, objdir, 'libapr-1.dll')
if os.path.exists(apr_test_path):
suffix = "-1"
else:
suffix = ""
dlls.append(os.path.join(gen_obj.apr_path, objdir,
'libapr%s.dll' % (suffix)))
dlls.append(os.path.join(gen_obj.apr_util_path, objdir,
'libaprutil%s.dll' % (suffix)))
if gen_obj.libintl_path is not None:
dlls.append(os.path.join(gen_obj.libintl_path, 'bin', 'intl3_svn.dll'))
if gen_obj.bdb_lib is not None:
partial_path = os.path.join(gen_obj.bdb_path, 'bin', gen_obj.bdb_lib)
if objdir == 'Debug':
dlls.append(partial_path + 'd.dll')
else:
dlls.append(partial_path + '.dll')
if gen_obj.sasl_path is not None:
dlls.append(os.path.join(gen_obj.sasl_path, 'lib', 'libsasl.dll'))
for dll in dlls:
copy_changed_file(dll, abs_objdir)
# Copy the Subversion library DLLs
if not cp.has_option('options', '--disable-shared'):
for svn_dll in svn_dlls:
copy_changed_file(os.path.join(abs_objdir, svn_dll), abs_objdir)
# Copy the Apache modules
if run_httpd and cp.has_option('options', '--with-httpd'):
mod_dav_svn_path = os.path.join(abs_objdir, 'subversion',
'mod_dav_svn', 'mod_dav_svn.so')
mod_authz_svn_path = os.path.join(abs_objdir, 'subversion',
'mod_authz_svn', 'mod_authz_svn.so')
copy_changed_file(mod_dav_svn_path, abs_objdir)
copy_changed_file(mod_authz_svn_path, abs_objdir)
os.environ['PATH'] = abs_objdir + os.pathsep + os.environ['PATH']
def fix_case(path):
path = os.path.normpath(path)
parts = path.split(os.path.sep)
drive = parts[0].upper()
parts = parts[1:]
path = drive + os.path.sep
for part in parts:
dirs = os.listdir(path)
for dir in dirs:
if dir.lower() == part.lower():
path = os.path.join(path, dir)
break
return path
class Svnserve:
"Run svnserve for ra_svn tests"
def __init__(self, svnserve_args, objdir, abs_objdir, abs_builddir):
self.args = svnserve_args
self.name = 'svnserve.exe'
self.kind = objdir
self.path = os.path.join(abs_objdir,
'subversion', 'svnserve', self.name)
self.root = os.path.join(abs_builddir, CMDLINE_TEST_SCRIPT_NATIVE_PATH)
self.proc_handle = None
def __del__(self):
"Stop svnserve when the object is deleted"
self.stop()
def _quote(self, arg):
if ' ' in arg:
return '"' + arg + '"'
else:
return arg
def start(self):
if not self.args:
args = [self.name, '-d', '-r', self.root]
else:
args = [self.name] + self.args
print('Starting %s %s' % (self.kind, self.name))
try:
import win32process
import win32con
args = ' '.join([self._quote(x) for x in args])
self.proc_handle = (
win32process.CreateProcess(self._quote(self.path), args,
None, None, 0,
win32con.CREATE_NEW_CONSOLE,
None, None, win32process.STARTUPINFO()))[0]
except ImportError:
os.spawnv(os.P_NOWAIT, self.path, args)
def stop(self):
if self.proc_handle is not None:
try:
import win32process
print('Stopping %s' % self.name)
win32process.TerminateProcess(self.proc_handle, 0)
return
except ImportError:
pass
print('Svnserve.stop not implemented')
class Httpd:
"Run httpd for DAV tests"
def __init__(self, abs_httpd_dir, abs_objdir, abs_builddir, httpd_port, service):
self.name = 'apache.exe'
self.httpd_port = httpd_port
self.httpd_dir = abs_httpd_dir
self.service = service
self.proc_handle = None
self.path = os.path.join(self.httpd_dir, 'bin', self.name)
if not os.path.exists(self.path):
self.name = 'httpd.exe'
self.path = os.path.join(self.httpd_dir, 'bin', self.name)
if not os.path.exists(self.path):
raise RuntimeError("Could not find a valid httpd binary!")
self.root_dir = os.path.join(CMDLINE_TEST_SCRIPT_NATIVE_PATH, 'httpd')
self.root = os.path.join(abs_builddir, self.root_dir)
self.authz_file = os.path.join(abs_builddir,
CMDLINE_TEST_SCRIPT_NATIVE_PATH,
'svn-test-work', 'authz')
self.httpd_config = os.path.join(self.root, 'httpd.conf')
self.httpd_users = os.path.join(self.root, 'users')
self.httpd_mime_types = os.path.join(self.root, 'mime.types')
self.abs_builddir = abs_builddir
self.abs_objdir = abs_objdir
self.service_name = 'svn-test-httpd-' + str(httpd_port)
if self.service:
self.httpd_args = [self.name, '-n', self._quote(self.service_name),
'-f', self._quote(self.httpd_config)]
else:
self.httpd_args = [self.name, '-f', self._quote(self.httpd_config)]
create_target_dir(self.root_dir)
self._create_users_file()
self._create_mime_types_file()
# Determine version.
if os.path.exists(os.path.join(self.httpd_dir,
'modules', 'mod_access_compat.so')):
self.httpd_ver = 2.3
elif os.path.exists(os.path.join(self.httpd_dir,
'modules', 'mod_auth_basic.so')):
self.httpd_ver = 2.2
else:
self.httpd_ver = 2.0
# Create httpd config file
fp = open(self.httpd_config, 'w')
# Global Environment
fp.write('ServerRoot ' + self._quote(self.root) + '\n')
fp.write('DocumentRoot ' + self._quote(self.root) + '\n')
fp.write('ServerName localhost\n')
fp.write('PidFile pid\n')
fp.write('ErrorLog log\n')
fp.write('Listen ' + str(self.httpd_port) + '\n')
# Write LoadModule for minimal system module
fp.write(self._sys_module('dav_module', 'mod_dav.so'))
if self.httpd_ver >= 2.3:
fp.write(self._sys_module('access_compat_module', 'mod_access_compat.so'))
fp.write(self._sys_module('authz_core_module', 'mod_authz_core.so'))
fp.write(self._sys_module('authz_user_module', 'mod_authz_user.so'))
fp.write(self._sys_module('authn_core_module', 'mod_authn_core.so'))
if self.httpd_ver >= 2.2:
fp.write(self._sys_module('auth_basic_module', 'mod_auth_basic.so'))
fp.write(self._sys_module('authn_file_module', 'mod_authn_file.so'))
else:
fp.write(self._sys_module('auth_module', 'mod_auth.so'))
fp.write(self._sys_module('mime_module', 'mod_mime.so'))
fp.write(self._sys_module('log_config_module', 'mod_log_config.so'))
# Write LoadModule for Subversion modules
fp.write(self._svn_module('dav_svn_module', 'mod_dav_svn.so'))
fp.write(self._svn_module('authz_svn_module', 'mod_authz_svn.so'))
# Define two locations for repositories
fp.write(self._svn_repo('repositories'))
fp.write(self._svn_repo('local_tmp'))
fp.write('TypesConfig ' + self._quote(self.httpd_mime_types) + '\n')
fp.write('LogLevel Debug\n')
fp.write('HostNameLookups Off\n')
fp.close()
def __del__(self):
"Stop httpd when the object is deleted"
self.stop()
def _quote(self, arg):
if ' ' in arg:
return '"' + arg + '"'
else:
return arg
def _create_users_file(self):
"Create users file"
htpasswd = os.path.join(self.httpd_dir, 'bin', 'htpasswd.exe')
os.spawnv(os.P_WAIT, htpasswd, ['htpasswd.exe', '-mbc', self.httpd_users,
'jrandom', 'rayjandom'])
os.spawnv(os.P_WAIT, htpasswd, ['htpasswd.exe', '-mb', self.httpd_users,
'jconstant', 'rayjandom'])
def _create_mime_types_file(self):
"Create empty mime.types file"
fp = open(self.httpd_mime_types, 'w')
fp.close()
def _sys_module(self, name, path):
full_path = os.path.join(self.httpd_dir, 'modules', path)
return 'LoadModule ' + name + " " + self._quote(full_path) + '\n'
def _svn_module(self, name, path):
full_path = os.path.join(self.abs_objdir, path)
return 'LoadModule ' + name + ' ' + self._quote(full_path) + '\n'
def _svn_repo(self, name):
path = os.path.join(self.abs_builddir,
CMDLINE_TEST_SCRIPT_NATIVE_PATH,
'svn-test-work', name)
location = '/svn-test-work/' + name
return \
'<Location ' + location + '>\n' \
' DAV svn\n' \
' SVNParentPath ' + self._quote(path) + '\n' \
' AuthzSVNAccessFile ' + self._quote(self.authz_file) + '\n' \
' AuthType Basic\n' \
' AuthName "Subversion Repository"\n' \
' AuthUserFile ' + self._quote(self.httpd_users) + '\n' \
' Require valid-user\n' \
'</Location>\n'
def start(self):
if self.service:
self._start_service()
else:
self._start_daemon()
def stop(self):
if self.service:
self._stop_service()
else:
self._stop_daemon()
def _start_service(self):
"Install and start HTTPD service"
print('Installing service %s' % self.service_name)
os.spawnv(os.P_WAIT, self.path, self.httpd_args + ['-k', 'install'])
print('Starting service %s' % self.service_name)
os.spawnv(os.P_WAIT, self.path, self.httpd_args + ['-k', 'start'])
def _stop_service(self):
"Stop and uninstall HTTPD service"
os.spawnv(os.P_WAIT, self.path, self.httpd_args + ['-k', 'stop'])
os.spawnv(os.P_WAIT, self.path, self.httpd_args + ['-k', 'uninstall'])
def _start_daemon(self):
"Start HTTPD as daemon"
print('Starting httpd as daemon')
print(self.httpd_args)
try:
import win32process
import win32con
args = ' '.join([self._quote(x) for x in self.httpd_args])
self.proc_handle = (
win32process.CreateProcess(self._quote(self.path), args,
None, None, 0,
win32con.CREATE_NEW_CONSOLE,
None, None, win32process.STARTUPINFO()))[0]
except ImportError:
os.spawnv(os.P_NOWAIT, self.path, self.httpd_args)
def _stop_daemon(self):
"Stop the HTTPD daemon"
if self.proc_handle is not None:
try:
import win32process
print('Stopping %s' % self.name)
win32process.TerminateProcess(self.proc_handle, 0)
return
except ImportError:
pass
print('Httpd.stop_daemon not implemented')
# Move the binaries to the test directory
locate_libs()
if create_dirs:
old_cwd = os.getcwd()
try:
os.chdir(abs_objdir)
baton = copied_execs
os.path.walk('subversion', copy_execs, baton)
except:
os.chdir(old_cwd)
raise
else:
os.chdir(old_cwd)
# Create the base directory for Python tests
create_target_dir(CMDLINE_TEST_SCRIPT_NATIVE_PATH)
# Ensure the tests directory is correctly cased
abs_builddir = fix_case(abs_builddir)
daemon = None
# Run the tests
if run_svnserve:
daemon = Svnserve(svnserve_args, objdir, abs_objdir, abs_builddir)
if run_httpd:
daemon = Httpd(abs_httpd_dir, abs_objdir, abs_builddir, httpd_port,
httpd_service)
# Start service daemon, if any
if daemon:
daemon.start()
print('Testing %s configuration on %s' % (objdir, repo_loc))
sys.path.insert(0, os.path.join(abs_srcdir, 'build'))
import run_tests
th = run_tests.TestHarness(abs_srcdir, abs_builddir,
os.path.join(abs_builddir, log),
os.path.join(abs_builddir, faillog),
base_url, fs_type, http_library,
server_minor_version, 1, cleanup,
enable_sasl, parallel, config_file,
fsfs_sharding, fsfs_packing,
list_tests, svn_bin)
old_cwd = os.getcwd()
try:
os.chdir(abs_builddir)
failed = th.run(all_tests)
except:
os.chdir(old_cwd)
raise
else:
os.chdir(old_cwd)
# Stop service daemon, if any
if daemon:
del daemon
# Remove the execs again
for tgt in copied_execs:
try:
if os.path.isfile(tgt):
if verbose:
print("kill: %s" % tgt)
os.unlink(tgt)
except:
traceback.print_exc(file=sys.stdout)
pass
if failed:
sys.exit(1)
|