Michael Crosby
5fd3c8204d
Merge pull request #2735 from shykes/engine-job-kill
...
New engine command: 'kill'
2013-12-11 10:35:57 -08:00
Victor Vieux
09d2c2351c
Merge pull request #3119 from shykes/engine-version
...
Port 'docker version' to the engine API
2013-12-09 17:35:44 -08:00
Victor Vieux
c618a906a4
fix size in -tree
2013-12-09 17:27:05 -08:00
Victor Vieux
8291f00a0e
refactor and fix tests
2013-12-09 16:25:19 -08:00
Solomon Hykes
de35b346d1
Port 'docker version' to the engine API
2013-12-08 07:41:53 +00:00
Solomon Hykes
3569d080af
New engine command: 'wait'
2013-12-06 23:05:21 +00:00
Solomon Hykes
2546a2c645
Hack: use new 'kill' command in integration tests
2013-12-06 23:02:27 +00:00
Michael Crosby
25d3db048e
Enable engine to take Stderr and Stdout for mocking in tests
2013-12-06 01:18:18 -08:00
Guillaume J. Charmes
ef157cee30
Merge pull request #3074 from crosbymichael/dm-history-calc
...
Save layersize on pull
2013-12-05 14:13:03 -08:00
Michael Crosby
697707e4af
Save layersize on pull
...
Do not display size and virtual size on the cli.
Only display virtual size on the cli
2013-12-05 14:03:23 -08:00
Guillaume J. Charmes
797bac2344
Merge pull request #3057 from crosbymichael/test-cpu-share
...
Move test cpu shares out of test start
2013-12-05 13:58:01 -08:00
Victor Vieux
5f55c1aee1
Merge pull request #2966 from andrewsmedina/govet2
...
fixed some `go vet` issues.
2013-12-04 17:57:10 -08:00
Michael Crosby
0d1506adb3
Move test cpu shares out of test start
...
Fixes #2107
2013-12-04 16:31:09 -08:00
Michael Crosby
5976c26c1e
Ensure that the init layer is removed with the container
2013-12-03 09:44:48 -08:00
Guillaume J. Charmes
98ed1dc433
Fix unit test with new buildfile prototype
2013-12-02 12:51:37 -08:00
Guillaume J. Charmes
d6cdbca6c1
Merge pull request #2775 from daniel-garcia/2671-bindmount_files
...
fixes #2671 , add support for bind mounting individual files in to contai...
2013-12-02 09:30:08 -08:00
Johannes 'fish' Ziemke
b04c6466cd
Make docker build return exit code of build step
...
If a command during build fails, `docker build` now returns with
the exit code of that command.
This makes it necessary to change the build api endpoint to
return a json object stream.
2013-12-02 17:52:37 +01:00
Guillaume J. Charmes
2dac7b5209
Merge pull request #2781 from shykes/engine-status-int
...
Engine: integer status, better streaming, lots of tests
2013-11-29 17:57:28 -08:00
Andrews Medina
a6c9a332d0
fixed some `go vet` issues.
2013-11-29 22:53:20 -02:00
Solomon Hykes
a4f8a2494b
Engine: integer job status, improved stream API
...
* Jobs return an integer status instead of a string
* Status convention mimics unix process execution: 0=success, 1=generic error, 127="no such command"
* Stdout and Stderr support multiple thread-safe data receivers and ring buffer filtering
2013-11-30 00:25:46 +00:00
Andrews Medina
fe72f15e4a
go fmt.
...
result of `gofmt -w -s .` without vendors.
2013-11-29 22:20:59 -02:00
Guillaume J. Charmes
ab35aef6b5
Add unit test to check bind / server side
2013-11-29 13:43:37 -08:00
Guillaume J. Charmes
bb284ce59d
Merge branch 'master' into fix_tests
2013-11-29 13:17:36 -08:00
Guillaume J. Charmes
34353e782e
Reduce the timeout for restart/stop
2013-11-29 11:08:01 -08:00
Guillaume J. Charmes
86c00be180
Fix behavior of tty tests
2013-11-29 10:17:25 -08:00
Guillaume J. Charmes
2ec1146679
Remove an unit test from integrations test
2013-11-29 10:17:04 -08:00
Guillaume J. Charmes
2e6a958612
Fix TestAttachDetachTruncatedID (behavior + tty issue)
2013-11-29 10:03:36 -08:00
Guillaume J. Charmes
697be6aaa0
Create helper function for tests
2013-11-29 10:02:22 -08:00
Guillaume J. Charmes
63d6cbe3e4
Actually test the detach (was not the case before)
2013-11-29 09:11:20 -08:00
Guillaume J. Charmes
67e9e0e11b
Make the PTY in raw mode before assert test (TestAttachDetach)
2013-11-29 08:29:56 -08:00
Guillaume J. Charmes
e535f544c7
Make sure the container is running before testing against it (TestAttachDetach)
2013-11-29 07:39:51 -08:00
Victor Vieux
926f7b579e
Merge pull request #2692 from SvenDowideit/add-specific-feedback-for-bad-ADD
...
Add specific feedback for ADD outside context
2013-11-28 17:55:11 -08:00
Guillaume J. Charmes
ad43d88af5
Make race condition more obvious by performing more asserts
2013-11-28 16:12:45 -08:00
Solomon Hykes
2302293244
Fix a race condition in the integration tests
2013-11-26 05:28:00 +00:00
Solomon Hykes
a937313747
Always use the 'vfs' storage driver in integration tests. To test other drivers, we need a dedicated driver validation suite.
2013-11-26 05:05:15 +00:00
Solomon Hykes
fb3d60f27a
Move all graph tests into integration, because they now rely on the underlying graph driver, which currently cannot be mocked.
2013-11-26 05:05:15 +00:00
Sven Dowideit
96b5be9dd9
add more searchable info to the error message when ADD tries to go outside the context
2013-11-23 12:23:31 +10:00
daniel-garcia
0198f8a879
fixes #2671 , add support for bind mounting individual files in to containers, rebases of #1757 #2301
2013-11-21 23:40:35 -06:00
Michael Crosby
0cecc2a78c
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
container.go
image.go
2013-11-21 17:18:41 -08:00
Guillaume J. Charmes
33e70864a2
Refactor State to be 100% thread safe
2013-11-21 16:34:58 -08:00
Michael Crosby
2382a0f920
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
server.go
2013-11-20 11:07:42 -08:00
Victor Vieux
304a80fcd5
Merge pull request #2747 from jpoimboe/test-fixes
...
Test fixes
2013-11-20 10:07:40 -08:00
Guillaume J. Charmes
12e993549d
Fix unit-tests
2013-11-19 15:24:14 -08:00
Guillaume J. Charmes
28d4cbbc59
Merge branch 'master' into creack-merge-master
...
Conflicts:
api_params.go
graph.go
graph_test.go
image.go
integration/api_test.go
integration/container_test.go
integration/runtime_test.go
runtime.go
2013-11-19 14:58:12 -08:00
Josh Poimboeuf
4b80ec9aae
test: remove extra args in TestExitCode
...
The extra blank argument isn't needed and confuses libvirt.
2013-11-18 15:07:11 -06:00
Josh Poimboeuf
fef41ef7bf
test: fix TestRmi race condition
2013-11-18 15:07:06 -06:00
Michael Crosby
4546832507
Merge pull request #2752 from dotcloud/gofmt_test
...
Go fmt tests
2013-11-18 11:34:59 -08:00
Victor Vieux
ed8f75d25c
gofmt_test
2013-11-18 11:25:13 -08:00
Darren Coxall
3c67a28493
More informative error message on name collisions
...
This is the proposed fix for #2506 . It provides a more complete message
with regards to name collisions including informing of the opposing
containers ID.
I have included a test to ensure that the correct short id is displayed
to make the message easier to understand.
2013-11-18 17:51:47 +00:00
Josh Poimboeuf
fe302fbfd2
test: 2 second timeout (not 2000)
2013-11-18 10:23:30 -06:00
Josh Poimboeuf
72d02ecdde
test: skip TestCreate on Fedora due to lxc utils bug
...
In the dind environment running on a Fedora host, the lxc utils get
confused by the /sys/fs/cgroup/cpuacct,cpu cgroup mount and lxc-start
fails trying to access the wrong cgroup directory.
2013-11-18 10:23:30 -06:00
Josh Poimboeuf
baa687bed2
test: fix TestCreateStartRestartStopStartKillRm
...
cat needs stdin opened, otherwise it dies immediately.
2013-11-18 10:23:30 -06:00
Josh Poimboeuf
30ea0bebce
test: put each arg in a separate string
...
Each arg to docker run should be placed in a separate string.
Otherwise, when starting the command via exec.Cmd, the command is
interpreted as "echo test", which can't be found.
2013-11-18 10:23:06 -06:00
Solomon Hykes
afe230718e
Re-enable api integration tests using only public remote API.
2013-11-16 02:12:14 +00:00
Solomon Hykes
823674816e
Move iptables test to integration tests
2013-11-15 01:15:39 +00:00
Solomon Hykes
8d3e35cd8d
Split auth tests between unit tests and integration tests
2013-11-15 01:13:20 +00:00
Victor Vieux
596810d8db
move TestMount to integration
2013-11-14 15:17:31 -08:00
Victor Vieux
661a8a0e0c
fix Integration tests
2013-11-14 14:46:13 -08:00
Victor Vieux
c001a5af67
Integration tests: remove dependency on private APIs
2013-11-14 10:50:43 -08:00
Solomon Hykes
359a6f49b9
Move integration tests to integration/, expose missing public methods in the core
2013-11-14 10:50:00 -08:00