tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update dockerpty; stub it out in tests 

Its current behaviour occasionally causes tests to hang; until this is
resolved, we'll stub it out. We weren't testing the output of 'run'
anyhow (though we should be).
This commit is contained in:
Aanand Prasad 2014-06-27 14:41:36 +01:00
parent 7ec63afae9
commit 3c48884dbb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@ -3,4 +3,4 @@ PyYAML==3.10
requests==2.2.1
texttable==0.8.1
websocket-client==0.11.0
dockerpty==0.1.0
dockerpty==0.1.1

6
tests/integration/cli_test.py
View File

@ -102,7 +102,7 @@ class CLITestCase(DockerClientTestCase):
self.assertEqual(old_ids, new_ids)
@patch('sys.stdout', new_callable=StringIO)
@patch('dockerpty.start')
def test_run_with_links(self, mock_stdout):
mock_stdout.fileno = lambda: 1
@ -113,7 +113,7 @@ class CLITestCase(DockerClientTestCase):
self.assertEqual(len(db.containers()), 1)
self.assertEqual(len(console.containers()), 0)
@patch('sys.stdout', new_callable=StringIO)
@patch('dockerpty.start')
def test_run_with_no_deps(self, mock_stdout):
mock_stdout.fileno = lambda: 1
@ -122,7 +122,7 @@ class CLITestCase(DockerClientTestCase):
db = self.command.project.get_service('db')
self.assertEqual(len(db.containers()), 0)
@patch('sys.stdout', new_callable=StringIO)
@patch('dockerpty.start')
def test_run_does_not_recreate_linked_containers(self, mock_stdout):
mock_stdout.fileno = lambda: 1