annotate tests/test-import.py @ 109:9324a89dd84e

client: Be more permissive on the output of update (issue3892)

Some extensions can add lines to the output, we now ignore them

import common, cStringIO, os
import hglib

patch = """
# HG changeset patch
# User test
# Date 0 0
# Node ID c103a3dec114d882c98382d684d8af798d09d857
# Parent  0000000000000000000000000000000000000000
1

diff -r 000000000000 -r c103a3dec114 a
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/a	Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+1
"""

class test_import(common.basetest):
    def test_basic_cstringio(self):
        self.client.import_(cStringIO.StringIO(patch))
        self.assertEquals(self.client.cat(['a']), '1\n')

    def test_basic_file(self):
        open('patch', 'wb').write(patch)

        # --no-commit
        self.client.import_(['patch'], nocommit=True)
        self.assertEquals(open('a').read(), '1\n')

        self.client.update(clean=True)
        os.remove('a')

        self.client.import_(['patch'])
        self.assertEquals(self.client.cat(['a']), '1\n')