integration

Author: jxyowen

integration/common

@@ -1,8 +1,8 @@
+#!/bin/bash
 
 g_var=
 g_error=0
 force="force"
-#!/bin/bash
 
 do_command() {
 	if [[ $2 != $force && $g_error -eq 1 ]]
@@ -17,20 +17,20 @@ do_command() {
 	echo $cmd
 	echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>Command"
 
-    g_var=$(eval $cmd)
+	g_var=$(eval $cmd)
 
 	echo "Result<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
 	echo $g_var
 	echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>Result"
 
-    err=$(echo $g_var | grep -i "error")
+	err=$(echo $g_var | grep -i "error")
 
-    if [[ $2 != $force && $err != "" ]]
-    then
-    	g_var=
-    	g_error=1
-        return $g_error
-    fi
+	if [[ $2 != $force && $err != "" ]]
+	then
+		g_var=
+		g_error=1
+		return $g_error
+	fi
 
-    return 0
+	return 0
 }

integration/ecs_test

@@ -28,14 +28,14 @@ ecs_delete_instance() {
 
 ecs_get_instance_ids() {
 	ecs_describe_instances $force
-    ids=$(echo $g_var | jq '.Instances.Instance[].InstanceId')
-    err=$(echo ids | grep -i "error")
-    if [[ $err != "" ]]
-    then
-    	g_var=""
-    else
-    	g_var=$ids
-    fi
+	ids=$(echo $g_var | jq '.Instances.Instance[].InstanceId')
+	err=$(echo ids | grep -i "error")
+	if [[ $err != "" ]]
+	then
+		g_var=""
+	else
+		g_var=$ids
+	fi
 }
 
 ecs_clear_all_instances() {
@@ -46,15 +46,15 @@ ecs_clear_all_instances() {
 	for id in ${ids[@]}; do
 		echo "###### Try to stop instance $id ######"
 		ecs_stop_instance $id $force
-    done
+	done
 
-    for id in ${ids[@]}; do
-    	echo "###### Try to delete instance $id ######"
+	for id in ${ids[@]}; do
+		echo "###### Try to delete instance $id ######"
 
-    	ecs_instance_status_wait_until $id Stopped $force
+		ecs_instance_status_wait_until $id Stopped $force
 
-    	ecs_delete_instance $id $force
-    done
+		ecs_delete_instance $id $force
+	done
 }
 
 ecs_test() {