From 1c586f27738ee6fd6bece1690eed29a130ac1bc7 Mon Sep 17 00:00:00 2001
From: Andrey Kurilin <andr.kurilin@gmail.com>
Date: Sun, 9 Apr 2017 13:02:42 +0300
Subject: [PATCH] [ci] remove pytest-xdist dependency

Due to https://github.com/pypa/setuptools_scm/issues/164 we are unable
to install pytest-xdist

Change-Id: I52da4b071a1c57270e7dfbbe981a8eeeb839aba1
---
 test-requirements.txt       | 4 ----
 tests/ci/cover.sh           | 4 ++--
 tests/ci/pytest_launcher.py | 3 ---
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index 6ec4d044..15cc12f4 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,10 +9,6 @@ pytest>=2.7,<=3.0.7                                    # MIT
 pytest-cov>=2.2.1,<=2.4.0                              # MIT
 # py.test plugin for generating HTML reports
 pytest-html>=1.10.0,<=1.14.2                           # Mozilla Public License 2.0 (MPL 2.0)
-# py.test xdist plugin for distributed testing and loop-on-failing modes
-pytest-xdist<=1.15.0                                   # MIT
-# py.test plugin to abort hanging tests
-pytest-timeout<=1.2.0                                  # MIT
 
 coverage>=4.0,<=4.3.4                                  # Apache License, Version 2.0
 ddt>=1.0.1,<=1.1.1
diff --git a/tests/ci/cover.sh b/tests/ci/cover.sh
index 81fdb87f..889d4c44 100755
--- a/tests/ci/cover.sh
+++ b/tests/ci/cover.sh
@@ -33,7 +33,7 @@ fi
 git checkout HEAD^
 
 baseline_report=$(mktemp -t rally_coverageXXXXXXX)
-py.test --cov=rally tests/unit/ --cov-report=html --timeout=60 -n auto
+py.test --cov=rally tests/unit/ --cov-report=html
 coverage report > $baseline_report
 mv cover cover-master
 cat $baseline_report
@@ -43,7 +43,7 @@ baseline_missing=$(awk 'END { print $3 }' $baseline_report)
 git checkout -
 
 current_report=$(mktemp -t rally_coverageXXXXXXX)
-py.test --cov=rally tests/unit/ --cov-report=html --timeout=60 -n auto
+py.test --cov=rally tests/unit/ --cov-report=html
 coverage report > $current_report
 current_missing=$(awk 'END { print $3 }' $current_report)
 
diff --git a/tests/ci/pytest_launcher.py b/tests/ci/pytest_launcher.py
index 98d8e387..045206d1 100755
--- a/tests/ci/pytest_launcher.py
+++ b/tests/ci/pytest_launcher.py
@@ -21,12 +21,9 @@ PYTEST_REPORT = os.environ.get("PYTEST_REPORT",
                                ".test_results/pytest_results.html")
 TESTR_REPORT = "testr_results.html"
 PYTEST_ARGUMENTS = ("py.test"  # base command
-                    " -vv"  # show test names in logs
                     " --html=%(html_report)s"  # html report
                     " --self-contained-html"  # embedded css
                     " --durations=10"  # get a list of the slowest 10 tests
-                    " -n auto"  # launch tests in parallel
-                    " --timeout=%(timeout)s"  # timeout for individual test
                     " %(path)s"
                     )