From eb4df9db00ca58dca3a47f1c52d64cfa03deef35 Mon Sep 17 00:00:00 2001 From: Andrea Luzzardi Date: Tue, 5 May 2015 19:52:25 -0700 Subject: [PATCH] integration: merge version-and-commits and main into cli. Signed-off-by: Andrea Luzzardi --- .../integration/{version-and-gitcommit.bats => cli.bats} | 5 +++++ test/integration/main.bats | 9 --------- 2 files changed, 5 insertions(+), 9 deletions(-) rename test/integration/{version-and-gitcommit.bats => cli.bats} (66%) delete mode 100644 test/integration/main.bats diff --git a/test/integration/version-and-gitcommit.bats b/test/integration/cli.bats similarity index 66% rename from test/integration/version-and-gitcommit.bats rename to test/integration/cli.bats index aa4cba3789..855b189948 100644 --- a/test/integration/version-and-gitcommit.bats +++ b/test/integration/cli.bats @@ -2,6 +2,11 @@ load helpers +@test "create doesn't accept any arugments" { + run swarm create derpderpderp + [ "$status" -ne 0 ] +} + @test "version string should contain a proper number with git commit" { run swarm -v diff --git a/test/integration/main.bats b/test/integration/main.bats deleted file mode 100644 index d5b9cb398d..0000000000 --- a/test/integration/main.bats +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bats - -load helpers - -@test "test that create doesn't accept any arugments" { - run swarm create derpderpderp - [ "$status" -ne 0 ] -} -