5b60c778bd
Merge pull request #12837 from mavenugo/integ
...
A few more Integration tests to test Networking related daemon flags
Upstream-commit: 1eb4e96f2125764a38114c7cdcdf2b336b6173f7
Component: engine
2015-04-30 11:12:43 -04:00
9d5c96c875
Moved explicit cleanups into defered action
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 1c073ec1766e0f3cfe28d8f9c2e9a9a37154ece6
Component: engine
2015-04-29 11:41:13 -07:00
0976611d84
Integration Tests for --icc=false & container Linking using --expose
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: dd0666e64f17329355c77aae1a2ac0fe2fe43402
Component: engine
2015-04-29 10:16:31 -07:00
febe54901d
Integration tests for --ip daemon option
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: ba11929ebdf4cf7798cddc98c4dcfc000b154264
Component: engine
2015-04-29 09:55:49 -07:00
73bcda784f
Integration tests for --fixed-cidr daemon config
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 0e254411b1fe0b5024d4a8e5ade7ce12f4545d8e
Component: engine
2015-04-29 09:55:42 -07:00
e04b055914
Integration tests for --bip daemon flag
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 9c325c3f54b24621b76dee530a855b37cb22abcc
Component: engine
2015-04-29 09:55:34 -07:00
2a71cc5aaf
Integration tests for --bridge daemon flag
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: f3f5ff9d837eecb97eeeb878f0bd416b6ab57cf2
Component: engine
2015-04-29 09:55:25 -07:00
6982f607b4
c.Fatal won't fail and exit test inside a goroutine, errors should be handled outside with a channel
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 4203230cbbf46238e38099c9073bdcad5f69a63f
Component: engine
2015-04-29 17:02:22 +02:00
d550f6b9ae
Merge pull request #12789 from LK4D4/daemon_suite
...
Implement daemon suite for integration-cli
Upstream-commit: f80300e9cf150f9770c8ffce94a4d57acac6aadc
Component: engine
2015-04-28 15:30:36 -07:00
f4e54f0df1
Merge pull request #12820 from runcom/yet-another-sockRequest-refactor
...
Expose whole Response struct in sockRequestRaw
Upstream-commit: cfa3a080c646878414585a8931416538a703a3e0
Component: engine
2015-04-28 13:26:30 -07:00
bc3d7f1531
add support for exclusion rules in dockerignore
...
Signed-off-by: Dave Goodchild <buddhamagnet@gmail.com >
Upstream-commit: 6fd8e485c85c4f8ca62578d0840bdeddc4cba151
Component: engine
2015-04-28 18:56:45 +01:00
5f37bbe0bd
Implement daemon suite for integration-cli
...
For creating and stopping test daemons automatically.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 57464c32b99b36a2963fb37da86b9870c9a56145
Component: engine
2015-04-27 15:48:29 -07:00
0b5b481a6d
Merge pull request #12828 from tdmackey/trivial-spelling
...
trivial: typo cleanup
Upstream-commit: 0153edcda1527cd19f5952046b51c4e8358d01ed
Component: engine
2015-04-27 17:05:46 -04:00
72bf48b9df
Merge pull request #12794 from runcom/small-cleaning
...
Small if err cleaning
Upstream-commit: 62a85fe2026f3f5114f19638baf53d19a51d39c0
Component: engine
2015-04-27 17:02:27 -04:00
ae74d9f34f
trivial: typo cleanup
...
Signed-off-by: David Mackey <tdmackey@booleanhaiku.com >
Upstream-commit: 3941623fbc3fa724d61f53121513ffd87d03b61c
Component: engine
2015-04-27 13:35:08 -07:00
954f940156
Small if err cleaning
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 844538142d95c1b7dda1bb2903179510105fe9b5
Component: engine
2015-04-27 21:50:33 +02:00
6143f43f8d
Parallelize TestEventsLimit
...
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com >
Upstream-commit: 40779b28bb04dca6178ba17eaeb93265e2974ee1
Component: engine
2015-04-27 21:14:00 +02:00
d1facd32fc
Expose whole Response struct in sockRequestRaw
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: bb1c576eb3024f7fb4242d76dc835b7c4dd85c5b
Component: engine
2015-04-27 18:49:00 +02:00
563a5f77d4
Merge pull request #12809 from runcom/remove-cfatal-goroutine-attachws
...
Remove c.Fatal from goroutine in TestGetContainersAttachWebsocket
Upstream-commit: 5305e675b554a7451433bbd64bca4d6f3070a45b
Component: engine
2015-04-27 08:59:47 -07:00
4342c93053
Merge pull request #12799 from aidanhs/aphs-fix-net-container-deadlock
...
Prevent deadlock on --net=container:<self>
Upstream-commit: 02d73d910fa56e89a2d999b95b0fa0738332fed7
Component: engine
2015-04-27 08:46:22 -07:00
5e258c2907
Merge pull request #12783 from duglin/Issue12763-LinkedEnvs
...
A fix for = in env values in linked containers
Upstream-commit: 8dc07af52f1822a1d337f005c6c4292611d3313d
Component: engine
2015-04-27 10:50:14 -04:00
55c6259a4a
Merge pull request #12616 from cpuguy83/remove_uneeded_sleeps
...
remove some uneeded sleeps in tests
Upstream-commit: 325c0404c84db11630cfcc24ac93cb82763de511
Component: engine
2015-04-27 10:42:40 -04:00
bb3c396980
remove some uneeded sleeps in tests
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 9e0ffae864d6679084e84e2e27cbb9d350f6dbae
Component: engine
2015-04-27 10:14:29 -04:00
270e43ec62
Prevent deadlock on attempt to use own net
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
Upstream-commit: f30d1c1835618eadea5d0a68d1301dffd9f09b22
Component: engine
2015-04-27 14:57:37 +01:00
e570165119
Remove c.Fatal from goroutine in TestGetContainersAttachWebsocket
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: c7b2632dc8550c8aa80ebd8b229809ac37fa53e1
Component: engine
2015-04-27 13:56:55 +02:00
13d6b715bf
Merge pull request #12728 from HuKeping/addtest
...
Add test for REST API container rename
Upstream-commit: fefb8367663e5f97f8c85418691b10c6e9356134
Component: engine
2015-04-25 17:01:10 -07:00
478eada080
Fix race condition in API commit test
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: cd4f507b42e800d148b211ca2c780d01192a9041
Component: engine
2015-04-25 05:46:47 -07:00
1e118310a9
A fix for = in env values in linked containers
...
Closes : #12763
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: bc149be69c5ad22f82269427dd4b4aed9df4fa40
Component: engine
2015-04-25 04:42:43 -07:00
e384b42fa8
Add test for REST API container rename
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 8f752ffeafd2f8c08035a5e39220fe17c9309fd7
Component: engine
2015-04-25 17:19:57 +08:00
8d345fadf2
Merge pull request #12765 from LK4D4/registry_suite
...
Implement DockerRegistrySuite in integration-cli
Upstream-commit: 6e9a6f53963137e21ba790ab79501a7cd8ed5b96
Component: engine
2015-04-24 23:05:29 -04:00
a2a6303a84
Implement DockerRegistrySuite in integration-cli
...
To avoid manually creating and destroying registrys in tests.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: f696b1071a296bee1f4ac7cafa807ce337fb9f2c
Component: engine
2015-04-24 14:17:00 -07:00
54dc746ae6
Not protect dangling images for integration-cli
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 9bea123bddb9d2ce8b2aa517c2a2a4b269ed39bc
Component: engine
2015-04-24 13:16:51 -07:00
9fc945a9c1
Merge pull request #12755 from LK4D4/use_f_for_remove
...
Use -f for rm instead of kill before
Upstream-commit: b76bbae4138e7b66022092631d6afb7cfc88a486
Component: engine
2015-04-24 15:34:38 -04:00
785df704ce
Use -f for rm instead of kill before
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 887ad57cfa46df542001a1bb4e3ab052ce5f5ed9
Component: engine
2015-04-24 11:55:54 -07:00
f6e14ef42d
Merge pull request #12754 from LK4D4/carry_12707
...
fix runtime issue for TestEventsFilterContainer
Upstream-commit: 03719be8302d904893b97c03a3bf94f50a376876
Component: engine
2015-04-24 14:36:58 -04:00
3acd724e10
fix runtime issue for TestEventsFilterContainer
...
Signed-off-by: Daniel Antlinger <d.antlinger@gmx.at >
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 07795c3f5db3aa8ff592b0606ab76d32db4c6d25
Component: engine
2015-04-24 10:48:40 -07:00
c48fdf0abd
Implement teardown removeAllImages
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: a9688cdca5577d6db65d76f38bcbe4c1e6f5994f
Component: engine
2015-04-24 10:37:21 -07:00
734115a06e
Add cpu cfs quota to build
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 5f4fb8be006c0ffeff2671e5752111e543e07d9f
Component: engine
2015-04-24 08:54:08 +08:00
d0722fddff
Merge pull request #12569 from kostickm/12449-check-statusCode
...
Fixing statusCode checks for sockRequest
Upstream-commit: 9d94d91ea7c9a8c5494ce6f208d96f27f6220c94
Component: engine
2015-04-23 17:13:06 -07:00
558ffb7c99
Merge pull request #12659 from dqminh/exec-interactive-hang
...
reuse same code for setting pipes in run/exec
Upstream-commit: c26695cf8a220bf33ba0efe729e2ab4b05089ea8
Component: engine
2015-04-23 16:37:49 -07:00
74db1507f9
Fixing statusCode checks for sockRequest
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
Upstream-commit: c7845e27ee2b0462b01d043caeb771f21d5e4ac7
Component: engine
2015-04-23 15:35:56 -07:00
0bd2f00743
reuse same code for setting pipes in run/exec
...
This also moves `exec -i` test to _unix_test.go because it seems to need a
pty to reliably reproduce the behavior.
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com >
Upstream-commit: ade8146aa82baa88bacdcf2d9c2559e8f47d71e4
Component: engine
2015-04-23 21:54:21 +00:00
b2b2217c8a
Merge pull request #12709 from vdemeester/12705-remove-defer-deleteContainer
...
delete "defer deleteContainer" on tests
Upstream-commit: 96ef1bd29c39404ba7bb668faecd691ed9f6c53d
Component: engine
2015-04-23 14:34:23 -07:00
0b2612ded7
Merge pull request #12509 from runcom/12499-racy-TestEventsImageImport
...
Fix TestEventsImageImport racy
Upstream-commit: b31d154294ed7a621de1b620f051cf9547c09385
Component: engine
2015-04-23 13:28:43 -07:00
1fa837ad6f
delete "defer deleteContainer" on tests
...
Since docker test suite is now using gocheck, ``defer
deleteContainer(…)`` is not needed anymore.
Fixes #12705
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: c5ef2901d8190b687e847ab17d306dae5af37b42
Component: engine
2015-04-23 22:27:46 +02:00
c2fd04b393
Merge pull request #12575 from brahmaroutu/integration_test7_12255
...
Move https tests as unit tests under client
Upstream-commit: 59ae92d55c4b074db31698c1bc05e2114dc3106c
Component: engine
2015-04-23 13:17:54 -07:00
88eea81abe
Merge pull request #12655 from jlhawn/fix_12281
...
Validate repo name before image pull
Upstream-commit: 68fc79f5924bc76111422eec5b7713a586febd96
Component: engine
2015-04-23 13:12:12 -07:00
1c64e12359
Merge pull request #11839 from brahmaroutu/template_11641
...
Allow go template to work properly with inspect …
Upstream-commit: 799cf056e7f672f987b0b44adf0868ce56caab8b
Component: engine
2015-04-23 13:07:40 -07:00
0426fea7df
Merge pull request #12693 from runcom/fix-TestRenameStoppedContainer-race
...
Fix TestRenameStoppedContainer race
Upstream-commit: 036ade6c0548d85941e8c26306ac7c27105448ea
Component: engine
2015-04-23 13:04:36 -07:00
8cb2465efc
Validate repo name before image pull
...
Checks for reserved 'scratch' image name.
fixes #12281
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 18f46883851e47387ec2bd116940cdae97ba3c8d
Component: engine
2015-04-23 11:44:46 -07:00
