Merge before and script

Signed-off-by: Ana Hobden <[email protected]>

Author: Hoverbear

.travis.yml

@@ -13,8 +13,6 @@ env:
   global:
     - RUST_BACKTRACE=1
     - RUSTFLAGS="-D warnings"
-    - PD_ADDR="127.0.0.1:2379"
-    - TIKV_ADDR="127.0.0.1:2378"
 
 install:
   - if [[ $TRAVIS_RUST_VERSION == "stable" && $TRAVIS_OS_NAME == "linux" ]]; then rustup component add rustfmt; fi
@@ -23,13 +21,10 @@ install:
   - if [[ $TRAVIS_OS_NAME == "windows" ]]; then choco install cmake; fi
   - if [[ $TRAVIS_OS_NAME == "windows" ]]; then export PATH="$PATH:/c/Go/bin/:/c/Program Files/CMake/bin"; fi
 
-
-before_script:
+script:
   - if [[ $TRAVIS_RUST_VERSION == "stable" && $TRAVIS_OS_NAME == "linux" ]]; then cargo fmt -- --check; fi
   # Currently some crates have lint errors if clippy checks them.
   - if [[ $TRAVIS_RUST_VERSION == "stable" && $TRAVIS_OS_NAME == "linux" ]]; then cargo clippy -- -D clippy::all; fi
-
-script:
   - cargo test --all -- --nocapture
   # We need to switch the daemon of Windows to use Linux docker containers.
   - if [[ $TRAVIS_OS_NAME == "windows" ]]; then "/c/Program Files/Docker/Docker/DockerCli.exe" -SwitchDaemon .; fi