0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
18445 commits 14 branches 412 tags 338 MiB
Commit graph

78 commits

Author SHA1 Message Date
John Howard
f9a3558a9d Windows: Get Integration CLI running 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-09-04 12:32:40 -07:00
Vincent Demeester
799d9605d6 Remove/Comment time.Sleep in integration tests 
Remove what seems unnecessary time.Sleep (1 second even) and comment the
ones that seemed necessary.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-08-18 20:36:08 +02:00
Veres Lajos
5146232723 typofix - https://github.com/vlajos/misspell_fixer 
Signed-off-by: Veres Lajos <vlajos@gmail.com>
 2015-08-07 23:25:49 +01:00
Brian Goff
693ba98cb9 Don't pass check.C to dockerCmdWithError 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-07-27 14:33:32 -04:00
Josh Hawn
418135e7ea integration-cli: New docker cp integration tests 
Adds several integration tests for `docker cp` behavior with over a dozen
tests for each of:

  container -> local
  local -> container

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2015-07-21 15:19:52 -07:00
Qiang Huang
668e2369cc dockerCmd when possible 
Addresses: #14603

integration-cli/docker_cli_daemon_experimental_test.go (hqhq)
integration-cli/docker_cli_daemon_test.go (hqhq)
integration-cli/docker_cli_diff_test.go (hqhq)
integration-cli/docker_cli_events_test.go (hqhq)
integration-cli/docker_cli_events_unix_test.go (hqhq)
integration-cli/docker_cli_exec_test.go (hqhq)
integration-cli/docker_cli_exec_unix_test.go (hqhq)
integration-cli/docker_cli_experimental_test.go (hqhq)
integration-cli/docker_cli_export_import_test.go (hqhq)
integration-cli/docker_cli_help_test.go (hqhq)
integration-cli/docker_cli_history_test.go (hqhq)
integration-cli/docker_cli_images_test.go (hqhq)
integration-cli/docker_cli_import_test.go (hqhq)
integration-cli/docker_cli_info_test.go (hqhq)
integration-cli/docker_cli_inspect_test.go (hqhq)
integration-cli/docker_cli_kill_test.go (hqhq)

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-07-20 14:55:40 +08:00
Jessie Frazelle
2cd417df73 Merge pull request #14388 from runcom/14316-fix-events-filters 
Fix combined image events filters
 2015-07-07 18:08:56 -07:00
Lei Jitang
2802831218 Fix test TestEventsDefaultEmpty. Fixes #14360 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-07-07 11:27:00 +08:00
Antonio Murdaca
19e6de2654 Fix combined image events filters 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-07-04 00:19:08 +02:00
Brian Goff
74c12aa429 Default events since to current time 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-06-10 12:37:40 -04:00
Antonio Murdaca
f18ce101fb Merge pull request #13165 from ahmetalpbalkan/durations 
Allow duration strings as --since/--until
 2015-06-03 22:14:42 +02:00
David Calavera
6c42b3947a Merge pull request #12838 from fntlnz/test-cmd 
Using dockerCmd when possible
 2015-06-02 14:12:22 -07:00
Ahmet Alp Balkan
4e3b21f99e Allow duration strings as --since/--until 
Fixes #13107. This change enables Go duration strings
computed relative to the client machine’s time to be used
as input parameters to `docker events --since/--until`
and `docker logs --since` arguments.

Added unit tests for pkg/timeutils.GetTimestamp as well.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-06-02 21:02:47 +00:00
Doug Davis
8232312c1e Cleanup container LogEvent calls 
Move some calls to container.LogEvent down lower so that there's
less of a chance of them being missed. Also add a few more events
that appear to have been missed.

Added testcases for new events: commit, copy, resize, attach, rename, top

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-06-01 12:39:28 -07:00
Lorenzo Fontana
a2787469ac Using dockerCmd when possible 
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com>
 2015-05-19 20:33:59 +02:00
Ahmet Alp Balkan
1630ed97ac Introduce daemon event 'tag' upon image tagging 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-05-15 20:21:59 +00:00
Ahmet Alp Balkan
999f464feb Parse input timestamps with standard RFC3339 
Fix for #13175.

This change allows user-input timestamps (e.g. to `docker events
--since/--until`  or `docker logs --since` to be parsed using
standard RFC3339Nano layout in Go instead of the layout that parses
all timestamps into fixed-length strings (currently buggy).

User inputs need not to be complying to the internal format
(`RFC3339NanoFixed`) anyway.

Added test case for `events --since/--until` with all possible
timestamp input formats.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-05-14 07:44:42 +00:00
Antonio Murdaca
4203230cbb 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>
 2015-04-29 17:02:22 +02:00
Lorenzo Fontana
40779b28bb Parallelize TestEventsLimit 
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com>
 2015-04-27 21:14:00 +02:00
Brian Goff
03719be830 Merge pull request #12754 from LK4D4/carry_12707 
fix runtime issue for TestEventsFilterContainer
 2015-04-24 14:36:58 -04:00
Daniel Antlinger
07795c3f5d fix runtime issue for TestEventsFilterContainer 
Signed-off-by: Daniel Antlinger <d.antlinger@gmx.at>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-24 10:48:40 -07:00
Alexander Morozov
a9688cdca5 Implement teardown removeAllImages 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-24 10:37:21 -07:00
Antonio Murdaca
eeb8ceb9ed Fix TestEventsImageImport racy, fixes #12499 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-22 17:30:30 +02:00
Alexander Morozov
dc944ea7e4 Use suite for integration-cli 
It prints test name and duration for each test.
Also performs deleteAllContainers after each test.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-21 10:28:52 -07:00
bobby abbott
621b601b3c Removed unnecessary error output from dockerCmd 
Changed method declaration. Fixed all calls to dockerCmd
method to reflect the change.

resolves #12355

Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
 2015-04-17 09:11:14 -07:00
Alexander Morozov
b02cf5239e Merge pull request #12115 from cpuguy83/fix_events_filter_test 
Cleanup events filter by container test
 2015-04-09 11:40:08 -07:00
Liu Hua
645c020f5a fix up Image-name related issues in docker ps and CI 
This patch include the following fixs:
 - fix image name error when docker ps
 - fix docker events test failure: use the exact image name for filter
 - fix docker build CI test failure due to "docker events" change

Because of change of daemon log behavior. Now we record
the exact Image name as you typed. So docker run -d busybux sh
and docker run -d busybox:latest are not the same in the log.
So it will affect the docker events. So change the related CI

Signed-off-by: Liu Hua <sdu.liu@huawei.com>
 2015-04-09 23:03:23 +08:00
Brian Goff
7e70998bb8 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>
 2015-04-09 09:47:58 -04:00
Alexander Morozov
8fd2b52146 Fix fail message in TestEventsImageImport 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-07 14:22:43 -07:00
Alexandr Morozov
e45bf8d2e9 Decrease timeouts in TestEventsStreaming 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2015-04-06 13:40:56 -07:00
Alexandr Morozov
5fa3a6f248 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>
 2015-04-06 13:39:02 -07:00
Antonio Murdaca
d1c4439b5a Test events streaming, fixes #12079 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-06 19:00:17 +02:00
Arnaud Porterie
b9d2ede4d4 Merge pull request #12107 from cpuguy83/remove_striptrailingchars 
Remove `stripTrailingCharacters` from tests
 2015-04-06 08:46:08 -07:00
Brian Goff
475c65319b Remove stripTrailingCharacters from tests 
This was just an alias to `strings.TrimSpace`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-06 09:21:18 -04:00
Arnaud Porterie
9c505c906d Merge pull request #11571 from noironetworks/11555-Docker-since-beginning-of-unix-time-doesnt-work 
Fixes docker events since beginning of unix time
 2015-04-02 15:03:04 -07:00
André Martins
8f7ac20bac 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>
 2015-04-01 18:14:59 +01:00
Mabin
e15c3e36cc Fix random bug in cli events test 
Signed-off-by: Mabin <bin.ma@huawei.com>
 2015-04-01 11:00:01 +08:00
Srini Brahmaroutu
f5ad895ba6 Use common code to test all events, when using filter that expect all lifecycle events. 
Addresses: #10654

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-03-27 02:47:46 +00:00
Jake Champlin
c2fe262439 Add fixes for integration-cli tests w/ --net none 
Adds network to integration tests that were failing without network.

Fixes #10964
Fixes #10968

Signed-off-by: Jake Champlin <jake.champlin.27@gmail.com>
 2015-03-25 23:46:04 -04:00
Ahmet Alp Balkan
e424c54d9c integ-cli: fix clock skew against remote test daemon 
This fixes the `docker events`-related tests as they have been
failing due to clock skew between CI machine and test daemon on
some other machine (even 1-2 seconds of diff causes races as
we pass local time to --since/--until).

If we're running in same host, we keep using time.Now(), otherwise
we read the system time of the daemon from `/info` endpoint.

Fixes pretty much all events-related tests on windows CI.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-03-11 10:28:56 -07:00
Srini Brahmaroutu
e0fa577378 filter events by container name,id or partial id 
Addresses #10645

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-03-06 19:54:57 +00:00
Phil Estes
c94eb28af0 Merge pull request #10675 from brahmaroutu/events_filterbyimage_10645 
Allow use of just image name without the tag
 2015-03-06 13:38:41 -05:00
Jessie Frazelle
a8b699f5d9 Merge pull request #10798 from ahmetalpbalkan/win-cli/TestEventsUntag-fix 
integration-cli: Remove timeout dependency on TestEventsUntag
 2015-03-04 03:54:33 -08:00
Srini Brahmaroutu
ce02578317 Allow use of just image name without the tag 
Addresses #10645

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-03-03 22:38:45 +00:00
Jessica Frazelle
202709d178 fix racy events test 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
 2015-02-27 14:48:39 -08:00
Jessie Frazelle
2768ce0e4e Merge pull request #10998 from jfrazelle/fix-filter-events-test-better 
Fix events test so it doesnt need new daemon
 2015-02-27 12:05:48 -08:00
Jessica Frazelle
9aff77156b Fix events test so it doesnt need new daemon 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)

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)
 2015-02-24 18:28:16 -08:00
Abin Shahab
1a26ed09ee Implements stats for lxc driver 
Implements stats and fixes stats test.

Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
 2015-02-23 10:16:52 +00:00
Jessica Frazelle
27c61c39db fix race in events test 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
 2015-02-19 15:32:00 -08:00
Jessie Frazelle
934535db9c Merge pull request #10468 from noironetworks/10457-Pause-and-unpause-accept-multi-containers 
Allow docker pause and unpause to accept multiple containers
 2015-02-19 15:16:05 -08:00