Gotea/docker-machine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,145 Commits 1 Branch 72 Tags
b85efca4f0580817bb23f990a0330eae348a9d73
Commit Graph

125 Commits

Author SHA1 Message Date
Jean-Laurent de Morlhon
de99d4abe5 Make test a bit more resilient 
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
 2015-12-14 18:11:35 +01:00
Jean-Laurent de Morlhon
a8ba712286 Use bundled bugsnag APIKey 
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
 2015-12-11 18:07:23 +01:00
Jean-Laurent de Morlhon
ac41fba24e Merge pull request #2541 from dougm/env-emacs 
Add emacs support to env command
 2015-12-11 09:37:06 +01:00
Doug MacEachern
4e58bb9434 Add emacs support to env command 
Signed-off-by: Doug MacEachern <dougm@vmware.com>
 2015-12-10 15:29:14 -08:00
David Gageot
fd0f002065 Fix test 
Signed-off-by: David Gageot <david@gageot.net>
 2015-12-09 15:54:08 +01:00
David Gageot
3071da0673 FIX #2490 - Reuse machines in ITs 
Signed-off-by: David Gageot <david@gageot.net>
 2015-12-09 15:53:40 +01:00
David Gageot
57085d89e5 Fix test 
Signed-off-by: David Gageot <david@gageot.net>
 2015-12-09 15:52:28 +01:00
David Gageot
a708bf7e6c Cleanup machines only at the end 
Signed-off-by: David Gageot <david@gageot.net>
 2015-12-08 12:28:11 +01:00
David Gageot
17b1e571f2 Group engine options test 
Signed-off-by: David Gageot <david@gageot.net>
 2015-12-08 12:28:11 +01:00
Anil Belur
0b0373d436 Fixes issue #2310 - machine ls --filter with engine label 
* Added a new members `Labels` to `FilterOptions struct`, and `EngineOptions` to
`HostListItem struct`. `HostListItems` is already being read from the file
store `config.json` which TestFilterHostsReturnSetLabel engine labels.

* Modified `parseFilters()` and added new `func matchesLabel(`) which compares
the one or more label values provided as input.

* Also the changes include added tests for UT and integration.
Note: Have kept `--filter label=<key>=<value>` syntax which is similar to
`docker images --filter` to keep the usability consistent.

review comments from @dgageot

Signed-off-by: Anil Belur <askb23@gmail.com>
 2015-12-08 10:15:31 +05:30
David Gageot
3612c55677 Add version to machine ls 
Signed-off-by: David Gageot <david@gageot.net>
 2015-12-03 16:27:42 +01:00
David Gageot
b356a2249e Remove redundant flag in integration tests 
Signed-off-by: David Gageot <david@gageot.net>
 2015-12-02 11:51:29 +01:00
Anil Belur
77fba72d13 Fixes #2349 - rm get user confirmation before proceeding further 
* adds new flag `-y` prompting for user confirmation before removal
* Modified existing integration tests to work with the fix #2349.
* Added tests for checking user confirmation, updated the test cases use sub-shell with `|`
* Updated the reference docs for rm sub-command

incorporated changes by @dgageot, @jeanlaurent and @nathanleclaire

Signed-off-by: Anil Belur <askb23@gmail.com>
 2015-12-02 09:17:33 +05:30
Jean-Laurent de Morlhon
b7b767aafe Allow virtualbox DNSProxy override 
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
 2015-12-01 16:02:20 +01:00
David Gageot
41a9edbfb2 B2D_CACHE can be used to speedup integration tests 
Signed-off-by: David Gageot <david@gageot.net>
 2015-11-26 11:42:55 +01:00
Jean-Laurent de Morlhon
abca150dd8 Move doubtfull provision test out of the integration folder 
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
 2015-11-26 11:16:04 +01:00
Nathan LeClaire
64a3a2f804 Update DRIVER checking to universal function 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-11-25 23:01:47 -08:00
Nathan LeClaire
3ddea9f53f Merge pull request #2409 from dgageot/more-commands-tests 
Add more command tests
 2015-11-25 10:25:09 -08:00
Jean-Laurent de Morlhon
67b83f518f Fix #2410 
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
Reviewed-by: David Gageot <david@gageot.net>
 2015-11-25 18:27:35 +01:00
David Gageot
742cdb958b Add more command tests 
Signed-off-by: David Gageot <david@gageot.net>
 2015-11-25 14:23:29 +01:00
Dave Tucker
3a332c8d47 Only run integration tests on Bash 4.1 or later 
Fixes #2200

Signed-off-by: Dave Tucker <dt@docker.com>
 2015-11-24 09:58:43 +00:00
Nathan LeClaire
19ce7b79bd Revise CommandLine interface to contain libmachine client and store 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-11-23 19:29:20 -08:00
David Gageot
9a7414fc80 Merge pull request #2375 from jeanlaurent/vbox-test 
Move vbox integration test to core
 2015-11-23 14:20:03 +01:00
Jean-Laurent de Morlhon
a55bba3ed2 Move tls-san flag to a local flag for create 
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
 2015-11-23 12:40:07 +01:00
Sam Alba
b82f9a8509 Implemented integration tests for --tls-san option 
Signed-off-by: Sam Alba <sam.alba@gmail.com>
 2015-11-23 12:19:03 +01:00
Jean-Laurent de Morlhon
f4cada3867 Unused hierarchy 
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
 2015-11-23 10:43:32 +01:00
Jean-Laurent de Morlhon
975faf57b3 Unused file 
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
 2015-11-23 10:43:30 +01:00
Jean-Laurent de Morlhon
164bb01540 Unused file 
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
 2015-11-23 10:43:20 +01:00
Jean-Laurent de Morlhon
690215b7ec move vbox test to core 
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
 2015-11-23 10:41:24 +01:00
Jean-Laurent de Morlhon
ade5911b32 Fixes #2372, add test for #2356 
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
 2015-11-20 17:48:53 +01:00
David Gageot
43d9df3216 Merge pull request #2347 from dgageot/improve-its 
Improve its
 2015-11-19 11:09:49 +01:00
David Gageot
9f48e4727d Merge pull request #2340 from rcoedo/fish-global-env 
Global set for fish env
 2015-11-19 10:28:53 +01:00
David Gageot
5baab2fae5 This test seems more stable this way 
Otherwise it sometimes hangs

Signed-off-by: David Gageot <david@gageot.net>
 2015-11-19 10:18:58 +01:00
David Gageot
5eebd0be15 Cleaning up a few thing in the ITs script 
Signed-off-by: David Gageot <david@gageot.net>
 2015-11-19 10:18:55 +01:00
Nathan LeClaire
f6d5c03d76 Change log driver check to be more future-safe 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-11-18 16:27:00 -08:00
Nathan LeClaire
ffbfb443c2 Merge pull request #2337 from dgageot/fix-its 
Fix its
 2015-11-18 16:17:45 -08:00
Roman Coedo
f81870e4f1 Global set for fish env 
Using "set -x" only exports the variable in the local scope.
This is a limitation when an user needs to invoke "docker-machine" in a fish script.

Using "set -gx" instead exports the variable globally.

Signed-off-by: Roman Coedo <romancoedo@gmail.com>
 2015-11-18 21:35:32 +01:00
David Gageot
f0740fe8ad FIX #2190 no need killing docker-machine processes 
Signed-off-by: David Gageot <david@gageot.net>
 2015-11-18 18:16:01 +01:00
David Gageot
93f94d9521 Fix an integration test 
Signed-off-by: David Gageot <david@gageot.net>
 2015-11-18 18:16:01 +01:00
David Gageot
36cf498fb2 Use a different machine name for each time 
This makes ITs more isolated and more robust

Signed-off-by: David Gageot <david@gageot.net>
 2015-11-18 18:16:01 +01:00
David Gageot
65d04ea6c7 Fix test because the error was changed 
Signed-off-by: David Gageot <david@gageot.net>
 2015-11-18 18:16:01 +01:00
Jean-Laurent de Morlhon
96f519b36f Copy once b2d iso prior to testing 
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
 2015-11-18 14:20:02 +01:00
Jean-Laurent de Morlhon
f2fe553280 IT: cleanup properly before starting 
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
 2015-11-18 11:49:28 +01:00
Jean-Laurent de Morlhon
fe37f1fb0d Fix #2204 broken env unset 
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
 2015-11-12 17:32:27 +01:00
David Gageot
4ac76457f9 Merge pull request #2199 from nathanleclaire/none_running 
Change default state of none driver to state.Running
 2015-11-06 07:59:49 +01:00
Nathan LeClaire
ac6a18ba25 Change none default state to Running 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-11-05 18:37:15 -08:00
Mikhail Zholobov
d07d443466 test/integration: Remove machine forcibly, without stopping 
Unlikely "rm -f", commands "stop" and "rm" will be failed if machine doesn't exist.
Forced removing guarantees that integration tests won't fail on the cleanup step.

Signed-off-by: Mikhail Zholobov <legal90@gmail.com>
 2015-11-05 12:35:25 +02:00
Nathan LeClaire
060f0a0db2 Fix issues with create and ssh command help text 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-10-30 16:21:47 -07:00
David Gageot
86c52ec3e7 Make commands code easier to test 
Signed-off-by: David Gageot <david@gageot.net>
 2015-10-29 11:15:17 +01:00
Nathan LeClaire
b038ff4020 Fixes https://github.com/docker/machine/issues/2062 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-10-23 13:58:32 -07:00