view tests/test-pull.py @ 168:d71bd813c9d7

client: use subprocess.communicate() to shut down server process This allows us to get stderr output with no deadlock risk. Also, it should fix possible deadlock issue at server.wait(). https://docs.python.org/2.7/library/subprocess.html#subprocess.Popen.wait
author Yuya Nishihara <yuya@tcha.org>
date Mon, 07 Sep 2015 22:32:12 +0900
parents c1b966866ed7
children
line wrap: on
line source

from tests import common
import hglib
from hglib.util import b

class test_pull(common.basetest):
    def test_basic(self):
        self.append('a', 'a')
        self.client.commit(b('first'), addremove=True)

        self.client.clone(dest=b('other'))
        other = hglib.open(b('other'))

        self.append('a', 'a')
        self.client.commit(b('second'))

        self.assertTrue(other.pull())
        self.assertEquals(self.client.log(), other.log())

    def test_unresolved(self):
        self.append('a', 'a')
        self.client.commit(b('first'), addremove=True)

        self.client.clone(dest=b('other'))
        other = hglib.open(b('other'))

        self.append('a', 'a')
        self.client.commit(b('second'))

        self.append('other/a', 'b')
        self.assertFalse(other.pull(update=True))
        self.assertTrue((b('M'), b('a')) in other.status())