Rename _useBuilder method to useBuilder

Consistency in method naming and usage is good...  mmmkay?

Change-Id: I87d1d54807dd73f74ad86fb72ad4c8d98fbd5acb
This commit is contained in:
David Shrewsbury 2018-01-08 13:59:16 -05:00
parent 477a40044b
commit 26b122d131
5 changed files with 55 additions and 55 deletions

View File

@ -475,7 +475,7 @@ class DBTestCase(BaseTestCase):
self.addCleanup(app.stop)
return app
def _useBuilder(self, configfile, securefile=None, cleanup_interval=.5):
def useBuilder(self, configfile, securefile=None, cleanup_interval=.5):
self.useFixture(
BuilderFixture(configfile, cleanup_interval, securefile)
)

View File

@ -99,7 +99,7 @@ class TestNodePoolBuilder(tests.DBTestCase):
def test_builder_id_file(self):
configfile = self.setup_config('node.yaml')
self._useBuilder(configfile)
self.useBuilder(configfile)
path = os.path.join(self._config_images_dir.path, 'builder_id.txt')
# Validate the unique ID file exists and contents are what we expect
@ -126,7 +126,7 @@ class TestNodePoolBuilder(tests.DBTestCase):
pool = self.useNodepool(configfile, watermark_sleep=1)
# NOTE(pabelanger): Disable CleanupWorker thread for nodepool-builder
# as we currently race it to validate our failed uploads.
self._useBuilder(configfile, cleanup_interval=0)
self.useBuilder(configfile, cleanup_interval=0)
pool.start()
self.waitForImage('fake-provider', 'fake-image')
nodes = self.waitForNodes('fake-label')
@ -142,14 +142,14 @@ class TestNodePoolBuilder(tests.DBTestCase):
def test_provider_addition(self):
configfile = self.setup_config('node.yaml')
self._useBuilder(configfile)
self.useBuilder(configfile)
self.waitForImage('fake-provider', 'fake-image')
self.replace_config(configfile, 'node_two_provider.yaml')
self.waitForImage('fake-provider2', 'fake-image')
def test_provider_removal(self):
configfile = self.setup_config('node_two_provider.yaml')
self._useBuilder(configfile)
self.useBuilder(configfile)
self.waitForImage('fake-provider', 'fake-image')
self.waitForImage('fake-provider2', 'fake-image')
image = self.zk.getMostRecentImageUpload('fake-provider', 'fake-image')
@ -160,14 +160,14 @@ class TestNodePoolBuilder(tests.DBTestCase):
def test_image_addition(self):
configfile = self.setup_config('node.yaml')
self._useBuilder(configfile)
self.useBuilder(configfile)
self.waitForImage('fake-provider', 'fake-image')
self.replace_config(configfile, 'node_two_image.yaml')
self.waitForImage('fake-provider', 'fake-image2')
def test_image_removal(self):
configfile = self.setup_config('node_two_image.yaml')
self._useBuilder(configfile)
self.useBuilder(configfile)
self.waitForImage('fake-provider', 'fake-image')
self.waitForImage('fake-provider', 'fake-image2')
self.replace_config(configfile, 'node_two_image_remove.yaml')
@ -179,7 +179,7 @@ class TestNodePoolBuilder(tests.DBTestCase):
def _test_image_rebuild_age(self, expire=86400):
configfile = self.setup_config('node.yaml')
self._useBuilder(configfile)
self.useBuilder(configfile)
build = self.waitForBuild('fake-image', '0000000001')
image = self.waitForImage('fake-provider', 'fake-image')
# Expire rebuild-age (default: 1day) to force a new build.
@ -257,7 +257,7 @@ class TestNodePoolBuilder(tests.DBTestCase):
def test_cleanup_hard_upload_fails(self):
configfile = self.setup_config('node.yaml')
self._useBuilder(configfile)
self.useBuilder(configfile)
self.waitForImage('fake-provider', 'fake-image')
upload = self.zk.getUploads('fake-image', '0000000001',
@ -282,7 +282,7 @@ class TestNodePoolBuilder(tests.DBTestCase):
def test_cleanup_failed_image_build(self):
configfile = self.setup_config('node_diskimage_fail.yaml')
self._useBuilder(configfile)
self.useBuilder(configfile)
# NOTE(pabelanger): We are racing here, but don't really care. We just
# need our first image build to fail.
self.replace_config(configfile, 'node.yaml')
@ -292,5 +292,5 @@ class TestNodePoolBuilder(tests.DBTestCase):
def test_diskimage_build_only(self):
configfile = self.setup_config('node_diskimage_only.yaml')
self._useBuilder(configfile)
self.useBuilder(configfile)
self.waitForBuild('fake-image', '0000000001')

View File

@ -85,7 +85,7 @@ class TestNodepoolCMD(tests.DBTestCase):
def test_image_delete(self):
configfile = self.setup_config("node.yaml")
self._useBuilder(configfile)
self.useBuilder(configfile)
self.waitForImage('fake-provider', 'fake-image')
image = self.zk.getMostRecentImageUpload('fake-image', 'fake-provider')
self.patch_argv("-c", configfile, "image-delete",
@ -99,7 +99,7 @@ class TestNodepoolCMD(tests.DBTestCase):
def test_alien_image_list_empty(self):
configfile = self.setup_config("node.yaml")
self._useBuilder(configfile)
self.useBuilder(configfile)
self.waitForImage('fake-provider', 'fake-image')
self.patch_argv("-c", configfile, "alien-image-list")
nodepoolcmd.main()
@ -118,7 +118,7 @@ class TestNodepoolCMD(tests.DBTestCase):
def test_list_nodes(self):
configfile = self.setup_config('node.yaml')
self._useBuilder(configfile)
self.useBuilder(configfile)
pool = self.useNodepool(configfile, watermark_sleep=1)
pool.start()
self.waitForImage('fake-provider', 'fake-image')
@ -128,7 +128,7 @@ class TestNodepoolCMD(tests.DBTestCase):
def test_list_nodes_detail(self):
configfile = self.setup_config('node.yaml')
self._useBuilder(configfile)
self.useBuilder(configfile)
pool = self.useNodepool(configfile, watermark_sleep=1)
pool.start()
self.waitForImage('fake-provider', 'fake-image')
@ -144,13 +144,13 @@ class TestNodepoolCMD(tests.DBTestCase):
def test_dib_image_list(self):
configfile = self.setup_config('node.yaml')
self._useBuilder(configfile)
self.useBuilder(configfile)
self.waitForImage('fake-provider', 'fake-image')
self.assert_listed(configfile, ['dib-image-list'], 4, zk.READY, 1)
def test_dib_image_build_pause(self):
configfile = self.setup_config('node_diskimage_pause.yaml')
self._useBuilder(configfile)
self.useBuilder(configfile)
self.patch_argv("-c", configfile, "image-build", "fake-image")
with testtools.ExpectedException(Exception):
nodepoolcmd.main()
@ -158,7 +158,7 @@ class TestNodepoolCMD(tests.DBTestCase):
def test_dib_image_pause(self):
configfile = self.setup_config('node_diskimage_pause.yaml')
self._useBuilder(configfile)
self.useBuilder(configfile)
pool = self.useNodepool(configfile, watermark_sleep=1)
pool.start()
nodes = self.waitForNodes('fake-label2')
@ -168,7 +168,7 @@ class TestNodepoolCMD(tests.DBTestCase):
def test_dib_image_upload_pause(self):
configfile = self.setup_config('node_image_upload_pause.yaml')
self._useBuilder(configfile)
self.useBuilder(configfile)
pool = self.useNodepool(configfile, watermark_sleep=1)
pool.start()
nodes = self.waitForNodes('fake-label2')
@ -183,7 +183,7 @@ class TestNodepoolCMD(tests.DBTestCase):
def test_dib_image_delete(self):
configfile = self.setup_config('node.yaml')
pool = self.useNodepool(configfile, watermark_sleep=1)
self._useBuilder(configfile)
self.useBuilder(configfile)
pool.start()
self.waitForImage('fake-provider', 'fake-image')
nodes = self.waitForNodes('fake-label')
@ -203,7 +203,7 @@ class TestNodepoolCMD(tests.DBTestCase):
def test_hold(self):
configfile = self.setup_config('node.yaml')
pool = self.useNodepool(configfile, watermark_sleep=1)
self._useBuilder(configfile)
self.useBuilder(configfile)
pool.start()
self.waitForImage('fake-provider', 'fake-image')
nodes = self.waitForNodes('fake-label')
@ -222,7 +222,7 @@ class TestNodepoolCMD(tests.DBTestCase):
def test_delete(self):
configfile = self.setup_config('node.yaml')
pool = self.useNodepool(configfile, watermark_sleep=1)
self._useBuilder(configfile)
self.useBuilder(configfile)
pool.start()
self.waitForImage('fake-provider', 'fake-image')
nodes = self.waitForNodes('fake-label')
@ -243,7 +243,7 @@ class TestNodepoolCMD(tests.DBTestCase):
def test_delete_now(self):
configfile = self.setup_config('node.yaml')
pool = self.useNodepool(configfile, watermark_sleep=1)
self._useBuilder(configfile)
self.useBuilder(configfile)
pool.start()
self.waitForImage( 'fake-provider', 'fake-image')
nodes = self.waitForNodes('fake-label')
@ -263,7 +263,7 @@ class TestNodepoolCMD(tests.DBTestCase):
def test_image_build(self):
configfile = self.setup_config('node.yaml')
self._useBuilder(configfile)
self.useBuilder(configfile)
# wait for the scheduled build to arrive
self.waitForImage('fake-provider', 'fake-image')
@ -280,7 +280,7 @@ class TestNodepoolCMD(tests.DBTestCase):
def test_request_list(self):
configfile = self.setup_config('node.yaml')
pool = self.useNodepool(configfile, watermark_sleep=1)
self._useBuilder(configfile)
self.useBuilder(configfile)
pool.start()
self.waitForImage( 'fake-provider', 'fake-image')
nodes = self.waitForNodes('fake-label')

View File

@ -33,7 +33,7 @@ class TestLauncher(tests.DBTestCase):
and assigned to the request.
'''
configfile = self.setup_config('node_no_min_ready.yaml')
self._useBuilder(configfile)
self.useBuilder(configfile)
image = self.waitForImage('fake-provider', 'fake-image')
self.assertEqual(image.username, 'zuul')
@ -81,7 +81,7 @@ class TestLauncher(tests.DBTestCase):
def test_node_assignment_order(self):
"""Test that nodes are assigned in the order requested"""
configfile = self.setup_config('node_many_labels.yaml')
self._useBuilder(configfile)
self.useBuilder(configfile)
self.waitForImage('fake-provider', 'fake-image')
pool = self.useNodepool(configfile, watermark_sleep=1)
@ -127,7 +127,7 @@ class TestLauncher(tests.DBTestCase):
mock_quota.return_value = (max_cores, max_instances, max_ram)
configfile = self.setup_config(config)
self._useBuilder(configfile)
self.useBuilder(configfile)
self.waitForImage('fake-provider', 'fake-image')
nodepool.launcher.LOCK_CLEANUP = 1
@ -276,7 +276,7 @@ class TestLauncher(tests.DBTestCase):
mock_quota.return_value = (max_cores, max_instances, max_ram)
configfile = self.setup_config(config)
self._useBuilder(configfile)
self.useBuilder(configfile)
self.waitForImage('fake-provider', 'fake-image')
nodepool.launcher.LOCK_CLEANUP = 1
@ -332,7 +332,7 @@ class TestLauncher(tests.DBTestCase):
Test that provider launch error fails the request.
'''
configfile = self.setup_config('node_launch_retry.yaml')
self._useBuilder(configfile)
self.useBuilder(configfile)
self.waitForImage('fake-provider', 'fake-image')
pool = self.useNodepool(configfile, watermark_sleep=1)
@ -357,7 +357,7 @@ class TestLauncher(tests.DBTestCase):
be declined.
'''
configfile = self.setup_config('node_min_ready_capacity.yaml')
self._useBuilder(configfile)
self.useBuilder(configfile)
self.waitForImage('fake-provider', 'fake-image')
pool = self.useNodepool(configfile, watermark_sleep=1)
pool.start()
@ -401,7 +401,7 @@ class TestLauncher(tests.DBTestCase):
"""Test that an image and node are created"""
configfile = self.setup_config('node.yaml')
pool = self.useNodepool(configfile, watermark_sleep=1)
self._useBuilder(configfile)
self.useBuilder(configfile)
pool.start()
image = self.waitForImage('fake-provider', 'fake-image')
self.assertEqual(image.username, 'zuul')
@ -417,7 +417,7 @@ class TestLauncher(tests.DBTestCase):
"""Test that an image and node are created from a volume"""
configfile = self.setup_config('node_boot_from_volume.yaml')
pool = self.useNodepool(configfile, watermark_sleep=1)
self._useBuilder(configfile)
self.useBuilder(configfile)
pool.start()
self.waitForImage('fake-provider', 'fake-image')
nodes = self.waitForNodes('fake-label')
@ -430,7 +430,7 @@ class TestLauncher(tests.DBTestCase):
"""Test that a node is not created with min-ready=0"""
configfile = self.setup_config('node_disabled_label.yaml')
pool = self.useNodepool(configfile, watermark_sleep=1)
self._useBuilder(configfile)
self.useBuilder(configfile)
pool.start()
self.waitForImage('fake-provider', 'fake-image')
self.assertEqual([], self.zk.getNodeRequests())
@ -440,7 +440,7 @@ class TestLauncher(tests.DBTestCase):
"""Test that a node is created with a net name"""
configfile = self.setup_config('node_net_name.yaml')
pool = self.useNodepool(configfile, watermark_sleep=1)
self._useBuilder(configfile)
self.useBuilder(configfile)
pool.start()
self.waitForImage('fake-provider', 'fake-image')
nodes = self.waitForNodes('fake-label')
@ -453,7 +453,7 @@ class TestLauncher(tests.DBTestCase):
"""Test that a node is created with a flavor name"""
configfile = self.setup_config('node_flavor_name.yaml')
pool = self.useNodepool(configfile, watermark_sleep=1)
self._useBuilder(configfile)
self.useBuilder(configfile)
pool.start()
self.waitForImage('fake-provider', 'fake-image')
nodes = self.waitForNodes('fake-label')
@ -465,7 +465,7 @@ class TestLauncher(tests.DBTestCase):
"""Test that a image and node are created vhd image"""
configfile = self.setup_config('node_vhd.yaml')
pool = self.useNodepool(configfile, watermark_sleep=1)
self._useBuilder(configfile)
self.useBuilder(configfile)
pool.start()
self.waitForImage('fake-provider', 'fake-image')
nodes = self.waitForNodes('fake-label')
@ -476,7 +476,7 @@ class TestLauncher(tests.DBTestCase):
def test_node_vhd_and_qcow2(self):
"""Test label provided by vhd and qcow2 images builds"""
configfile = self.setup_config('node_vhd_and_qcow2.yaml')
self._useBuilder(configfile)
self.useBuilder(configfile)
p1_image = self.waitForImage('fake-provider1', 'fake-image')
p2_image = self.waitForImage('fake-provider2', 'fake-image')
@ -490,7 +490,7 @@ class TestLauncher(tests.DBTestCase):
"""Test that an image upload failure is contained."""
configfile = self.setup_config('node_upload_fail.yaml')
pool = self.useNodepool(configfile, watermark_sleep=1)
self._useBuilder(configfile)
self.useBuilder(configfile)
pool.start()
self.waitForImage('fake-provider2', 'fake-image')
nodes = self.waitForNodes('fake-label', 2)
@ -508,7 +508,7 @@ class TestLauncher(tests.DBTestCase):
"""Test that an image and node are created with az specified"""
configfile = self.setup_config('node_az.yaml')
pool = self.useNodepool(configfile, watermark_sleep=1)
self._useBuilder(configfile)
self.useBuilder(configfile)
pool.start()
self.waitForImage('fake-provider', 'fake-image')
nodes = self.waitForNodes('fake-label')
@ -520,7 +520,7 @@ class TestLauncher(tests.DBTestCase):
"""Test that ipv6 existence either way works fine."""
configfile = self.setup_config('node_ipv6.yaml')
pool = self.useNodepool(configfile, watermark_sleep=1)
self._useBuilder(configfile)
self.useBuilder(configfile)
pool.start()
self.waitForImage('fake-provider1', 'fake-image')
self.waitForImage('fake-provider2', 'fake-image')
@ -545,7 +545,7 @@ class TestLauncher(tests.DBTestCase):
def test_node_delete_success(self):
configfile = self.setup_config('node.yaml')
pool = self.useNodepool(configfile, watermark_sleep=1)
self._useBuilder(configfile)
self.useBuilder(configfile)
pool.start()
self.waitForImage('fake-provider', 'fake-image')
nodes = self.waitForNodes('fake-label')
@ -568,7 +568,7 @@ class TestLauncher(tests.DBTestCase):
def test_node_launch_retries(self):
configfile = self.setup_config('node_launch_retry.yaml')
pool = self.useNodepool(configfile, watermark_sleep=1)
self._useBuilder(configfile)
self.useBuilder(configfile)
pool.start()
self.wait_for_config(pool)
manager = pool.getProviderManager('fake-provider')
@ -595,7 +595,7 @@ class TestLauncher(tests.DBTestCase):
configfile = self.setup_config('node.yaml')
pool = self.useNodepool(configfile, watermark_sleep=1)
self._useBuilder(configfile)
self.useBuilder(configfile)
pool.start()
self.waitForImage('fake-provider', 'fake-image')
nodes = self.waitForNodes('fake-label')
@ -619,7 +619,7 @@ class TestLauncher(tests.DBTestCase):
"""Test that a leaked node is deleted"""
configfile = self.setup_config('leaked_node.yaml')
pool = self.useNodepool(configfile, watermark_sleep=1)
self._useBuilder(configfile)
self.useBuilder(configfile)
pool.start()
self.waitForImage('fake-provider', 'fake-image')
self.log.debug("Waiting for initial pool...")
@ -655,7 +655,7 @@ class TestLauncher(tests.DBTestCase):
"""Test a node with exceeded max-ready-age is deleted"""
configfile = self.setup_config('node_max_ready_age.yaml')
pool = self.useNodepool(configfile, watermark_sleep=1)
self._useBuilder(configfile)
self.useBuilder(configfile)
pool.start()
self.waitForImage('fake-provider', 'fake-image')
self.log.debug("Waiting for initial pool...")
@ -670,7 +670,7 @@ class TestLauncher(tests.DBTestCase):
"""Test that only providers listed in the label satisfy the request"""
configfile = self.setup_config('node_label_provider.yaml')
pool = self.useNodepool(configfile, watermark_sleep=1)
self._useBuilder(configfile)
self.useBuilder(configfile)
pool.start()
self.waitForImage('fake-provider', 'fake-image')
self.waitForImage('fake-provider2', 'fake-image')
@ -704,7 +704,7 @@ class TestLauncher(tests.DBTestCase):
configfile = self.setup_config('node_lost_requests.yaml')
pool = self.useNodepool(configfile, watermark_sleep=1)
self._useBuilder(configfile)
self.useBuilder(configfile)
self.waitForImage('fake-provider', 'fake-image')
pool.start()
req = self.waitForNodeRequest(req, (zk.FULFILLED,))
@ -725,7 +725,7 @@ class TestLauncher(tests.DBTestCase):
configfile = self.setup_config('node_lost_requests.yaml')
pool = self.useNodepool(configfile, watermark_sleep=1)
self._useBuilder(configfile)
self.useBuilder(configfile)
pool.start()
while True:
@ -737,7 +737,7 @@ class TestLauncher(tests.DBTestCase):
"""Test that an image and node are created"""
configfile = self.setup_config('multiple_pools.yaml')
pool = self.useNodepool(configfile, watermark_sleep=1)
self._useBuilder(configfile)
self.useBuilder(configfile)
pool.start()
self.waitForImage('fake-provider', 'fake-image')
lab1 = self.waitForNodes('fake-label1')
@ -796,7 +796,7 @@ class TestLauncher(tests.DBTestCase):
# First config has max-servers set to 2
configfile = self.setup_config('pause_declined_1.yaml')
self._useBuilder(configfile)
self.useBuilder(configfile)
self.waitForImage('fake-provider', 'fake-image')
pool = self.useNodepool(configfile, watermark_sleep=1)
pool.start()
@ -832,7 +832,7 @@ class TestLauncher(tests.DBTestCase):
"""Test that auto-floating-ip option works fine."""
configfile = self.setup_config('node_auto_floating_ip.yaml')
pool = self.useNodepool(configfile, watermark_sleep=1)
self._useBuilder(configfile)
self.useBuilder(configfile)
pool.start()
self.waitForImage('fake-provider1', 'fake-image')
self.waitForImage('fake-provider2', 'fake-image')
@ -871,7 +871,7 @@ class TestLauncher(tests.DBTestCase):
configfile,
secure_conf=securefile,
watermark_sleep=1)
self._useBuilder(configfile, securefile=securefile)
self.useBuilder(configfile, securefile=securefile)
pool.start()
self.wait_for_config(pool)

View File

@ -27,7 +27,7 @@ class TestWebApp(tests.DBTestCase):
def test_image_list(self):
configfile = self.setup_config('node.yaml')
pool = self.useNodepool(configfile, watermark_sleep=1)
self._useBuilder(configfile)
self.useBuilder(configfile)
pool.start()
webapp = self.useWebApp(pool, port=0)
webapp.start()
@ -47,7 +47,7 @@ class TestWebApp(tests.DBTestCase):
def test_dib_image_list_json(self):
configfile = self.setup_config('node.yaml')
pool = self.useNodepool(configfile, watermark_sleep=1)
self._useBuilder(configfile)
self.useBuilder(configfile)
pool.start()
webapp = self.useWebApp(pool, port=0)
webapp.start()