OpenStack Compute (nova)

Merge lp:~gundlach/nova/install-tools-pep8-fix into lp:~hudson-openstack/nova/trunk

  1. install-tools-pep8-fix
  2. Merge into trunk
Proposed by Michael Gundlach
Status: Merged
Approved by: Monty Taylor
Approved revision: 248
Merged at revision: 255
Proposed branch: lp:~gundlach/nova/install-tools-pep8-fix
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 12 lines (+2/-2)
1 file modified
tools/install_venv.py (+2/-2)
To merge this branch: bzr merge lp:~gundlach/nova/install-tools-pep8-fix
Reviewer Review Type Date Requested Status
Paul Voccio (community) Approve
Review via email: mp+33002@code.launchpad.net

Commit message

Fix a pep8 violation.

Description of the change

Fix a pep8 violation.

To post a comment you must log in.
Revision history for this message
Paul Voccio (pvo) wrote :

yep

review: Approve
Revision history for this message
OpenStack Infra (hudson-openstack) wrote :
Download full text (10.6 KiB)

The attempt to merge lp:~gundlach/nova/install-tools-pep8-fix into lp:nova failed.Below is the output from the failed tests.

nova.tests.access_unittest
  AccessTestCase
    test_001_allow_all ... [OK]
    test_002_allow_none ... [OK]
    test_003_allow_project_manager ... [OK]
    test_004_allow_sys_and_net ... [OK]
    test_005_allow_sys_no_pm ... [OK]
nova.tests.api_unittest
  ApiEc2TestCase
    test_describe_instances ... [OK]
    test_get_all_key_pairs ... [OK]
nova.tests.auth_unittest
  AuthTestCase
    test_001_can_create_users ... [OK]
    test_002_can_get_user ... [OK]
    test_003_can_retreive_properties ... [OK]
    test_004_signature_is_valid ... [OK]
    test_005_can_get_credentials ... [OK]
    test_006_test_key_storage ... [OK]
    test_007_test_key_generation ... [OK]
    test_008_can_list_key_pairs ... [OK]
    test_009_can_delete_key_pair ... [OK]
    test_010_can_list_users ... [OK]
    test_101_can_add_user_role ... [OK]
    test_199_can_remove_user_role ... [OK]
    test_201_can_create_project ... [OK]
    test_202_user1_is_project_member ... [OK]
    test_203_user2_is_not_project_member ... [OK]
    test_204_user1_is_project_manager ... [OK]
    test_205_user2_is_not_project_manager ... [OK]
    test_206_can_add_user_to_project ... [OK]
    test_207_can_remove_user_from_project ... [OK]
    test_208_can_remove_add_user_with_role ... [OK]
    test_209_can_generate_x509 ... [OK]
    test_210_can_add_project_role ... [OK]
    test_211_can_list_project_roles ... [OK]
    test_212_can_remove_project_role ... [OK]
    test_214_can_retrieve_project_by_user ... [OK]
    test_299_can_delete_project ... [OK]
    test_999_can_delete_users ... [OK]
nova.tests.cloud_unittest
  CloudTestCase
    test_console_output ... [OK]
    test_instance_update_state ... [OK]
    test_run_instances ... ...

Revision history for this message
OpenStack Infra (hudson-openstack) wrote :
Download full text (10.6 KiB)

The attempt to merge lp:~gundlach/nova/install-tools-pep8-fix into lp:nova failed.Below is the output from the failed tests.

nova.tests.access_unittest
  AccessTestCase
    test_001_allow_all ... [OK]
    test_002_allow_none ... [OK]
    test_003_allow_project_manager ... [OK]
    test_004_allow_sys_and_net ... [OK]
    test_005_allow_sys_no_pm ... [OK]
nova.tests.api_unittest
  ApiEc2TestCase
    test_describe_instances ... [OK]
    test_get_all_key_pairs ... [OK]
nova.tests.auth_unittest
  AuthTestCase
    test_001_can_create_users ... [OK]
    test_002_can_get_user ... [OK]
    test_003_can_retreive_properties ... [OK]
    test_004_signature_is_valid ... [OK]
    test_005_can_get_credentials ... [OK]
    test_006_test_key_storage ... [OK]
    test_007_test_key_generation ... [OK]
    test_008_can_list_key_pairs ... [OK]
    test_009_can_delete_key_pair ... [OK]
    test_010_can_list_users ... [OK]
    test_101_can_add_user_role ... [OK]
    test_199_can_remove_user_role ... [OK]
    test_201_can_create_project ... [OK]
    test_202_user1_is_project_member ... [OK]
    test_203_user2_is_not_project_member ... [OK]
    test_204_user1_is_project_manager ... [OK]
    test_205_user2_is_not_project_manager ... [OK]
    test_206_can_add_user_to_project ... [OK]
    test_207_can_remove_user_from_project ... [OK]
    test_208_can_remove_add_user_with_role ... [OK]
    test_209_can_generate_x509 ... [OK]
    test_210_can_add_project_role ... [OK]
    test_211_can_list_project_roles ... [OK]
    test_212_can_remove_project_role ... [OK]
    test_214_can_retrieve_project_by_user ... [OK]
    test_299_can_delete_project ... [OK]
    test_999_can_delete_users ... [OK]
nova.tests.cloud_unittest
  CloudTestCase
    test_console_output ... [OK]
    test_instance_update_state ... [OK]
    test_run_instances ... ...

Revision history for this message
OpenStack Infra (hudson-openstack) wrote :
Download full text (10.6 KiB)

The attempt to merge lp:~gundlach/nova/install-tools-pep8-fix into lp:nova failed.Below is the output from the failed tests.

nova.tests.access_unittest
  AccessTestCase
    test_001_allow_all ... [OK]
    test_002_allow_none ... [OK]
    test_003_allow_project_manager ... [OK]
    test_004_allow_sys_and_net ... [OK]
    test_005_allow_sys_no_pm ... [OK]
nova.tests.api_unittest
  ApiEc2TestCase
    test_describe_instances ... [OK]
    test_get_all_key_pairs ... [OK]
nova.tests.auth_unittest
  AuthTestCase
    test_001_can_create_users ... [OK]
    test_002_can_get_user ... [OK]
    test_003_can_retreive_properties ... [OK]
    test_004_signature_is_valid ... [OK]
    test_005_can_get_credentials ... [OK]
    test_006_test_key_storage ... [OK]
    test_007_test_key_generation ... [OK]
    test_008_can_list_key_pairs ... [OK]
    test_009_can_delete_key_pair ... [OK]
    test_010_can_list_users ... [OK]
    test_101_can_add_user_role ... [OK]
    test_199_can_remove_user_role ... [OK]
    test_201_can_create_project ... [OK]
    test_202_user1_is_project_member ... [OK]
    test_203_user2_is_not_project_member ... [OK]
    test_204_user1_is_project_manager ... [OK]
    test_205_user2_is_not_project_manager ... [OK]
    test_206_can_add_user_to_project ... [OK]
    test_207_can_remove_user_from_project ... [OK]
    test_208_can_remove_add_user_with_role ... [OK]
    test_209_can_generate_x509 ... [OK]
    test_210_can_add_project_role ... [OK]
    test_211_can_list_project_roles ... [OK]
    test_212_can_remove_project_role ... [OK]
    test_214_can_retrieve_project_by_user ... [OK]
    test_299_can_delete_project ... [OK]
    test_999_can_delete_users ... [OK]
nova.tests.cloud_unittest
  CloudTestCase
    test_console_output ... [OK]
    test_instance_update_state ... [OK]
    test_run_instances ... ...

Revision history for this message
Michael Gundlach (gundlach) wrote :

These tests pass on my machine; trying one more time

Revision history for this message
OpenStack Infra (hudson-openstack) wrote :
Download full text (10.6 KiB)

The attempt to merge lp:~gundlach/nova/install-tools-pep8-fix into lp:nova failed.Below is the output from the failed tests.

nova.tests.access_unittest
  AccessTestCase
    test_001_allow_all ... [OK]
    test_002_allow_none ... [OK]
    test_003_allow_project_manager ... [OK]
    test_004_allow_sys_and_net ... [OK]
    test_005_allow_sys_no_pm ... [OK]
nova.tests.api_unittest
  ApiEc2TestCase
    test_describe_instances ... [OK]
    test_get_all_key_pairs ... [OK]
nova.tests.auth_unittest
  AuthTestCase
    test_001_can_create_users ... [OK]
    test_002_can_get_user ... [OK]
    test_003_can_retreive_properties ... [OK]
    test_004_signature_is_valid ... [OK]
    test_005_can_get_credentials ... [OK]
    test_006_test_key_storage ... [OK]
    test_007_test_key_generation ... [OK]
    test_008_can_list_key_pairs ... [OK]
    test_009_can_delete_key_pair ... [OK]
    test_010_can_list_users ... [OK]
    test_101_can_add_user_role ... [OK]
    test_199_can_remove_user_role ... [OK]
    test_201_can_create_project ... [OK]
    test_202_user1_is_project_member ... [OK]
    test_203_user2_is_not_project_member ... [OK]
    test_204_user1_is_project_manager ... [OK]
    test_205_user2_is_not_project_manager ... [OK]
    test_206_can_add_user_to_project ... [OK]
    test_207_can_remove_user_from_project ... [OK]
    test_208_can_remove_add_user_with_role ... [OK]
    test_209_can_generate_x509 ... [OK]
    test_210_can_add_project_role ... [OK]
    test_211_can_list_project_roles ... [OK]
    test_212_can_remove_project_role ... [OK]
    test_214_can_retrieve_project_by_user ... [OK]
    test_299_can_delete_project ... [OK]
    test_999_can_delete_users ... [OK]
nova.tests.cloud_unittest
  CloudTestCase
    test_console_output ... [OK]
    test_instance_update_state ... [OK]
    test_run_instances ... ...

Revision history for this message
OpenStack Infra (hudson-openstack) wrote :
Download full text (10.6 KiB)

The attempt to merge lp:~gundlach/nova/install-tools-pep8-fix into lp:nova failed.Below is the output from the failed tests.

nova.tests.access_unittest
  AccessTestCase
    test_001_allow_all ... [OK]
    test_002_allow_none ... [OK]
    test_003_allow_project_manager ... [OK]
    test_004_allow_sys_and_net ... [OK]
    test_005_allow_sys_no_pm ... [OK]
nova.tests.api_unittest
  ApiEc2TestCase
    test_describe_instances ... [OK]
    test_get_all_key_pairs ... [OK]
nova.tests.auth_unittest
  AuthTestCase
    test_001_can_create_users ... [OK]
    test_002_can_get_user ... [OK]
    test_003_can_retreive_properties ... [OK]
    test_004_signature_is_valid ... [OK]
    test_005_can_get_credentials ... [OK]
    test_006_test_key_storage ... [OK]
    test_007_test_key_generation ... [OK]
    test_008_can_list_key_pairs ... [OK]
    test_009_can_delete_key_pair ... [OK]
    test_010_can_list_users ... [OK]
    test_101_can_add_user_role ... [OK]
    test_199_can_remove_user_role ... [OK]
    test_201_can_create_project ... [OK]
    test_202_user1_is_project_member ... [OK]
    test_203_user2_is_not_project_member ... [OK]
    test_204_user1_is_project_manager ... [OK]
    test_205_user2_is_not_project_manager ... [OK]
    test_206_can_add_user_to_project ... [OK]
    test_207_can_remove_user_from_project ... [OK]
    test_208_can_remove_add_user_with_role ... [OK]
    test_209_can_generate_x509 ... [OK]
    test_210_can_add_project_role ... [OK]
    test_211_can_list_project_roles ... [OK]
    test_212_can_remove_project_role ... [OK]
    test_214_can_retrieve_project_by_user ... [OK]
    test_299_can_delete_project ... [OK]
    test_999_can_delete_users ... [OK]
nova.tests.cloud_unittest
  CloudTestCase
    test_console_output ... [OK]
    test_instance_update_state ... [OK]
    test_run_instances ... ...

Revision history for this message
OpenStack Infra (hudson-openstack) wrote :
Download full text (55.8 KiB)

The attempt to merge lp:~gundlach/nova/install-tools-pep8-fix into lp:nova failed.Below is the output from the failed tests.

Downloading/unpacking mox==0.5.0 (from -r /var/lib/hudson/src/nova/hudson/tools/pip-requires (line 19))
  Downloading mox-0.5.0.tar.gz
  Running setup.py egg_info for package mox
Downloading/unpacking IPy==0.70 (from -r /var/lib/hudson/src/nova/hudson/tools/pip-requires (line 3))
  Downloading IPy-0.70.tar.gz
  Running setup.py egg_info for package IPy
Downloading/unpacking boto==2.0b1 (from -r /var/lib/hudson/src/nova/hudson/tools/pip-requires (line 7))
  Downloading boto-2.0b1.tar.gz (198Kb):
  Downloading boto-2.0b1.tar.gz (198Kb): 2% 4.1Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 4% 8.2Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 6% 12Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 8% 16Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 10% 20Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 12% 24Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 14% 28Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 16% 32Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 18% 36Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 20% 40Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 22% 45Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 24% 49Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 26% 53Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 28% 57Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 30% 61Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 33% 65Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 35% 69Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 37% 73Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 39% 77Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 41% 81Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 43% 86Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 45% 90Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 47% 94Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 49% 98Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 51% 102Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 53% 106Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 55% 110Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 57% 114Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 59% 118Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 61% 122Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 64% 126Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 66% 131Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 68% 135Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 70% 139Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 72% 143Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 74% 147Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 76% 151Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 78% 155Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 80% 159Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 82% 163Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 84% 167Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 86% 172Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 88% 176Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 90% 180Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 92% 184Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 95% 188Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 97% 192Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 99% 196Kb
  Downloading boto-2.0b1.tar.gz (198Kb): 100% 198...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/install_venv.py'
2--- tools/install_venv.py 2010-08-17 15:03:15 +0000
3+++ tools/install_venv.py 2010-08-18 15:56:45 +0000
4@@ -96,8 +96,8 @@
5
6
7 # Tell the virtual env how to "import nova"
8- pathfile=os.path.join(venv, "lib", "python2.6", "site-packages", "nova.pth")
9- f=open(pathfile, 'w')
10+ pthfile = os.path.join(venv, "lib", "python2.6", "site-packages", "nova.pth")
11+ f = open(pthfile, 'w')
12 f.write("%s\n" % ROOT)
13
14