diff options
| author | Dan Prince <dan.prince@rackspace.com> | 2011-03-17 10:45:46 -0400 |
|---|---|---|
| committer | Dan Prince <dan.prince@rackspace.com> | 2011-03-17 10:45:46 -0400 |
| commit | f8aa9485fe2048ff916d9dd40478ef0b1486077f (patch) | |
| tree | 2c52e9f19b9b10d9ddfc71fc904e0325d9b4f52c | |
| parent | 732633c93f8d8cf71875d2caf096c9efbcf9dbce (diff) | |
| download | nova-f8aa9485fe2048ff916d9dd40478ef0b1486077f.tar.gz nova-f8aa9485fe2048ff916d9dd40478ef0b1486077f.tar.xz nova-f8aa9485fe2048ff916d9dd40478ef0b1486077f.zip | |
Switch back to 'is not None' for personality_files check. (makes mark happy)
| -rw-r--r-- | nova/api/openstack/servers.py | 1 | ||||
| -rw-r--r-- | nova/tests/api/openstack/test_servers.py | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index bf21ed17f..6dd66a9a5 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -221,7 +221,6 @@ class Controller(wsgi.Controller): """ injected_files = [] - # NOTE(dprince): handle case where 'personality: null' is in JSON req if not personality: return injected_files diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py index 230c9d03c..71c57bfbf 100644 --- a/nova/tests/api/openstack/test_servers.py +++ b/nova/tests/api/openstack/test_servers.py @@ -943,7 +943,7 @@ class TestServerInstanceCreation(test.TestCase): server['name'] = 'new-server-test' server['imageId'] = 1 server['flavorId'] = 1 - if personality_files: + if personality_files is not None: personalities = [] for path, contents in personality_files: personalities.append({'path': path, 'contents': contents}) |