psi-jack/yadm
1
0
Fork 0
mirror of synced 2024-12-22 06:31:07 -05:00
Code Issues Releases Wiki Activity

Add new alternates processing the cygwin copy testing

Browse source
This commit is contained in:
Tim Byrne 2019-09-29 17:48:20 -05:00
parent eeba216cfe
commit 36212cb752
No known key found for this signature in database
GPG key ID: 14DB4FC2465A4B12
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/conftest.py
View file

@ -459,6 +459,8 @@ def ds1_dset(tst_sys, cygwin_sys):
dset.add_file(f'test alt/test alt##C.S.H.U') dset.add_file(f'test alt/test alt##C.S.H.U')
dset.add_file(f'test_cygwin_copy##{tst_sys}') dset.add_file(f'test_cygwin_copy##{tst_sys}')
dset.add_file(f'test_cygwin_copy##{cygwin_sys}') dset.add_file(f'test_cygwin_copy##{cygwin_sys}')
dset.add_file(f'test_cygwin_copy##os.{tst_sys}')
dset.add_file(f'test_cygwin_copy##os.{cygwin_sys}')
dset.add_file('u1', tracked=False) dset.add_file('u1', tracked=False)
dset.add_file('d2/u2', tracked=False) dset.add_file('d2/u2', tracked=False)
dset.add_file('.ssh/p1', tracked=False, private=True) dset.add_file('.ssh/p1', tracked=False, private=True)

9
test/test_cygwin_copy.py
View file

@ -37,7 +37,11 @@ def test_cygwin_copy(
if setting is not None: if setting is not None:
os.system(' '.join(yadm_y('config', 'yadm.cygwin-copy', str(setting)))) os.system(' '.join(yadm_y('config', 'yadm.cygwin-copy', str(setting))))
if compatibility:
expected_content = f'test_cygwin_copy##{tst_sys}' expected_content = f'test_cygwin_copy##{tst_sys}'
else:
expected_content = f'test_cygwin_copy##os.{tst_sys}'
alt_path = paths.work.join('test_cygwin_copy') alt_path = paths.work.join('test_cygwin_copy')
if pre_existing == 'symlink': if pre_existing == 'symlink':
alt_path.mklinkto(expected_content) alt_path.mklinkto(expected_content)
@ -49,13 +53,14 @@ def test_cygwin_copy(
uname = uname_path.join('uname') uname = uname_path.join('uname')
uname.write(f'#!/bin/sh\necho "{cygwin_sys}"\n') uname.write(f'#!/bin/sh\necho "{cygwin_sys}"\n')
uname.chmod(0o777) uname.chmod(0o777)
if compatibility:
expected_content = f'test_cygwin_copy##{cygwin_sys}' expected_content = f'test_cygwin_copy##{cygwin_sys}'
else:
expected_content = f'test_cygwin_copy##os.{cygwin_sys}'
env = os.environ.copy() env = os.environ.copy()
env['PATH'] = ':'.join([str(uname_path), env['PATH']]) env['PATH'] = ':'.join([str(uname_path), env['PATH']])
if compatibility: if compatibility:
env['YADM_COMPATIBILITY'] = '1' env['YADM_COMPATIBILITY'] = '1'
else:
pytest.xfail('Alternates 2.0.0 has not been implemented.')
run = runner(yadm_y('alt'), env=env) run = runner(yadm_y('alt'), env=env)
assert run.success assert run.success