Merge lp://qastaging/~justin-fathomdb/nova/provide-flavorid-for-test-servers into lp://qastaging/~hudson-openstack/nova/trunk
Status: | Work in progress |
---|---|
Proposed branch: | lp://qastaging/~justin-fathomdb/nova/provide-flavorid-for-test-servers |
Merge into: | lp://qastaging/~hudson-openstack/nova/trunk |
Prerequisite: | lp://qastaging/~justin-fathomdb/nova/skip-validation-openstack11 |
Diff against target: |
13 lines (+2/-1) 1 file modified
nova/tests/api/openstack/test_servers.py (+2/-1) |
To merge this branch: | bzr merge lp://qastaging/~justin-fathomdb/nova/provide-flavorid-for-test-servers |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Devin Carlen (community) | Approve | ||
Vish Ishaya (community) | Approve | ||
Review via email:
|
Description of the change
Provide a missing instance_type / flavor_id in the test_servers unit test
Unmerged revisions
- 857. By justinsb
-
Provide instance_type in test_servers
- 856. By justinsb
-
Fix pep8
- 855. By justinsb
-
Temporary workaround - don't bother validating against the broken OpenStack 1.1 schema
- 854. By justinsb
-
Better formed output: if an order is specified for elements, follow the order
- 853. By justinsb
-
Merged with lp:~rackspace-titan/nova/osapi-xml-serialization
- 852. By justinsb
-
Merged with lp:~justin-fathomdb/nova/bug740576 and thereby with trunk
- 851. By justinsb
-
For now, tolerate the stuff that's broken and dial back the tests so that we don't have to raise 200 bugs yet
- 850. By justinsb
-
Imported 1.1 schema from http://
bazaar. launchpad. net/~annegentle /openstack- manuals/ trunk/files/ head:/doc/ source/ docbkx/ openstack- compute- api/ - 849. By justinsb
-
Added validation code
- 848. By justinsb
-
Merged with trunk
lgtm