From fcb0b22e2ab62c4bfb0407e35fcb2e4659b20cf8 Mon Sep 17 00:00:00 2001
From: Boden R <bodenvmw@gmail.com>
Date: Mon, 5 Mar 2018 10:32:55 -0700
Subject: [PATCH] migrate to stestr

ostestr is no longer installed by default by infra and will be totally
removed longer term; stestr [1] is its replacement.

This is the reason out gate is failing with the following today:

nsx/tools/ostestr_compat_shim.sh: ostestr: not found

This patch moves us to stestr by:
- Updating tox.ini to use stestr rather than call ostestr_compat_shim.sh
and in turn ostestr.
- Removing ostestr_compat_shim.sh as its no longer used.

For more details on stestr see [1].

Also note that this is a quick migration to stestr to get the gate
working; additional tweaks may come up.

[1] http://stestr.readthedocs.io/en/latest/MANUAL.html

Change-Id: I9a871d3542c2f2615d757c0009ea3d6695f0e3f7
(cherry picked from commit 7223bbf96311ed286d1cde00038b0b749e753934)
---
 .stestr.conf                 | 3 +++
 tools/ostestr_compat_shim.sh | 8 --------
 tox.ini                      | 6 ++++--
 3 files changed, 7 insertions(+), 10 deletions(-)
 create mode 100644 .stestr.conf
 delete mode 100755 tools/ostestr_compat_shim.sh

diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000000..d918ebf7f7
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./vmware_nsx/tests/unit
+top_dir=./
diff --git a/tools/ostestr_compat_shim.sh b/tools/ostestr_compat_shim.sh
deleted file mode 100755
index a483ed1a1e..0000000000
--- a/tools/ostestr_compat_shim.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# preserve old behavior of using an arg as a regex when '--' is not present
-case $@ in
-  (*--*) ostestr $@;;
-  ('') ostestr;;
-  (*) ostestr --regex "$@"
-esac
diff --git a/tox.ini b/tox.ini
index 4e40361add..c3dd207c42 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,8 @@ deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 whitelist_externals = sh
 commands =
-  {toxinidir}/tools/ostestr_compat_shim.sh {posargs}
+ stestr run {posargs}
+ stestr slowest
 # there is also secret magic in ostestr which lets you run in a fail only
 # mode. To do this define the TRACE_FAILONLY environmental variable.
 
@@ -41,7 +42,8 @@ sitepackages=True
 deps =
   {[testenv:functional]deps}
 commands =
-  {toxinidir}/tools/ostestr_compat_shim.sh {posargs}
+ stestr run {posargs}
+ stestr slowest
 
 [tox:jenkins]
 sitepackages = True