Merge pull request #150 from EA31337/dev

Development improvements

.travis.yml

@@ -24,20 +24,20 @@ env:
   - CMD="docker-compose run RunHelp; scripts/eval.sh help; scripts/run_backtest.sh -?"
   - CMD="sudo scripts/provision.sh"
   - CMD="make docker-ci DOCKER_TAG=$DOCKER_TAG; [[ '$TRAVIS_PULL_REQUEST' = 'false' ]] && make docker-push DOCKER_TAG=$DOCKER_TAG || true"
+# - CMD="make docker-ci DOCKER_TAG=$DOCKER_TAG && docker run ea-tester:$DOCKER_TAG install_mt 5" # @fixme
   - CMD="docker-compose run $DOCKER_ARG TestSyntaxVagrantfile; docker-compose run $DOCKER_ARG TestSyntaxBash; docker-compose run $DOCKER_ARG TestSyntaxShellcheck"
   - CMD="docker-compose run $DOCKER_ARG RunCompileMql"
   - CMD="docker-compose run $DOCKER_ARG ScriptPrintPaths"
   - CMD="docker-compose run $DOCKER_ARG TestHSTHeader; docker-compose run TestFXTHeader"
   - CMD="docker-compose run $DOCKER_ARG TestLotstep4"
-# @fixme: Error: Expected lot step for 5 digits: 0.01, found: 0.1.
-# - CMD="docker-compose run $DOCKER_ARG TestLotstep5"
+# - CMD="docker-compose run $DOCKER_ARG TestLotstep5" # @fixme
   - CMD="docker-compose run $DOCKER_ARG TestTimeframes"
   - CMD="docker-compose run $DOCKER_ARG TestBands"
   - CMD="docker-compose run $DOCKER_ARG TestEnvelopes"
   - CMD="docker-compose run $DOCKER_ARG TestModellingQuality"
-  - CMD="docker-compose run $DOCKER_ARG RunInstallMt4"
-  - CMD="docker-compose run $DOCKER_ARG RunInstallMt4x"
-  - CMD="docker-compose run $DOCKER_ARG RunInstallMt5"
+# - CMD="docker-compose run $DOCKER_ARG RunInstallMt4" # @fixme
+# - CMD="docker-compose run $DOCKER_ARG RunInstallMt4x" # @fixme
+# - CMD="docker-compose run $DOCKER_ARG RunInstallMt5" # @fixme
   - CMD="docker-compose run $DOCKER_ARG DockerLargeFiles"
 
 # Tests which suppose to be working in older versions only.
@@ -79,5 +79,7 @@ cache:
   apt: true
   pip: true
   directories:
+  - /var/cache
+  - /var/lib/docker
   - $HOME/.cache
   - $HOME/.docker

Dockerfile

@@ -23,8 +23,12 @@ WORKDIR /home/ubuntu
 
 # Build-time variables.
 ARG BT_DEST=/opt/results
-ARG MT_VER
+ARG HTTPS_PROXY
+ARG HTTP_PROXY
+ARG MT_VER=4.0.0.1010
 ARG PROVISION_AHK=1
+ARG PROVISION_CHARLES=1
+ARG PROVISION_MONO=0
 ARG PROVISION_SSH=0
 ARG PROVISION_SUDO=1
 ARG PROVISION_VNC=1
@@ -42,13 +46,13 @@ RUN chown ubuntu:root $BT_DEST
 VOLUME $BT_DEST
 
 # Default backtest inputs.
-ENV MT_VER 4.0.0.1010
+ENV MT_VER $MT_VER
 
 # Run test.
 USER ubuntu
 ADD conf /opt/conf
 ADD tests /opt/tests
-RUN eval.sh install_mt
+RUN eval.sh install_mt $MT_VER
 RUN eval.sh install_mteditor
 RUN run_backtest.sh -s PrintPaths -v
 

Makefile

@@ -8,7 +8,7 @@ DOCKER_CFG := ${HOME}/.docker/config.json
 BUILD_DATE := $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
 BUILD_VREF := $(shell git rev-parse --short HEAD)
 .PHONY: docker-load docker-build docker-login docker-tag docker-pull docker-push docker-run docker-save docker-clean
-docker-ci: docker-load docker-build docker-save
+docker-ci: docker-build
 docker-load:
 	if [[ -f $(DOCKER_TAR) ]]; then gzip -dc $(DOCKER_TAR) | docker load; fi
 docker-build:

README.md

@@ -133,12 +133,6 @@ to list available commands. Here is the list:
 # Run platform and kill it.
 # Usage: quick_run
 --
-# Set input value in the SET file.
-# Usage: input_set [key] [value] [file]
---
-# Get input value from the SET file.
-# Usage: input_get [key] [file]
---
 # Set value in the INI file.
 # Usage: ini_set [key] [value] [file]
 --

conf/mt4-tester.ini

@@ -10,13 +10,15 @@ Profile=default
 ;MarketWatch=set2.set
 
 ; Login - the number of the account to connect to at startup. If this parameter is not specified, the current login will be used.
-Login=1809640
+Login=3923113
 
 ; Password - the password that allows entering the system. This parameter will be ignored if the client terminal stores personal data on the disk and the account to be connected is in the list.
-Password=xxx
+Password=ple3eay
+; m1tsapk
+; ple3eay (investor)
 
 ; Server - the name of the trade server to be connected to. The server name is the same as the name of the corresponding .srv file stored in the /config directory. This parameter will be ignored if the information about the account to be connected was stored on the disk (e.g. MetaQuotes-demo).
-Server=default
+Server=FXCM-USDDemo01
 
 ; AutoConfiguration - "true" or "false" depending on whether the autoconfiguration setting should be enabled or not. If this parameter is not specified, the value from the current server settings will be used.
 AutoConfiguration=false
@@ -153,12 +155,12 @@ TestDateEnable=true
 ;
 ; The date, from which to start testing, appeared as YYYY.MM.DD.
 ; If this parameter has not been specified, this date is 1970.01.01
-TestFromDate=2017.01.01
+TestFromDate=2018.01.01
 
 ;
 ; The date, on which to finish testing, appeared as YYYY.MM.DD.
 ; If this parameter has not been specified, this date is 1970.01.01
-TestToDate=2017.01.31
+TestToDate=2018.01.31
 
 ;
 ; The name of the test report file.

docker-compose.yml

@@ -62,7 +62,8 @@ services:
     image: ea31337/ea-tester:EURUSD-2018-DS
     volumes:
     - ./scripts:/opt/scripts
-#   - ../EA-Tester/scripts:/opt/scripts
+    - ./tests:/opt/tests
+    - ./conf:/opt/conf
     environment:
       BT_DAYS: 10-12
       BT_MONTHS: 1
@@ -72,6 +73,8 @@ services:
     image: ea31337/ea-tester:EURUSD-2018-DS
     volumes:
     - ./scripts:/opt/scripts
+    - ./tests:/opt/tests
+    - ./conf:/opt/conf
     environment:
       BT_DAYS: 10-12
       BT_MONTHS: 1
@@ -81,6 +84,8 @@ services:
     image: ea31337/ea-tester:EURUSD-2018-DS
     volumes:
     - ./scripts:/opt/scripts
+    - ./tests:/opt/tests
+    - ./conf:/opt/conf
     environment:
       BT_DAYS: 10-12
       BT_MONTHS: 1
@@ -90,23 +95,39 @@ services:
     image: ea31337/ea-tester:EURUSD-2018-DS
     volumes:
     - ./scripts:/opt/scripts
+    - ./tests:/opt/tests
+    - ./conf:/opt/conf
     environment:
       BT_DAYS: 10-12
       BT_MONTHS: 1
       RUN_ON_START: clean_ea
+  TestLeverage:
+    command: run_backtest -e TestLeverage
+    image: ea31337/ea-tester:EURUSD-2018-DS
+    volumes:
+    - ./scripts:/opt/scripts
+    - ./tests:/opt/tests
+    - ./conf:/opt/conf
+    environment:
+      BT_DAYS: 10-12
+      BT_MONTHS: 1
   TestLotstep4:
-    command: run_backtest -e TestLotstep -D 4
+    command: run_backtest -e TestLotstep -D4 -l 0.1
     image: ea31337/ea-tester:EURUSD-2018-DS
     volumes:
     - ./scripts:/opt/scripts
+    - ./tests:/opt/tests
+    - ./conf:/opt/conf
     environment:
       BT_DAYS: 10-12
       BT_MONTHS: 1
   TestLotstep5:
-    command: run_backtest -e TestLotstep -D 5
+    command: run_backtest -e TestLotstep -D5 -l 0.01
     image: ea31337/ea-tester:EURUSD-2018-DS
     volumes:
     - ./scripts:/opt/scripts
+    - ./tests:/opt/tests
+    - ./conf:/opt/conf
     environment:
       BT_DAYS: 10-12
       BT_MONTHS: 1
@@ -115,6 +136,8 @@ services:
     image: ea31337/ea-tester:EURUSD-2018-DS
     volumes:
     - ./scripts:/opt/scripts
+    - ./tests:/opt/tests
+    - ./conf:/opt/conf
     environment:
       BT_DAYS: 10-12
       BT_MONTHS: 1
@@ -123,6 +146,8 @@ services:
     image: ea31337/ea-tester:EURUSD-2018-DS
     volumes:
     - ./scripts:/opt/scripts
+    - ./tests:/opt/tests
+    - ./conf:/opt/conf
     environment:
       BT_DAYS: 10-12
       BT_MONTHS: 1
@@ -132,6 +157,8 @@ services:
     image: ea31337/ea-tester:EURUSD-2018-DS
     volumes:
     - ./scripts:/opt/scripts
+    - ./tests:/opt/tests
+    - ./conf:/opt/conf
     environment:
       BT_DAYS: 10-12
       BT_MONTHS: 1
@@ -140,6 +167,8 @@ services:
     image: ea31337/ea-tester:EURUSD-2018-DS
     volumes:
     - ./scripts:/opt/scripts
+    - ./tests:/opt/tests
+    - ./conf:/opt/conf
     environment:
       BT_DAYS: 10-12
       BT_MONTHS: 1
@@ -148,6 +177,8 @@ services:
     image: ea31337/ea-tester:EURUSD-2018-DS
     volumes:
     - ./scripts:/opt/scripts
+    - ./tests:/opt/tests
+    - ./conf:/opt/conf
     environment:
       BT_DAYS: 10-12
       BT_MONTHS: 1
@@ -156,6 +187,8 @@ services:
     image: ea31337/ea-tester:EURUSD-2018-DS
     volumes:
     - ./scripts:/opt/scripts
+    - ./tests:/opt/tests
+    - ./conf:/opt/conf
     environment:
       BT_DAYS: 10-12
       BT_MONTHS: 1
@@ -164,6 +197,8 @@ services:
     image: ea31337/ea-tester:EURUSD-2018-DS
     volumes:
     - ./scripts:/opt/scripts
+    - ./tests:/opt/tests
+    - ./conf:/opt/conf
     environment:
       BT_DAYS: 10-12
       BT_MONTHS: 1
@@ -172,6 +207,8 @@ services:
     image: ea31337/ea-tester:EURUSD-2018-DS
     volumes:
     - ./scripts:/opt/scripts
+    - ./tests:/opt/tests
+    - ./conf:/opt/conf
     environment:
       BT_DAYS: 10-12
       BT_MONTHS: 1
@@ -183,3 +220,5 @@ services:
     image: ea31337/ea-tester:dev
     volumes:
     - ./scripts:/opt/scripts
+    - ./tests:/opt/tests
+    - ./conf:/opt/conf

scripts/.funcs.cmds.inc.sh

@@ -384,25 +384,6 @@ compile_and_test() {
   $CWD/run_backtest.sh -e "$@"
 }
 
-# Experts SET file. Returns exported filename.
-# Usage: export_set [EA/pattern] (dst/file) (...args)
-export_set() {
-  local name=${1:-$TEST_EXPERT}
-  local dstfile=${2:-${name}.set}
-  local ea_path=$name
-  local ahk_path="$(winepath -w "$SCR"/ahk/export_set.ahk)"
-  [ ! -s "$name" ] && ea_path=$(ea_find "${name##/}")
-  [ ! -f "$EXPERTS_DIR/$ea_path" ] && { echo "Error: Cannot find EA: ${name}!" >&2; return; }
-  [[ "$ea_path" =~ 'mq' ]] && compile_ea "$name" >&2
-  set_display >&2
-  ini_set "^Expert" "$(basename ${ea_path/\//\\\\} .${ea_path##*.})" "$TERMINAL_INI"
-  WINEPATH="$(winepath -w "$TERMINAL_DIR");C:\\Apps\\AHK" \
-  timeout 60 \
-  wine AutoHotkey /ErrorStdOut "$ahk_path" "${dstfile}" ${@:3}
-  [ -n "$OPT_VERBOSE" ] && times >&2
-  echo "${dstfile}"
-}
-
 # Copy ini settings from templates.
 # Usage: ini_copy
 ini_copy() {
@@ -428,8 +409,14 @@ ea_find() {
     file=${file##*/}
   fi
   [ -f "$file" ] && { echo "$file"; return; }
-  local exact=$(find -L . "$ROOT" ~ -maxdepth 4 -type f '(' -iname "$file" -o -iname "${file%.*}.mq?" -o -name "${file%.*}.ex?" ')' -print -quit)
-  local match=$(find -L . "$ROOT" ~ -maxdepth 4 -type f '(' -iname "*${file%.*}*.mq?" -o -iname "*${file%.*}*.ex?" ')' -print -quit)
+  exact=$(
+    find -L . "$ROOT" ~ -maxdepth 4 -type f '(' -iname "$file" -o -iname "${file%.*}.mq?" ')' -print -quit || \
+    find -L . "$ROOT" ~ -maxdepth 4 -type f '(' -iname "$file" -o -name "${file%.*}.ex?" ')' -print -quit
+  )
+  [ -z "$exact" ] && match=$(
+    find -L . "$ROOT" ~ -maxdepth 4 -type f -iname "*${file%.*}*.mq?" -print -quit || \
+    find -L . "$ROOT" ~ -maxdepth 4 -type f -iname "*${file%.*}*.ex?" -print -quit
+  )
   [ -n "$exact" ] && echo ${exact#./} || echo ${match#./}
   cd - &>/dev/null
 }
@@ -448,8 +435,14 @@ script_find() {
     file=${file##*/}
   fi
   [ -f "$file" ] && { echo "$file"; return; }
-  local exact=$(find -L . "$ROOT" ~ -maxdepth 4 -type f '(' -iname "$file" -o -name "${file%.*}.ex?" ')' -print -quit)
-  local match=$(find -L . "$ROOT" ~ -maxdepth 4 -type f '(' -iname "*${file%.*}*.mq?" -o -iname "*${file%.*}*.ex?" ')' -print -quit)
+  exact=$(
+    find -L . "$ROOT" ~ -maxdepth 4 -type f '(' -iname "$file" -o -iname "${file%.*}.mq?" ')' -print -quit || \
+    find -L . "$ROOT" ~ -maxdepth 4 -type f '(' -iname "$file" -o -iname "${file%.*}.ex?" ')' -print -quit
+  )
+  [ -z "$exact" ] && match=$(
+    find -L . "$ROOT" ~ -maxdepth 4 -type f -iname "*${file%.*}*.mq?" -print -quit || \
+    find -L . "$ROOT" ~ -maxdepth 4 -type f -iname "*${file%.*}*.ex?" -print -quit
+  )
   [ -n "$exact" ] && echo ${exact#./} || echo ${match#./}
   cd - &>/dev/null
 }
@@ -826,57 +819,6 @@ quick_run() {
   show_logs 40
 }
 
-# Set input value in the SET file.
-# Usage: input_set [key] [value] [file]
-input_set() {
-  local key="$1"
-  local value="$2"
-  local file="${3:-$TESTER_DIR/$EA_SETFILE}"
-  [ -s "$file" ]
-  read -ra vargs <<<$EX_ARGS
-  vargs+=("-u NONE")
-  if [ -n "$value" ]; then
-    echo "Setting '$key' to '$value' in $(basename "$file")" >&2
-    ex +"%s/$key=\zs.*$/$value/" -scwq! ${vargs[@]} "$file" >&2 || exit 1
-  else
-    echo "Value for '$key' is empty, ignoring." >&2
-  fi
-}
-
-# Get input value from the SET file.
-# Usage: input_get [key] [file]
-input_get() {
-  local key="$1"
-  local file="${2:-$TESTER_DIR/$EA_SETFILE}"
-  [ -s "$file" ]
-  value="$(grep -om1 "$key=[.0-9a-zA-Z-]\+" "$file" | cut -d= -f2-)"
-  echo $value
-}
-
-# Copy input value from the SET file to MQL file.
-# Usage: input_copy [key] [src_file] [dst_file] (dst_file2...)
-input_copy() {
-  local key=$1
-  local file_src=$2
-  local retries=5
-  read -ra files <<<${@:3}
-  read -ra vargs <<<$EX_ARGS
-  vargs+=("-u NONE")
-  [ -s "$file_src" ]
-  for file_dst in "${files[@]}"; do
-    [ -s "$file_dst" ]
-    value=$(input_get "^$key" "$file_src")
-    echo "Setting '$key' to '$value' in $(basename "$file_dst")" >&2
-    retries=5
-    while ! ex +"%s/\s${key}[^=]=[^0-9]\zs[^;]\+/${value}/" -scwq! ${vargs[@]} "$file_dst" >&2; do
-      sleep 1
-      ((retries-=1))
-      echo "Retrying ($retries left)..." >&2
-      [ $retries -le 0 ] && break
-    done
-  done
-}
-
 # Set value in the INI file.
 # Usage: ini_set [key] [value] [file]
 ini_set() {
@@ -1028,5 +970,4 @@ set_digits() {
   set_symbol_value $digits $SRAW_OFF_DIGITS
   psize="0.$(for ((i=1;i<=digits-1;i++)); do printf 0; done)1"
   set_symbol_double $psize $SRAW_OFF_PSIZE
-  cp $VFLAG "$ROOT/conf/accounts-d${digits}.ini" "$TERMINAL_DIR"/config/accounts.ini
 }