Merge "fix misspellings in logs, comments and tests"
This commit is contained in:
		@@ -721,7 +721,7 @@ class ImageCacheManagerTestCase(test.TestCase):
 | 
			
		||||
        def fq_path(path):
 | 
			
		||||
            return os.path.join('/instance_path/_base/', path)
 | 
			
		||||
 | 
			
		||||
        # Fake base directory existance
 | 
			
		||||
        # Fake base directory existence
 | 
			
		||||
        orig_exists = os.path.exists
 | 
			
		||||
 | 
			
		||||
        def exists(path):
 | 
			
		||||
@@ -747,7 +747,7 @@ class ImageCacheManagerTestCase(test.TestCase):
 | 
			
		||||
                        '/instance_path/_base/%s_sm' % hashed_42]:
 | 
			
		||||
                return False
 | 
			
		||||
 | 
			
		||||
            self.fail('Unexpected path existance check: %s' % path)
 | 
			
		||||
            self.fail('Unexpected path existence check: %s' % path)
 | 
			
		||||
 | 
			
		||||
        self.stubs.Set(os.path, 'exists', lambda x: exists(x))
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -570,7 +570,6 @@ class LibvirtConnTestCase(test.TestCase):
 | 
			
		||||
        self.context = context.get_admin_context()
 | 
			
		||||
        self.flags(instances_path='')
 | 
			
		||||
        self.flags(libvirt_snapshots_directory='')
 | 
			
		||||
        self.call_libvirt_dependant_setup = False
 | 
			
		||||
        self.useFixture(fixtures.MonkeyPatch(
 | 
			
		||||
            'nova.virt.libvirt.driver.libvirt_utils',
 | 
			
		||||
            fake_libvirt_utils))
 | 
			
		||||
@@ -3100,7 +3099,7 @@ class LibvirtConnTestCase(test.TestCase):
 | 
			
		||||
        self.stubs.Set(conn, 'get_info', fake_get_info)
 | 
			
		||||
        instance = {"name": "instancename", "id": "instanceid",
 | 
			
		||||
                    "uuid": "875a8070-d0b9-4949-8b31-104d125c9a64"}
 | 
			
		||||
        # NOTE(vish): verifies destory doesn't raise if the instance disappears
 | 
			
		||||
        # NOTE(vish): verifies destroy doesn't raise if the instance disappears
 | 
			
		||||
        conn._destroy(instance)
 | 
			
		||||
 | 
			
		||||
    def test_available_least_handles_missing(self):
 | 
			
		||||
 
 | 
			
		||||
@@ -47,7 +47,7 @@ def _get_connect_string(backend,
 | 
			
		||||
                        passwd="openstack_citest",
 | 
			
		||||
                        database="openstack_citest"):
 | 
			
		||||
    """
 | 
			
		||||
    Try to get a connection with a very specfic set of values, if we get
 | 
			
		||||
    Try to get a connection with a very specific set of values, if we get
 | 
			
		||||
    these then we'll run the tests, otherwise they are skipped
 | 
			
		||||
    """
 | 
			
		||||
    if backend == "postgres":
 | 
			
		||||
@@ -195,7 +195,7 @@ class TestMigrations(test.TestCase):
 | 
			
		||||
                                "~/.pgpass && chmod 0600 ~/.pgpass" % locals())
 | 
			
		||||
                execute_cmd(createpgpass)
 | 
			
		||||
                # note(boris-42): We must create and drop database, we can't
 | 
			
		||||
                # drop database wich we have connected to, so for such
 | 
			
		||||
                # drop database which we have connected to, so for such
 | 
			
		||||
                # operations there is a special database template1.
 | 
			
		||||
                sqlcmd = ("psql -w -U %(user)s -h %(host)s -c"
 | 
			
		||||
                                     " '%(sql)s' -d template1")
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user