x/gantt
Code Issues Proposed changes

remove changes to test db

Browse Source
This commit is contained in:
Vishvananda Ishaya
2011-02-21 16:05:28 -08:00
parent b0cf75af1f
commit 76ecd8daec
4 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/nova-dhcpbridge
View File

@@ -113,7 +113,7 @@ def main():
FLAGS.num_networks = 5 FLAGS.num_networks = 5
path = os.path.abspath(os.path.join(os.path.dirname(__file__), path = os.path.abspath(os.path.join(os.path.dirname(__file__),
'..', '..',
'tests.sqlite')) 'nova.sqlite'))
FLAGS.sql_connection = 'sqlite:///%s' % path FLAGS.sql_connection = 'sqlite:///%s' % path
action = argv[1] action = argv[1]
if action in ['add', 'del', 'old']: if action in ['add', 'del', 'old']:

2
nova/tests/fake_flags.py
View File

@@ -39,6 +39,6 @@ FLAGS.num_shelves = 2
FLAGS.blades_per_shelf = 4 FLAGS.blades_per_shelf = 4
FLAGS.iscsi_num_targets = 8 FLAGS.iscsi_num_targets = 8
FLAGS.verbose = True FLAGS.verbose = True
FLAGS.sql_connection = 'sqlite:///tests.sqlite' FLAGS.sql_connection = 'sqlite:///nova.sqlite'
FLAGS.use_ipv6 = True FLAGS.use_ipv6 = True
FLAGS.logfile = 'tests.log' FLAGS.logfile = 'tests.log'

2
run_tests.py
View File

@@ -59,8 +59,6 @@ class NovaTestRunner(core.TextTestRunner):
if __name__ == '__main__': if __name__ == '__main__':
if os.path.exists("tests.sqlite"):
os.unlink("tests.sqlite")
logging.setup() logging.setup()
c = config.Config(stream=sys.stdout, c = config.Config(stream=sys.stdout,
env=os.environ, env=os.environ,

2
run_tests.sh
View File

@@ -40,7 +40,7 @@ done
function run_tests { function run_tests {
# Just run the test suites in current environment # Just run the test suites in current environment
${wrapper} rm -f nova.sqlite ${wrapper} rm -f nova.sqlite
${wrapper} $NOSETESTS 2> run_tests.err.log ${wrapper} $NOSETESTS
} }
NOSETESTS="python run_tests.py $noseargs" NOSETESTS="python run_tests.py $noseargs"