From 698f9cbb6196cf0fbecb1999fde79ec207ede1c3 Mon Sep 17 00:00:00 2001
From: Benjy Weinberger <benjyw@gmail.com>
Date: Wed, 10 Apr 2019 16:00:10 +0300
Subject: [PATCH] Run tests in src dirs in ci. (#7524)

This will allow us to start moving tests from the tests folder to the src folder. See #7489.
---
 build-support/bin/ci.sh        | 8 ++++----
 build-support/bin/unit-test.sh | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build-support/bin/ci.sh b/build-support/bin/ci.sh
index fe944a3cc08..0d655c044a9 100755
--- a/build-support/bin/ci.sh
+++ b/build-support/bin/ci.sh
@@ -202,7 +202,7 @@ if [[ "${run_internal_backends:-false}" == "true" ]]; then
   start_travis_section "BackendTests" "Running internal backend python tests"
   (
     ./pants.pex test.pytest \
-    pants-plugins/tests/python:: -- ${PYTEST_PASSTHRU_ARGS}
+    pants-plugins/src/python:: pants-plugins/tests/python:: -- ${PYTEST_PASSTHRU_ARGS}
   ) || die "Internal backend python test failure"
   end_travis_section
 fi
@@ -215,7 +215,7 @@ if [[ "${run_python:-false}" == "true" ]]; then
   (
     ./pants.pex --tag='-integration' test.pytest --chroot \
       --test-pytest-test-shard=${python_unit_shard} \
-      tests/python:: -- ${PYTEST_PASSTHRU_ARGS}
+      src/python:: tests/python:: -- ${PYTEST_PASSTHRU_ARGS}
   ) || die "Core python test failure"
   end_travis_section
 fi
@@ -275,7 +275,7 @@ if [[ "${test_platform_specific_behavior:-false}" == 'true' ]]; then
                        "Running platform-specific testing on platform: $(uname)"
   (
     ./pants.pex --tag='+platform_specific_behavior' test \
-                tests/python:: -- ${PYTEST_PASSTHRU_ARGS}
+                src/python/:: tests/python:: -- ${PYTEST_PASSTHRU_ARGS}
   ) || die "Pants platform-specific test failure"
   end_travis_section
 fi
@@ -289,7 +289,7 @@ if [[ "${run_integration:-false}" == "true" ]]; then
   (
     ./pants.pex --tag='+integration' test.pytest \
       --test-pytest-test-shard=${python_intg_shard} \
-      tests/python:: -- ${PYTEST_PASSTHRU_ARGS}
+      src/python:: tests/python:: -- ${PYTEST_PASSTHRU_ARGS}
   ) || die "Pants Integration test failure"
   end_travis_section
 fi
diff --git a/build-support/bin/unit-test.sh b/build-support/bin/unit-test.sh
index dc1798edbd0..d9d5a1ad2c4 100755
--- a/build-support/bin/unit-test.sh
+++ b/build-support/bin/unit-test.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 set -e
-./pants test tests/python/pants_test:: --tag=-integration
+./pants test src/python/pants:: tests/python/pants_test:: --tag=-integration