toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,728 Commits 3 Branches 295 Tags
8aabb3651f7dbb9b8da11bd511458da67507bf76
Commit Graph
4715 Commits
Author SHA1 Message Date
Brian Goff f3865d2e92 Cleanup events filter by container test 
This also seemed to be checking the ordering of the events, which
doesn't seem like something we sould be interested in this particular
test.

Added check to make sure the filtered events have the expected ID's.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 7e70998bb80d47e3f3a363fb49feaeaf50d64cbc
Component: engine
 2015-04-09 09:47:58 -04:00
Ahmet Alp Balkan 73ef4f0ecf cli_info_test: Check all required fields 
`TestInfoEnsureSucceeds` is supposed to check existence of all
expected fields that are going to be shown in `docker info` command.

If this list was complete, it could have helped catching the missing
`"Logging Driver:"` regression.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 4c69d0dd8ade90b6602147b8dfb8c1f4c267d3bc
Component: engine
 2015-04-09 04:01:39 -07:00
Doug Davis 8bd8b0185d Remove Job from docker images 
Also removes engine.Table

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: d045b9776b5dc16e12b3d7c7558a24cdc5d1aba7
Component: engine
 2015-04-08 19:33:01 -07:00
Jessica Frazelle 0d1c1d0efa cleanup/fix integration-cli for overlay in overlay 
Signed-off-by: Jessica Frazelle <jess@docker.com>
Upstream-commit: 255b84444a86201995d8f688d71b83822f146c3e
Component: engine
 2015-04-08 16:59:36 -07:00
Alexander Morozov c65fa515f2 Merge pull request #12066 from LK4D4/split_events 
Remove engine usage from events
Upstream-commit: 3ebfc99d1057d841c1cdd4f19e80fceea5ab380e
Component: engine
 2015-04-08 08:29:24 -07:00
Yuan Sun 4c243c6e3e duplicate logDone in TestRenameRunningContainer and TestRenameCheckNames 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: cc30282e94546048a3957bdf360f99d4626e7d7c
Component: engine
 2015-04-08 13:33:05 +08:00
Alexander Morozov 2f18e59567 Test case for network mode chain container -> container -> host 
Issue #12130

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ce69dafe4d0424ddb5df53d9aee7728f0734cce7
Component: engine
 2015-04-07 15:20:42 -07:00
Alexander Morozov 7753b7bbca Fix fail message in TestEventsImageImport 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 8fd2b52146b443dd464df5199d79c69047c81eea
Component: engine
 2015-04-07 14:22:43 -07:00
Megan Kostick 15349ce580 Fixing fail message in TestRunDeviceDirectory 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
Upstream-commit: 05dcf261992ee2fe639977a9e063051cadaf1c50
Component: engine
 2015-04-07 13:14:47 -07:00
Alexandr Morozov 5c284b836c Decrease timeouts in TestEventsStreaming 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: e45bf8d2e9b43a4f5c5ed844b333733f95ccbafb
Component: engine
 2015-04-06 13:40:56 -07:00
Alexandr Morozov b38d23a637 Pass right timestamp instead of crap from string(int64) 
Problem is that --since can consume anything not near looking as
timestamp.

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 5fa3a6f2482521d5731c43e076926f2f5318aa94
Component: engine
 2015-04-06 13:39:02 -07:00
Alexander Morozov ec38205886 Merge pull request #11324 from sunyuan3/TestDaemonwithwrongkey 
add TestDaemonwithwrongkey test case
Upstream-commit: f5657249a0120e48975fbe986dde78b7975dac17
Component: engine
 2015-04-06 11:35:05 -07:00
Alexander Morozov 92a7113498 Merge pull request #12090 from runcom/12079-events-streaming-tests 
Test events streaming
Upstream-commit: a0fc0343b7e8ac1a363ab856b87d6a9524d425cf
Component: engine
 2015-04-06 11:23:47 -07:00
Arnaud Porterie 142a5765d0 Merge pull request #11978 from x1022as/info-show-loggingdriver 
docker info show logging driver info
Upstream-commit: ed8d4028519460017e5a8641882bd9a2e68ceb29
Component: engine
 2015-04-06 11:11:31 -07:00
Antonio Murdaca 286897aa48 Test events streaming, fixes #12079 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: d1c4439b5aa9bfc6767372b64e3f3a1fdb7f7b65
Component: engine
 2015-04-06 19:00:17 +02:00
Brian Goff 45fb864556 Merge pull request #12112 from kostickm/12042-fix-logDone-format 
Fixes logDone format
Upstream-commit: d3fa57e051cced38cdd65034077fe5b080999da7
Component: engine
 2015-04-06 12:34:38 -04:00
Megan Kostick f18fe75c72 Closes #12042 - fix logDone format 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
Upstream-commit: d6ada45f45c6743ec0ab3f049a0742278634a22a
Component: engine
 2015-04-06 08:54:35 -07:00
Arnaud Porterie a714c4cf33 Merge pull request #12107 from cpuguy83/remove_striptrailingchars 
Remove `stripTrailingCharacters` from tests
Upstream-commit: b9d2ede4d4dc67b97abd0254a9e431aa9c89b932
Component: engine
 2015-04-06 08:46:08 -07:00
Eohyung Lee 9d932cfc62 Minor spelling fix 
Signed-off-by: Eohyung Lee <liquidnuker@gmail.com>
Upstream-commit: 7986c37996aa7321eaf3e86dd844a3e5c36c8c68
Component: engine
 2015-04-06 23:27:53 +09:00
Brian Goff ab9a366f0e Remove stripTrailingCharacters from tests 
This was just an alias to `strings.TrimSpace`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 475c65319b4663d630711519e18d0b134c42c7f1
Component: engine
 2015-04-06 09:21:18 -04:00
Yuan Sun 5cd5d0bf57 add TestDaemonwithwrongkey test case 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: ef13dcd4dcbc613a9ea1e4a8af3d0220004ec0ab
Component: engine
 2015-04-06 08:57:47 +08:00
Jessie Frazelle bd5aac3934 Merge pull request #12037 from twhiteman/master 
integration-cli: in TestPsListContainersSize, check for no containers
Upstream-commit: 3683498d6fe233f9f68fb5a6186158293b450049
Component: engine
 2015-04-03 18:52:26 +00:00
Yuan Sun 8c6dabaae6 If docker search with --starts=${negative number}, it would show the warning. 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: 87e0e4eb431693cf1eeed777c6c4648ae0a94395
Component: engine
 2015-04-03 08:55:34 +08:00
Tibor Vass 7156a27c06 Merge pull request #11995 from icecrime/test_daemon_stop 
Properly stop test daemon in integration-cli
Upstream-commit: f92e88b7e0bb782badbd45d95a4013c7f1ddbb19
Component: engine
 2015-04-02 20:27:20 -04:00
Arnaud Porterie efa6b62065 Merge pull request #11571 from noironetworks/11555-Docker-since-beginning-of-unix-time-doesnt-work 
Fixes docker events since beginning of unix time
Upstream-commit: 9c505c906d318df7b5e8652c37e4df06b4f30d56
Component: engine
 2015-04-02 15:03:04 -07:00
Todd Whiteman c1f9e7351f integration-cli: add check for TestPsListContainersSize when no containers are returned 
* when no containers are returned, go test would then aborts with:
  panic: runtime error: index out of range

Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com>
Upstream-commit: 3e51a8147510fb59d6206fe7310feaebc2d69fbc
Component: engine
 2015-04-02 14:45:52 -07:00
Tibor Vass 7a161db875 Merge pull request #12012 from jfrazelle/fix-race-volumes-from-api 
TestVolumesFromHasPriority fix race
Upstream-commit: c88b2c422ff55099f8dae2a39566698c42b3d354
Component: engine
 2015-04-02 16:01:09 -04:00
Tibor Vass 5a322b178c Merge pull request #12011 from jfrazelle/fix-lxc-device-test 
fix device test on lxc...
Upstream-commit: 42c78550142321f4b5109118f3d2d2b8c529e83c
Component: engine
 2015-04-02 16:00:39 -04:00
Arnaud Porterie c2b08878f0 Properly stop test daemon in integration-cli 
Always stop the test daemon in an attempt to fix race conditions in
subsequent tests.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 02c2308e39930677a7f4bb7f4215331a4d87566f
Component: engine
 2015-04-02 08:53:31 -07:00
unclejack 1031605b86 integration-cli: make TestPsGroupPortRange fast 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: cfa8aaf16f1f3b777851555afc83a1112c4f8879
Component: engine
 2015-04-02 18:26:29 +03:00
Tibor Vass 088a52cbda Merge pull request #11149 from duglin/8667-AdvancedVars 
Add support for advanced ${} uses
Upstream-commit: 9707286a5cecde3eee3c83e3c2da65df8e59d04e
Component: engine
 2015-04-02 08:25:49 -04:00
Jessica Frazelle 3c9c482afa TestVolumesFromHasPriority fix race 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
Upstream-commit: c447fd339a9293ea528ba0c8f4154cf1f953186c
Component: engine
 2015-04-01 18:06:28 -07:00
Jessica Frazelle 51cc2549fc fix device test on lxc, on lxc in contianers there are no dirs with devices in /dev, but this works outside a container... 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
Upstream-commit: f472c7236f7f7ea069b2997391569e5ec60981ab
Component: engine
 2015-04-01 17:47:36 -07:00
Jessica Frazelle c8180f954e Mounting a directory of devices like /dev/snd should mount all child devices. 
I have seen a lot of people try to do this and reach out to me on how to mount
/dev/snd because it is returning "not a device node". The docs imply you can
_just_ mount /dev/snd and that is not the case. This fixes that. It also allows
for coolness if you want to mount say /dev/usb.

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 664004ed0c6c99369720a00f5673f1e106d9496d
Component: engine
 2015-04-01 15:57:41 -07:00
André Martins d25b9e78b6 Fixes docker events since beginning of unix time 
Fixes issue #11555
Applied a workaround to check if since and until flags are valid or not.

Signed-off-by: André Martins <martins@noironetworks.com>
Upstream-commit: 8f7ac20bacfa6964ea830bfc6dfd4fc8c66bc9c3
Component: engine
 2015-04-01 18:14:59 +01:00
Alexander Morozov d47bbc4765 Merge pull request #11949 from MabinGo/fix_randombug_in_eventtest 
Fix random error in cli events test
Upstream-commit: 624de8a9cd5652d0d685596d490997f7f2e83536
Component: engine
 2015-04-01 09:26:48 -07:00
Doug Davis 3e035d76a2 Add support for more advanced ${xxx:...} syntax 
Just ${xxx:+...} and ${xxx:-...} for now

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 39908fc6d9a13f0d44196475ba938b6cc352fdbe
Component: engine
 2015-04-01 08:11:15 -07:00
Deng Guangxing 5a7a97d2b6 docker info show logging driver info 
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: f5a401d3fe2e8c74e6b6a38e9073b843b16fae68
Component: engine
 2015-04-01 16:05:14 +08:00
Mabin 562a382719 Fix random bug in cli events test 
Signed-off-by: Mabin <bin.ma@huawei.com>
Upstream-commit: e15c3e36cc5559c3ec17179d8740b2841709daf5
Component: engine
 2015-04-01 11:00:01 +08:00
Doug Davis e8ab23fa21 Increase timeout on TestRunOOMExitCode test 
I can never get it to work for me when its just 3 seconds.
With this change it generates the OOM message around 17 seconds, but
I increased the timeout to 30 for people with slower machines

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 8d1455d88b66011713da67098dc3464b897af9cd
Component: engine
 2015-03-31 16:57:43 -07:00
Jessie Frazelle 1541e9c937 Merge pull request #11934 from cpuguy83/fix_volume_symlink_check 
Fix volume symlink check
Upstream-commit: 749a117267c4c0f74b0162af9ed42c3307737dde
Component: engine
 2015-03-31 13:56:23 -07:00
Jessie Frazelle d0e4d6404c Merge pull request #11473 from pradeepchhetri/docker-wait-cli-integration-test 
Added basic integration tests for docker wait command
Upstream-commit: a381a1bb0385c9f499025f632413bf6a9abc3f43
Component: engine
 2015-03-31 13:23:23 -07:00
Brian Goff 419d6ae6f9 Use getResourcePath instead 
Also cleans up tests to not shell out for file creation.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 63708dca8a633d68f9342eebd4f7a616e8c48234
Component: engine
 2015-03-31 15:10:30 -04:00
Michael Crosby 0fa6cf44f7 Merge pull request #11896 from vdemeester/9998-cp 
Docker cp handles resolv.conf, hostname & hosts, fixes #9998
Upstream-commit: b6d6ffa1dd7172ba6e5f2eb8adf1626a6ee47a01
Component: engine
 2015-03-30 13:15:00 -07:00
Yuan Sun 6052094333 Verify MaximumRetryCount=0 if the restart policy is always. 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: f5310f403da573e28477e142e5f70efe0045b323
Component: engine
 2015-03-30 09:08:33 +08:00
Vincent Demeester 82aa49d3e7 Docker cp handles resolv.conf, hostname & hosts, fixes #9998 
Add a integration test TestCpSpecialFiles

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 8bc330d8632ef0129b433b877a5e2fc88bb2eb39
Component: engine
 2015-03-29 22:10:14 +02:00
Lei Jitang 3cecae722e Fix create volume in a directory which is a symbolic link 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 7583b491250beac9caeeac13b7b68c4e0f03eb60
Component: engine
 2015-03-29 13:35:36 +08:00
Lei Jitang 0544f5e034 Fix error from daemon no such image even when the image exist 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 013fb87543a47524efba3c371a1d22afe151287c
Component: engine
 2015-03-28 09:07:20 +08:00
Alexander Morozov 3495bd3522 Merge pull request #11848 from duglin/CleanupIntTests 
Clean up integration-cli tests
Upstream-commit: 240f3e14c78f34102672b121a43b612989856d0d
Component: engine
 2015-03-27 14:11:56 -07:00
Alexander Morozov 98bfac2331 Merge pull request #11842 from brahmaroutu/events_tests 
Events tests
Upstream-commit: 8c58bdd3a7d5aff31c446dfd6044c6e0d8afa7fb
Component: engine
 2015-03-27 13:45:11 -07:00