← Back to branch summary

~chicharreros/magicicada-server/trunk

« back to all changes in this revision

Viewing changes to magicicada/server/integration/integtests_udf.py

  • Committer: Magicicada Bot
  • Author(s): Facundo Batista
  • Date: 2017-01-08 23:37:32 UTC
  • mfrom: (79.1.2 publicfiles)
  • Revision ID: magicicada_bot-20170108233732-faaeoq6sc9jorgue
[r=nataliabidart] Support public files changing and listing through the normal Server.

Show diffs side-by-side

added added

removed removed

Lines of Context:
magicicada/server/integration/integtests_udf.py
300
300
        assert actual2 == expected_with_conflict, \
301
301
            'directory merge must be correct for SD2'
302
302
 
 
303
 
303
304
test_merge_directories_with_overlap.skip = """
304
305
    The noconflict.txt file gets into conflict! Bug: #711389
305
306
"""
419
420
    debug(prefix, 'contents for SD2', udf_content)
420
421
    assert udf_content == [], msg
421
422
 
 
423
 
422
424
test_remove_udf.skip = """
423
425
    This test exposes a problem we have now in SD: deleting everything
424
426
    under the UDF depends on timing of operations between one client