Display proper missing argument name
Find and show argument name instead of showing argument of 'dest' Add functional test for this Remove test_cli_utils.py -> utils.py because this actually utils, not tests. Change-Id: Icc138ecf40b4929826efcad52c135c8809348d20 Closes-Bug: #1380562
This commit is contained in:
parent
ccf842044b
commit
7f85fe911c
0
tests/functional/__init__.py
Normal file
0
tests/functional/__init__.py
Normal file
@ -13,12 +13,12 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
|
||||||
import json
|
import json
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
import test_cli_utils as utils
|
|
||||||
|
from tests.functional import utils
|
||||||
|
|
||||||
|
|
||||||
class DeploymentTestCase(unittest.TestCase):
|
class DeploymentTestCase(unittest.TestCase):
|
||||||
|
@ -13,12 +13,12 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
import test_cli_utils as utils
|
|
||||||
|
from tests.functional import utils
|
||||||
|
|
||||||
|
|
||||||
class TaskTestCase(unittest.TestCase):
|
class TaskTestCase(unittest.TestCase):
|
||||||
|
100
tests/functional/utils.py
Normal file
100
tests/functional/utils.py
Normal file
@ -0,0 +1,100 @@
|
|||||||
|
# Copyright 2013: Mirantis Inc.
|
||||||
|
# All Rights Reserved.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||||
|
# not use this file except in compliance with the License. You may obtain
|
||||||
|
# a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
# License for the specific language governing permissions and limitations
|
||||||
|
# under the License.
|
||||||
|
|
||||||
|
import ConfigParser
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import pwd
|
||||||
|
import shutil
|
||||||
|
import subprocess
|
||||||
|
import tempfile
|
||||||
|
|
||||||
|
|
||||||
|
TEST_ENV = {
|
||||||
|
"OS_USERNAME": "admin",
|
||||||
|
"OS_PASSWORD": "admin",
|
||||||
|
"OS_TENANT_NAME": "admin",
|
||||||
|
"OS_AUTH_URL": "http://fake/",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class RallyCmdError(Exception):
|
||||||
|
|
||||||
|
def __init__(self, code, output):
|
||||||
|
self.code = code
|
||||||
|
self.output = output
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return "Code: %d Output: %s\n" % (self.code, self.output)
|
||||||
|
|
||||||
|
def __unicode__(self):
|
||||||
|
return "Code: %d Output: %s\n" % (self.code, self.output)
|
||||||
|
|
||||||
|
|
||||||
|
class TaskConfig(object):
|
||||||
|
|
||||||
|
def __init__(self, config):
|
||||||
|
config_file = tempfile.NamedTemporaryFile(delete=False)
|
||||||
|
config_file.write(json.dumps(config))
|
||||||
|
config_file.close()
|
||||||
|
self.filename = config_file.name
|
||||||
|
|
||||||
|
def __del__(self):
|
||||||
|
os.unlink(self.filename)
|
||||||
|
|
||||||
|
|
||||||
|
class Rally(object):
|
||||||
|
"""Create and represent separate rally installation.
|
||||||
|
|
||||||
|
Usage:
|
||||||
|
|
||||||
|
rally = Rally()
|
||||||
|
rally("deployment", "create", "--name", "Some Deployment Name")
|
||||||
|
output = rally("deployment list")
|
||||||
|
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self, fake=False):
|
||||||
|
# NOTE(sskripnick): we shoud change home dir to avoid races
|
||||||
|
# and do not touch any user files in ~/.rally
|
||||||
|
os.environ["HOME"] = pwd.getpwuid(os.getuid()).pw_dir
|
||||||
|
subprocess.call("rally deployment config > /tmp/.rd.json", shell=True)
|
||||||
|
self.tmp_dir = tempfile.mkdtemp()
|
||||||
|
os.environ["HOME"] = self.tmp_dir
|
||||||
|
config_filename = os.path.join(self.tmp_dir, "conf")
|
||||||
|
config = ConfigParser.RawConfigParser()
|
||||||
|
config.add_section("database")
|
||||||
|
config.set("database", "connection", "sqlite:///%s/db" % self.tmp_dir)
|
||||||
|
with open(config_filename, "wb") as conf:
|
||||||
|
config.write(conf)
|
||||||
|
self.args = ["rally", "--config-file", config_filename]
|
||||||
|
subprocess.call(["rally-manage", "--config-file", config_filename,
|
||||||
|
"db", "recreate"])
|
||||||
|
self("deployment create --file /tmp/.rd.json --name MAIN")
|
||||||
|
|
||||||
|
def __del__(self):
|
||||||
|
shutil.rmtree(self.tmp_dir)
|
||||||
|
|
||||||
|
def __call__(self, cmd, getjson=False):
|
||||||
|
if not isinstance(cmd, list):
|
||||||
|
cmd = cmd.split(" ")
|
||||||
|
try:
|
||||||
|
output = subprocess.check_output(self.args + cmd,
|
||||||
|
stderr=subprocess.STDOUT)
|
||||||
|
if getjson:
|
||||||
|
return json.loads(output)
|
||||||
|
return output
|
||||||
|
except subprocess.CalledProcessError as e:
|
||||||
|
raise RallyCmdError(e.returncode, e.output)
|
Loading…
x
Reference in New Issue
Block a user