diff --git a/test/conftest.py b/test/conftest.py index 3e2d475..5cd3c19 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -445,15 +445,6 @@ def ds1_dset(tst_sys): dset = DataSet() dset.add_file('t1') dset.add_file('d1/t2') - dset.add_file(f'test_alt##S') - dset.add_file(f'test_alt##S.H') - dset.add_file(f'test_alt##S.H.U') - dset.add_file(f'test_alt##C.S.H.U') - dset.add_file(f'test alt/test alt##S') - dset.add_file(f'test alt/test alt##S.H') - dset.add_file(f'test alt/test alt##S.H.U') - dset.add_file(f'test alt/test alt##C.S.H.U') - dset.add_file(f'test_alt_copy##{tst_sys}') dset.add_file(f'test_alt_copy##os.{tst_sys}') dset.add_file('u1', tracked=False) dset.add_file('d2/u2', tracked=False) diff --git a/test/test_alt_copy.py b/test/test_alt_copy.py index b26848f..c808348 100644 --- a/test/test_alt_copy.py +++ b/test/test_alt_copy.py @@ -8,8 +8,6 @@ import pytest 'cygwin', [pytest.param(True, marks=pytest.mark.deprecated), False], ids=['cygwin', 'no-cygwin']) -@pytest.mark.parametrize( - 'compatibility', [True, False], ids=['compat', 'no-compat']) @pytest.mark.parametrize( 'setting, expect_link, pre_existing', [ (None, True, None), @@ -29,7 +27,7 @@ import pytest def test_alt_copy( runner, yadm_y, paths, tst_sys, setting, expect_link, pre_existing, - compatibility, cygwin): + cygwin): """Test yadm.alt-copy""" option = 'yadm.cygwin-copy' if cygwin else 'yadm.alt-copy' @@ -37,10 +35,7 @@ def test_alt_copy( if setting is not None: os.system(' '.join(yadm_y('config', option, str(setting)))) - if compatibility: - expected_content = f'test_alt_copy##{tst_sys}' - else: - expected_content = f'test_alt_copy##os.{tst_sys}' + expected_content = f'test_alt_copy##os.{tst_sys}' alt_path = paths.work.join('test_alt_copy') if pre_existing == 'symlink': @@ -48,11 +43,7 @@ def test_alt_copy( elif pre_existing == 'file': alt_path.write('wrong content') - env = os.environ.copy() - if compatibility: - env['YADM_COMPATIBILITY'] = '1' - - run = runner(yadm_y('alt'), env=env) + run = runner(yadm_y('alt')) assert run.success assert run.err == '' assert 'Linking' in run.out