From 998cc63f783e5320767f914014ce554563cf9188 Mon Sep 17 00:00:00 2001 From: Andrea Luzzardi Date: Tue, 3 Mar 2015 17:34:42 -0800 Subject: [PATCH] bats: Convert encoding to utf-8 unix. Signed-off-by: Andrea Luzzardi --- .../manage-non-available-node.bats | 30 +++++++++---------- test/integration/version-and-gitcommit.bats | 20 ++++++------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/test/integration/manage-non-available-node.bats b/test/integration/manage-non-available-node.bats index 39d5fd36a2..8aa524ffe7 100644 --- a/test/integration/manage-non-available-node.bats +++ b/test/integration/manage-non-available-node.bats @@ -1,15 +1,15 @@ -#!/usr/bin/env bats - -load vars - -@test "managing non-available node should be timed out" { - - # - # timeout does not accept a bash function, so hard-coded path is required - # - run timeout 15s $GOBIN/swarm manage -H 127.0.0.1:2375 nodes://8.8.8.8:2375 - - [ "$status" -ne 0 ] - [[ ${lines[0]} =~ "Listening for HTTP" ]] - [[ ${lines[1]} =~ "ConnectEx tcp: i/o timeout" ]] -} +#!/usr/bin/env bats + +load vars + +@test "managing non-available node should be timed out" { + + # + # timeout does not accept a bash function, so hard-coded path is required + # + run timeout 15s $GOBIN/swarm manage -H 127.0.0.1:2375 nodes://8.8.8.8:2375 + + [ "$status" -ne 0 ] + [[ ${lines[0]} =~ "Listening for HTTP" ]] + [[ ${lines[1]} =~ "ConnectEx tcp: i/o timeout" ]] +} diff --git a/test/integration/version-and-gitcommit.bats b/test/integration/version-and-gitcommit.bats index a8187af6f0..1a8e896836 100644 --- a/test/integration/version-and-gitcommit.bats +++ b/test/integration/version-and-gitcommit.bats @@ -1,10 +1,10 @@ -#!/usr/bin/env bats - -load vars - -@test "version string should contain a proper number with git commit" { - run swarm -v - - [ "$status" -eq 0 ] - [[ ${lines[0]} =~ version\ [0-9]+\.[0-9]+\.[0-9]+\ \([0-9a-f]{7}\)$ ]] -} +#!/usr/bin/env bats + +load vars + +@test "version string should contain a proper number with git commit" { + run swarm -v + + [ "$status" -eq 0 ] + [[ ${lines[0]} =~ version\ [0-9]+\.[0-9]+\.[0-9]+\ \([0-9a-f]{7}\)$ ]] +}