3cd7f4b75d
Merge pull request #1195 from dotcloud/tests-cleanup
...
* Hack: tests cleanup
Upstream-commit: 2cbf2200ac7ba7e3ae79ed8a85a3cfcdf1026efd
Component: engine
2013-07-12 14:51:59 -07:00
ac70e7d7db
fix tests regarding the new test image
...
Upstream-commit: a8a6848ce0c3c54d00cfcd85727546e54a4dcf7e
Component: engine
2013-07-12 11:54:53 +00:00
c22c23bfc2
Merge branch 'master' into list_container_processes-feature
...
Upstream-commit: 9232d1ef62b6be8979052599625af8a71227662c
Component: engine
2013-07-12 11:47:27 +00:00
6c9e32ae32
Simplify unit tests code with mkRuntime()
...
Upstream-commit: 6bdb6f226b13d5fdd47f3665c9fb753207bf473b
Component: engine
2013-07-11 17:59:25 -07:00
b91cb2c854
Don't leave broken, commented out tests lying around.
...
Upstream-commit: 2ac11419806ce39c57d5caf6b41a66e5ddf45bc8
Component: engine
2013-07-11 17:58:45 -07:00
32424f76bf
Remove all network dependencies from the test suite
...
Upstream-commit: e43ef364cb99585d3285f51f7ab308f8a77fe09e
Component: engine
2013-07-08 15:23:04 -07:00
5824d26e27
Fix error in rmi when conflict
...
Upstream-commit: dea29e7c999b7ef76a816867a2cb75c2da658fa2
Component: engine
2013-07-05 16:58:39 +00:00
1c71d0a65e
Implement several golint suggestions, including:
...
* Removing type declarations where they're inferred
* Changing Url -> URL, Id -> ID in names
* Fixing snake-case names
Upstream-commit: 19121c16d9514b391ce8f15aeff3c47c1ea5a841
Component: engine
2013-07-03 14:36:04 -07:00
03f2d7e4a6
Typo correction: Excepted -> Expected'
...
Upstream-commit: dd1b9e38e95dc719a7aeadbdee67a5f3a4873dec
Component: engine
2013-07-03 14:35:18 -07:00
40f3d8b8b8
More unit test fixes
...
- Fix TestGetImagesJSON when there is more than one image in the test
repository;
- Remove an hardcoded constant use in TestGetImagesByName;
- Wait in a loop in TestKillDifferentUser;
- Use env instead of /usr/bin/env in TestEnv;
- Create a daemon user in contrib/mkimage-unittest.sh.
Upstream-commit: f03c1b8eeb367beefa91046e2fa114af9a816aaa
Component: engine
2013-07-01 17:24:21 -07:00
18ad40a645
Fix TestGetInfo when there is more than one image in the test repository
...
See also #1089 , #1072 .
Upstream-commit: 6dacbb451f1134ca1c215bd86b74006934468922
Component: engine
2013-07-01 15:06:08 -07:00
4fd8f2839f
Fix unit tests when there is more than one tag within the test image
...
Upstream-commit: b6f288a1cedbbff7dd24362f2fc2bce0040bfe10
Component: engine
2013-07-01 11:45:45 -07:00
ab729772a8
change to top
...
Upstream-commit: 11e28842ac74ad0b706d24ec639952f78e9a147c
Component: engine
2013-07-01 15:19:42 +00:00
074020ccdd
Add test
...
Upstream-commit: 648c4f198b7215a35f31deb9cdf4d370049ef4b2
Component: engine
2013-06-28 16:27:00 +00:00
ad4f82e6d2
Merge pull request #1032 from andrewsmedina/govet
...
following the 'go vet' suggestions for the docker package.
Upstream-commit: a11fc9f067d898e3dd6a43e9841e2ea85842af2b
Component: engine
2013-06-28 05:27:53 -07:00
e593de79dc
following the 'go vet' suggestions.
...
Upstream-commit: 3d5633a0a0eb98bbd833e760279720a15ced8b58
Component: engine
2013-06-27 01:33:55 -03:00
a223caa9e6
+ Runtime: mount volumes from a host directory with 'docker run -b'
...
Upstream-commit: 4fdf11b2e62bf7d785a958afd4fc5b8cfc32f621
Component: engine
2013-06-26 15:07:31 -07:00
63220aff61
use strconv.ParseBool in getBoolParam
...
Upstream-commit: da199846d2813467ab8bae629336f3989f285ce9
Component: engine
2013-06-20 14:34:58 +00:00
4147a474f5
rebase master
...
Upstream-commit: c46382ba29c82eedab2b1601da5a81a047f078c2
Component: engine
2013-06-13 17:58:06 +00:00
9efccead8d
Merge branch '610-improve_rmi-feature'
...
* Runtime: improved image removal to garbage-collect unreferenced parents
- Runtime: fixed image removal to cleanly remove tags and repositories
Upstream-commit: 5ecfe13be9f8f47e27e5134e60d14d195a1baeaa
Component: engine
2013-06-12 20:30:07 -07:00
0a236e493a
bump to master
...
Upstream-commit: f2383151cbcc727450f87cb80a392e2858d4b0ca
Component: engine
2013-06-12 17:39:32 +00:00
604adb2ef8
* Remote Api: Add flag to enable cross domain requests
...
Upstream-commit: 20bf0e00e81fdff34c821fd880a92e822fb5ba15
Component: engine
2013-06-11 10:12:36 +00:00
2d226181f9
Add explicit status response to OPTIONS handler
...
Write the http.StatusOK header in the OPTIONS
handler and update the unit tests to refer to the
response code using the const from the http package.
Upstream-commit: ac599d652846f6456366b8028b2c38da0565d8b1
Component: engine
2013-06-10 14:44:10 -09:00
c612f1e4ee
Add Cors and OPTIONS route unit tests
...
Move creating the router and populating the
routes to a separate function outside of
ListenAndServe to allow unit tests to make
assertions on the configured routes and handler
funcs.
Upstream-commit: 0a28628c02d486512dc7e62eb54ccfd27eaa0a27
Component: engine
2013-06-10 13:02:40 -09:00
2bcee3140c
rebump
...
Upstream-commit: 66d9a733622ba9a8f9671bac7d33776981672940
Component: engine
2013-06-10 21:05:54 +00:00
83d9b24a84
bump to master
...
Upstream-commit: c906239220c7ba06b8615f001fab2f42fb063aeb
Component: engine
2013-06-05 10:23:45 +00:00
4747c5b99f
linted names
...
Upstream-commit: fd224ee590dc9f003f6507b529a9f47cceb02c44
Component: engine
2013-06-04 18:00:22 +00:00
19f2b9dadf
Add flag to enable cross domain requests in Api
...
Add the -api-enable-cors flag when running docker
in daemon mode to allow CORS requests to be made to
the Remote Api. The default value is false for this
flag to not allow cross origin request to be made.
Also added a handler for OPTIONS requests the standard
for cross domain requests is to initially make an
OPTIONS request to the api.
Upstream-commit: 6d5bdff3942ce5e030b2cbd1510f418de25a1a53
Component: engine
2013-06-03 21:39:00 -04:00
db19220e91
removed auth in pull
...
Upstream-commit: 7e59b83053bceb683a198786290bc61da81581be
Component: engine
2013-06-03 17:51:52 +00:00
7c20a7a163
Update test to reflect new ApiInfo struct
...
Upstream-commit: 8243f2510e0ff0af8df18bf0febab819529106d4
Component: engine
2013-06-03 06:44:00 -07:00
a5e3ae8f4a
bump master
...
Upstream-commit: ca902b6be4cb04f3f885af750609f74effd75d3d
Component: engine
2013-06-03 12:37:51 +00:00
799ca20158
added proper returns type, move the auto-prune in v1.1 api
...
Upstream-commit: 9060b5c2f52d29dec1920eb89ee0d48341540e3b
Component: engine
2013-05-31 14:37:02 +00:00
e8420b7464
move auth to the client WIP
...
Upstream-commit: 49e656839fb3d846dc65fec544f2984a9c72a2cf
Component: engine
2013-05-30 15:39:43 +00:00
694903e92c
removed the -f
...
Upstream-commit: 2eb4e2a0b86f8d244f0b6cbeb0422f8499d834f8
Component: engine
2013-05-29 16:31:47 +00:00
9c8c6a4ab3
merge master
...
Upstream-commit: ea9095c5626077c198e3fdbb480d6205851f027b
Component: engine
2013-05-29 11:49:39 +00:00
f9738020b7
Update tests with new cookies for registry
...
Upstream-commit: b76d6120ac66a853d177f7e53318ab1ee75dca92
Component: engine
2013-05-28 17:35:10 -07:00
a20c31a039
rename containers/ps to containers/json
...
Upstream-commit: 4f9443927e8bc8a724b43afae6cf7a183cd9acd0
Component: engine
2013-05-28 16:08:05 +00:00
0575fdb313
Fix issue within auth test
...
Upstream-commit: 0146f65a448d2d42271300f1477ea9fa378d6360
Component: engine
2013-05-24 11:31:11 -07:00
41d3215b3f
api versionning
...
Upstream-commit: faae7220c019882a2160aeea6bebc46c15d702be
Component: engine
2013-05-22 15:29:54 +00:00
3c7eed1673
Remove no longer needed tests
...
Upstream-commit: 3f22842542a17d41f72b4943d19d244f2296b418
Component: engine
2013-05-20 17:54:54 -07:00
54c4bf20a4
add check to see if the image isn't parent of another and add -f to force
...
Upstream-commit: 67b20f2c8cc8d85ab09de95970e4d28c80f0aeb6
Component: engine
2013-05-20 18:31:45 +00:00
67c2cf9c02
Merge remove-hijack
...
Upstream-commit: 372d81c32593da877685851b9cb85c688c59b998
Component: engine
2013-05-20 11:07:34 -07:00
5a4d699310
Merge branch 'master' into 610-improve_rmi-feature
...
Upstream-commit: 6102552d61eb9059b9d958f80a6645d5328ca063
Component: engine
2013-05-18 14:29:37 +00:00
6a0c3bd9ab
fixed insert
...
Upstream-commit: 3703a654056b4af7acbb09dc4d02bd184c7307c5
Component: engine
2013-05-17 17:09:09 +00:00
e571a0fa05
Update tests to reflect new behavior
...
Upstream-commit: 6145812444fb3eda2cc362795ed0b1addb8f4847
Component: engine
2013-05-16 14:33:10 -07:00
d091930918
Merge branch 'master' into 610-improve_rmi-feature
...
Upstream-commit: 2ae8aaa10684da3b8ee3c0de5f49b57f21286978
Component: engine
2013-05-16 11:15:16 -07:00
65f5bcf0ce
1 or 0 -> 1/True/true or 0/False/false
...
Upstream-commit: 0c5443571dd1c081d57b6b2840c30d86bef0e82c
Component: engine
2013-05-16 13:45:29 +00:00
4f2b2696d3
Update tests to reflect new AuthConfig
...
Upstream-commit: 10e19e4b97dba71b603d652d5a046ef792d9d704
Component: engine
2013-05-15 17:31:11 -07:00
2d208e56c7
Move authConfig from runtime to registry
...
Upstream-commit: 95dd6d31a4c11618836f9a55fc3dbbde48450b09
Component: engine
2013-05-15 17:17:33 -07:00
9add3a9664
improve rmi
...
Upstream-commit: c80448c4d1836dd0e23953fa923f7a270d32df05
Component: engine
2013-05-15 13:51:50 +00:00
