openstack/rally-openstack
Code Issues Proposed changes

Add option to keep db settings in functional tests

Browse Source 
Also use six.configparser to fix py3 compatibility

Change-Id: If75b5c5439f679e5b01078f18faecede0d104916
This commit is contained in:
Sergey Skripnick 2015-01-30 13:32:59 +02:00
parent f42faded0f
commit 487cc5538b
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tests/functional/utils.py
View File

@ -13,7 +13,8 @@
# 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 ConfigParser from six.moves import configparser
import json import json
import os import os
import pwd import pwd
@ -21,7 +22,6 @@ import shutil
import subprocess import subprocess
import tempfile import tempfile
TEST_ENV = { TEST_ENV = {
"OS_USERNAME": "admin", "OS_USERNAME": "admin",
"OS_PASSWORD": "admin", "OS_PASSWORD": "admin",
@ -29,6 +29,8 @@ TEST_ENV = {
"OS_AUTH_URL": "http://fake/", "OS_AUTH_URL": "http://fake/",
} }
DEPLOYMENT_FILE = "/tmp/rally_functests_main_deployment.json"
class RallyCmdError(Exception): class RallyCmdError(Exception):
@ -47,7 +49,7 @@ class TaskConfig(object):
def __init__(self, config): def __init__(self, config):
config_file = tempfile.NamedTemporaryFile(delete=False) config_file = tempfile.NamedTemporaryFile(delete=False)
config_file.write(json.dumps(config)) config_file.write(json.dumps(config).encode("utf-8"))
config_file.close() config_file.close()
self.filename = config_file.name self.filename = config_file.name
@ -70,19 +72,28 @@ class Rally(object):
# NOTE(sskripnick): we shoud change home dir to avoid races # NOTE(sskripnick): we shoud change home dir to avoid races
# and do not touch any user files in ~/.rally # and do not touch any user files in ~/.rally
os.environ["HOME"] = pwd.getpwuid(os.getuid()).pw_dir os.environ["HOME"] = pwd.getpwuid(os.getuid()).pw_dir
subprocess.call("rally deployment config > /tmp/.rd.json", shell=True) if not os.path.exists(DEPLOYMENT_FILE):
subprocess.call("rally deployment config > %s" % DEPLOYMENT_FILE,
shell=True)
self.tmp_dir = tempfile.mkdtemp() self.tmp_dir = tempfile.mkdtemp()
os.environ["HOME"] = self.tmp_dir os.environ["HOME"] = self.tmp_dir
if "RCI_KEEP_DB" not in os.environ:
config_filename = os.path.join(self.tmp_dir, "conf") config_filename = os.path.join(self.tmp_dir, "conf")
config = ConfigParser.RawConfigParser() config = configparser.RawConfigParser()
config.add_section("database") config.add_section("database")
config.set("database", "connection", "sqlite:///%s/db" % self.tmp_dir) config.set("database", "connection",
with open(config_filename, "wb") as conf: "sqlite:///%s/db" % self.tmp_dir)
with open(config_filename, "w") as conf:
config.write(conf) config.write(conf)
self.args = ["rally", "--config-file", config_filename] self.args = ["rally", "--config-file", config_filename]
subprocess.call(["rally-manage", "--config-file", config_filename, subprocess.call(["rally-manage", "--config-file", config_filename,
"db", "recreate"]) "db", "recreate"])
self("deployment create --file /tmp/.rd.json --name MAIN") else:
self.args = ["rally"]
subprocess.call(["rally-manage", "db", "recreate"])
self("deployment create --file %s --name MAIN" % DEPLOYMENT_FILE)
def __del__(self): def __del__(self):
shutil.rmtree(self.tmp_dir) shutil.rmtree(self.tmp_dir)
@ -95,6 +106,6 @@ class Rally(object):
stderr=subprocess.STDOUT) stderr=subprocess.STDOUT)
if getjson: if getjson:
return json.loads(output) return json.loads(output)
return output return output.decode("utf-8")
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
raise RallyCmdError(e.returncode, e.output) raise RallyCmdError(e.returncode, e.output)