[verifiers] Fix identification of testr/stestr

With Ibcb949ad98323f770bf20f144ad66b4a47c00e22 the support of stestr was
added.
Unfortunately, this commit included a wrong check for testr config file
which is an identifier what interface should be used (testr or stestr)
to launch tests, so stestr was used for all cases.

Also, this patch temporary turns off verification gates, since it
contains a bug related to openstack roles configuration which make
tempest verifier fail. Since we are planning to remove openstack related
code from the main repository, this issue should be solved in
rally-openstack repository.

Change-Id: I691503901c6d1c6ceed79035b0df8bd752d912bd
Closes-Bug: #1777757
This commit is contained in:
Andrey Kurilin 2018-06-20 15:36:29 +03:00
parent 85d7eb3760
commit 86cd7dfa5c
3 changed files with 5 additions and 2 deletions

View File

@ -93,7 +93,8 @@ class TestrLauncher(manager.VerifierManager):
def __init__(self, *args, **kwargs):
super(TestrLauncher, self).__init__(*args, **kwargs)
self._use_testr = os.path.exists(os.path.join(self.repo_dir, ".testr"))
self._use_testr = os.path.exists(os.path.join(
self.repo_dir, ".testr.conf"))
@property
def run_environ(self):

View File

@ -508,6 +508,7 @@ def main():
parser.add_argument("--ctx-create-resources", action="store_true",
help="Make Tempest context create needed resources "
"for the tests.")
return
args = parser.parse_args()
@ -523,5 +524,6 @@ def main():
return 0
return 1
if __name__ == "__main__":
sys.exit(main())

View File

@ -250,7 +250,7 @@ class TestrLauncherTestCase(test.TestCase):
mock_rmtree):
launcher = testr.TestrLauncher(mock.Mock())
mock_exists.assert_called_once_with(
os.path.join(launcher.repo_dir, ".testr"))
os.path.join(launcher.repo_dir, ".testr.conf"))
mock_exists.reset_mock()
# case #1: testr already initialized