fix split into parts

tests/acceptance/run.sh

@@ -432,12 +432,6 @@ fi
 
 declare -a BEHAT_SUITES
 
-BEHAT_FILTER_SUITE=""
-if [[ -f "${BEHAT_FILTER_SUITE_FILE}" ]]
-then
-	BEHAT_FILTER_SUITE=`cat "${BEHAT_FILTER_SUITE_FILE}"`
-fi
-
 function get_behat_suites() {
 	# $1 type of suites to get "api" or "core-api"
 	# defaults to "api"
@@ -446,7 +440,7 @@ function get_behat_suites() {
 	then
 		TYPE="api"
 	fi
-	
+
 	ALL_SUITES=""
 	for suite in `find ${BEHAT_FEATURES_DIR}/ -type d -iname ${TYPE}* | sort | rev | cut -d"/" -f1 | rev`
 	do
@@ -456,13 +450,12 @@ function get_behat_suites() {
 			then
 				ALL_SUITES+="$suite"$'\n'
 			fi
+		else
+			ALL_SUITES+="$suite"$'\n'
 		fi
 	done
 
-	ALL_SUITES=`echo "${ALL_SUITES}" | tr " " "\n"`
-
-	COUNT_ALL_SUITES=`echo "${ALL_SUITES}" | wc -l`
-	echo "Total suits to run: $COUNT_ALL_SUITES"
+	COUNT_ALL_SUITES=`echo "${ALL_SUITES}" | tr " " "\n" | wc -l`
 
 	#divide the suites letting it round down (could be zero)
 	MIN_SUITES_PER_RUN=$((${COUNT_ALL_SUITES} / ${DIVIDE_INTO_NUM_PARTS}))
@@ -487,8 +480,7 @@ function get_behat_suites() {
 	fi
 
 	COUNT_FINISH_AND_TODO_SUITES=$((${SUITES_IN_PREVIOUS_RUNS} + ${SUITES_THIS_RUN}))
-	BEHAT_SUITES+=(`echo "${ALL_SUITES}" | head -n ${COUNT_FINISH_AND_TODO_SUITES} | tail -n ${SUITES_THIS_RUN}`)
-	echo "Suites to run in this run: $BEHAT_SUITES"
+	BEHAT_SUITES+=(`echo "${ALL_SUITES}" | tr " " "\n" | head -n ${COUNT_FINISH_AND_TODO_SUITES} | tail -n ${SUITES_THIS_RUN}`)
 }
 
 if [[ -n "${BEHAT_SUITE}" ]]

tests/docker/docker-compose.yml

@@ -214,7 +214,7 @@ services:
       BEHAT_FEATURES_DIR: /mnt/ocis/tests/acceptance/features
       BEHAT_YML: /mnt/acceptance/config/behat-core.yml
       ACCEPTANCE_TEST_TYPE: core-api
-      BEHAT_FILTER_SUITE: /mnt/acceptance/filtered-suites-acceptance-2-EOS
+      BEHAT_FILTER_SUITE_FILE: /mnt/acceptance/filtered-suites-acceptance-2-EOS
     volumes:
       - shared-volume:/var/tmp
     working_dir: /mnt/ocis