Browse code
int-cli/TestSearchCmdOptions: fail earlier
Sometimes this test fails (allegedly due to problems with Docker Hub),
but it fails later than it should, for example:
> 01:20:34.845 assertion failed: expression is false: strings.Count(outSearchCmdStars, "[OK]") <= strings.Count(outSearchCmd, "[OK]"): The quantity of images with stars should be less than that of all images: <...>
This, with non-empty list of images following, means that the initial
`docker search busybox` command returned not enough results. So, add
a check that `docker search busybox` returns something.
While at it,
* raise the number of stars to 10;
* simplify check for number of lines (no need to count [OK]'s);
* improve error message.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Kir Kolyshkin authored on 2019/05/21 17:33:15Showing 1 changed files
| ... | ... |
@@ -51,8 +51,8 @@ func (s *DockerSuite) TestSearchCmdOptions(c *check.C) {
|
| 51 | 51 |
assert.Assert(c, strings.Contains(out, "Usage:\tdocker search [OPTIONS] TERM")) |
| 52 | 52 |
|
| 53 | 53 |
outSearchCmd, _ := dockerCmd(c, "search", "busybox") |
| 54 |
+ assert.Assert(c, strings.Count(outSearchCmd, "\n") > 3, outSearchCmd) |
|
| 54 | 55 |
outSearchCmdNotrunc, _ := dockerCmd(c, "search", "--no-trunc=true", "busybox") |
| 55 |
- |
|
| 56 | 56 |
assert.Assert(c, len(outSearchCmd) <= len(outSearchCmdNotrunc), "The no-trunc option can't take effect.") |
| 57 | 57 |
|
| 58 | 58 |
outSearchCmdautomated, _ := dockerCmd(c, "search", "--filter", "is-automated=true", "busybox") //The busybox is a busybox base image, not an AUTOMATED image. |
| ... | ... |
@@ -72,8 +72,8 @@ func (s *DockerSuite) TestSearchCmdOptions(c *check.C) {
|
| 72 | 72 |
assert.Equal(c, len(outSearchCmdOfficialSlice), 3) // 1 header, 1 line, 1 carriage return |
| 73 | 73 |
assert.Assert(c, strings.HasPrefix(outSearchCmdOfficialSlice[1], "busybox "), "The busybox is an OFFICIAL image: %s", outSearchCmdOfficial) |
| 74 | 74 |
|
| 75 |
- outSearchCmdStars, _ := dockerCmd(c, "search", "--filter", "stars=2", "busybox") |
|
| 76 |
- assert.Assert(c, strings.Count(outSearchCmdStars, "[OK]") <= strings.Count(outSearchCmd, "[OK]"), "The quantity of images with stars should be less than that of all images: %s", outSearchCmdStars) |
|
| 75 |
+ outSearchCmdStars, _ := dockerCmd(c, "search", "--filter", "stars=10", "busybox") |
|
| 76 |
+ assert.Assert(c, strings.Count(outSearchCmdStars, "\n") <= strings.Count(outSearchCmd, "\n"), "Number of images with 10+ stars should be less than that of all images:\noutSearchCmdStars: %s\noutSearch: %s\n", outSearchCmdStars, outSearchCmd) |
|
| 77 | 77 |
|
| 78 | 78 |
dockerCmd(c, "search", "--filter", "is-automated=true", "--filter", "stars=2", "--no-trunc=true", "busybox") |
| 79 | 79 |
|