Commit Graph

29 Commits

Author SHA1 Message Date
3980cc1280 Merge branch 'master' of github.com:dotcloud/docker into 471-cpu-limit
Upstream-commit: 6f3e868a7b8f239334d06b2385b776ce7ae5614f
Component: engine
2013-05-10 14:44:50 -07:00
e4c6fe6d42 Mock Hijack and Implement Unit test for Attach
Upstream-commit: 15ae314cbb8ede09a2d2c9e70c6a0d7d87817b64
Component: engine
2013-05-09 21:55:08 -07:00
65d10241c4 in the tests, use a non-default value for cpu.shares
Upstream-commit: af9f559f2ebd6438f37fef890f2a25eca590f252
Component: engine
2013-05-07 11:44:24 -07:00
443030ccf1 implement "-c" option to allocate a number of CPU shares to a container
Upstream-commit: efd9becb78c82ddef07efb7e76e0100d7a712281
Component: engine
2013-05-07 11:16:30 -07:00
44910e43b1 update to master
Upstream-commit: 10c0e990371e065d4fc1c9b680f03a46e5bacc5e
Component: engine
2013-05-07 19:23:50 +02:00
1fe09c7f12 Merge pull request #497 from justone/dot-graph-images
+ images: output graph of images to dot (graphviz)
Upstream-commit: 8472a27e80849318161ed7d8f30a8b431b1571a8
Component: engine
2013-05-06 17:48:07 -07:00
7b2bb0c965 Update the unit tests to reflect the new API
Upstream-commit: ff95f2b0ecf54fdfeffa1aa008e22cb5c7ec59d6
Component: engine
2013-05-06 16:00:30 -07:00
3a6a7097c6 split api and server. run return exit code. import, pull and commit uses the smae endpoint. non zero status code on failure
Upstream-commit: 04cd20fa627635d30ea315d0d4e281e10e8d293c
Component: engine
2013-05-06 11:31:22 +02:00
e5252f9360 add tests for 'images' subcommand
Upstream-commit: 3dba4022adbd1f21a8b2ec4a6035cacfe143b380
Component: engine
2013-05-03 21:12:43 -07:00
27ad61c153 Wait for the container to finish in TestAttachDisconnect before destroying it
Upstream-commit: a22c78523f20c44e90e7a3adbd01a5560ed4f6ae
Component: engine
2013-04-23 11:09:48 -07:00
e2e7fde654 Fix race within TestRunDisconnectTty
Upstream-commit: acb546cd1bf45a248f4bb51637c795ef63feb6cb
Component: engine
2013-04-22 11:16:32 -07:00
00b1b1ebe5 update TestRunDisconnectTty to reflect the correct behavior of CmdRun
Upstream-commit: cc5a044a8c140e32868bb0f312f3780161515f0b
Component: engine
2013-04-19 17:51:41 -07:00
34381c942f Add unit test for hanging kill + fix other tests behaviour
Upstream-commit: bb22cd492efdc67855bbcf8ab4a669e45ea9ee8e
Component: engine
2013-04-11 16:21:19 -07:00
555829afe7 Update the unit test to reflect the new CmdRun behaviour in tty mode
Upstream-commit: d063d52cce9892c777722b30923d9fb1f1385fe8
Component: engine
2013-04-09 08:18:36 -07:00
91c3817cdd Fix run disconnect behavious in tty mode + add unit test to enforce it
Upstream-commit: 99b5bec0692ea9ec8a397926df9dd545fb264ac9
Component: engine
2013-04-05 19:02:35 -07:00
6fa32df65e Update the tests according to the "optional raw mode" changes
Upstream-commit: e9a68801ba4c47581d7741989700a35521c389c4
Component: engine
2013-04-08 16:07:12 -07:00
ab2b1cf277 Reenable CmdRunAttachStdin and CmdRunHostname now using the DockConn interface
Upstream-commit: bdf05d8368f2d158ba051dbefeb07bc717a93774
Component: engine
2013-04-08 15:58:09 -07:00
7e2a370b5c Edit the tests for them to use the new command API. Disable TestRunHostname and TestAttachStdin.
Upstream-commit: 80f6b4587b6ebaed30747d17b69af4d11d6389ab
Component: engine
2013-04-08 15:58:09 -07:00
20aa05fbaa Add a stdincloser to container.Attach in order to close the client connection when needed
Upstream-commit: 6882c78ce447b468262b53aef2ac0577151ea98c
Component: engine
2013-04-02 12:18:20 -07:00
44017879ad Add a TestRunExit, make sure cmdRun returns after process dies
Upstream-commit: 43484e8b502be1dbf2e587524ae8ef036181b186
Component: engine
2013-04-02 09:22:30 -07:00
36ddc7dcc6 Merged attachStdin
Upstream-commit: 15c3096e8942ac31eb5611b41d08fcc31061be65
Component: engine
2013-04-02 20:46:32 -07:00
57e119bf13 TestRunHostname checks that 'docker run -h' correctly sets a custom hostname
Upstream-commit: b1fa26bb76501c53f68de466538da1eece57d94d
Component: engine
2013-04-02 19:00:05 -07:00
506ecddd21 Add test for attaching only stdin at run with 'docker run -i -a=stdin'
Upstream-commit: c77063afcd00f97c6922c41e509090dd4f8c2b95
Component: engine
2013-04-02 18:05:19 -07:00
5597e432af 'docker run' in attached mode no longer waits for the process to exit. Take this into account in the tests.
Upstream-commit: 2db358146f8bc0f63d840c8e0227bcbe7a8e3063
Component: engine
2013-04-02 11:07:49 -07:00
8a9e7f42f0 When simulating disconnects in the tests, make sure that the command returns - but don't check for a specific return value
Upstream-commit: 1cc1cb099ed8fb0e4fc47debe38a33d17e211a65
Component: engine
2013-04-02 11:06:42 -07:00
2e91f0bb47 Add unit test for CmdAttach
Upstream-commit: ad1e8a9b0f0e57327d71827c1161c21f48910e42
Component: engine
2013-03-31 21:48:18 -07:00
735e80ee9b Change the commands unit tests in order to reflect the proper behaviour of CmdRun
Upstream-commit: cfeed391d76105e4131a021d2005966d01eb4e68
Component: engine
2013-03-31 20:52:35 -07:00
bd2e319579 Temporarily disable a broken test (waiting for @creack to fix it), and silence a warning which pollutes unit tests but is complicated to fix
Upstream-commit: a52a28b60946463e8208b8cd5d737ba79f23a8b8
Component: engine
2013-03-31 22:05:14 -07:00
80191382f5 Add unit test for the #125 scenario. Reattach after client disconnect on stdin allocated container
Upstream-commit: 8cceafc8348f8e9de71b09274458848cd8e8de6d
Component: engine
2013-03-30 06:55:47 -07:00