summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | Fix crash in quantumapi if no network or port id is specifiedDan Smith2013-02-262-2/+24
| | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing code assumes that if no port id or fixed ip was specified, that the network id passed in is valid. This is not necessarily the case, and results in adding None to the list of network ids, which later causes a check to see if the network id list is empty to fail. This only adds the network id to the list if it was specified, and adds a more explicit check to the region that previously fell through without finding a matching network so that a similar case would be easier to debug in the future. Addresses bug #1131264 Change-Id: I7a8aaea5772707b8bd6313249e74b1302eedefe8
* | | | | | | | | | | | | | | | | | | | | Merge "Adds API Sample tests for Volume Attachments"Jenkins2013-02-2825-0/+304
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Adds API Sample tests for Volume AttachmentsTiago Mello2013-02-2825-0/+304
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially implements bp nova-api-samples Fixes Bug 1126204 Change-Id: I4b061f1916d688ad97c6a6ba4011dd13431a4fcb
* | | | | | | | | | | | | | | | | | | | | Merge "Remove duplicate options(joinedload) from aggregates db code"Jenkins2013-02-281-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Remove duplicate options(joinedload) from aggregates db codeJoe Gordon2013-02-281-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _aggregate_get_query already does option joinedload. So when use it don't need to use additional options(joinedload). Change-Id: I11a080c262122bf1b59984e5e80f6095527bf507
* | | | | | | | | | | | | | | | | | | | | | Merge "Shrink size of aggregate_metadata_get_by_host sql query"Jenkins2013-02-281-18/+5
|\| | | | | | | | | | | | | | | | | | | | | | |_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Shrink size of aggregate_metadata_get_by_host sql queryJoe Gordon2013-02-281-18/+5
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove unnecessary secondary joins in Aggregate model. * Remove unnecessary backrefs (only needed to create bidirectional relationship) aggregate_metadata_get_by_host goes from 6 JOINS down to two JOINS. Fix bug 1133495 Change-Id: I72966fa205973ec638816b07bfdcd54f1102feb5
* | | | | | | | | | | | | | | | | | | | Merge "ec2 _format_security_group() accesses db when using quantum_driver"Jenkins2013-02-284-8/+101
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | ec2 _format_security_group() accesses db when using quantum_driverAaron Rosen2013-02-274-8/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes _format_security_group() so that it does not access the db when using quantum. In addition, this patch implements the querying params that were missing in get() and list() in the quantum security group driver. Fixes bug 1131956 Change-Id: I5ec65829301bca7e5b215d5052a18528dff76517
* | | | | | | | | | | | | | | | | | | | | Merge "Run libguestfs API calls in a thread pool"Jenkins2013-02-281-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Run libguestfs API calls in a thread poolDaniel P. Berrange2013-02-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The libguestfs API is a binding to a native C library, and thus it will block greenthreads. To avoid this all libguestfs API calls need to be run in a threadpool. This can be done by just wrapping the GuestFS object in an eventlet.tpool.Proxy object Fixes bug #1132742 Change-Id: I877ad9e88442e41c9ad234503d9b1ddf1fb27408 Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
* | | | | | | | | | | | | | | | | | | | | | Merge "Remove old commented out code in sqlalchemy models"Jenkins2013-02-281-6/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Remove old commented out code in sqlalchemy modelsJoe Gordon2013-02-281-6/+0
| | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0e49d00ce8790c8498976c2bf7bcfd9b69bfb5a4
* | | | | | | | | | | | | | | | | | | | | | Merge "Suppress retries on UnexpectedTaskStateErrors"Jenkins2013-02-282-0/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Suppress retries on UnexpectedTaskStateErrorsBrian Elliott2013-02-272-0/+42
| | |_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try to re-schedule if an UnexpectedTaskStateError occurs during a build. If the instance was deleted mid-build, just catch the exception and log a message. Change-Id: I5e577f252ee71f310a749186060808723b676854
* | | | | | | | | | | | | | | | | | | | | | Merge "Prevent hacking.py from crashing on unexpected import exception"Jenkins2013-02-281-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Prevent hacking.py from crashing on unexpected import exceptionJoe Gordon2013-02-271-0/+6
| | |_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a module isn't importable due to an unexpected error during __import__. Ignore it, hacking.py is only a style checker. Fix bug 1134622 Change-Id: I704b7cc9a7bd415018ae7634767b7bd9c3b7d9b2
* | | | | | | | | | | | | | | | | | | | | Merge "Don't blindly skip first migration."Jenkins2013-02-283-18/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Don't blindly skip first migration.Rick Harris2013-02-283-18/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing code would, no matter-what, skip the first migration when running through the migrations tests. This makes the code slightly counterintuitive (why skip the first one?), and is not very flexible. The reworked logic lets a migration raise a `NotImplementedError` to signal that it doesn't support a `downgrade`. This lets the walk-versions code treat the first-migration just like any other. Change-Id: I19fd8ebc6075392cf9e573b8b4166291584b4a83
* | | | | | | | | | | | | | | | | | | | | | Merge "Fix `with_data` handling in test-migrations."Jenkins2013-02-281-14/+11
|\| | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Fix `with_data` handling in test-migrations.Rick Harris2013-02-271-14/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two issues with the existing code: 1) migrate-down wasn't respecting the `with_data` flag 2) migrate-up was not actually migrating unless `with_data` was True. The correct behavior is to always migrate up, but only run checks when `with_data` is set. Change-Id: I781fa4796908bea684d4499fa9ff5e4d7a18fbd4
* | | | | | | | | | | | | | | | | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2013-02-281-194/+194
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-02-281-194/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iec7e5058224d31481ccba6944772123ac8096808
* | | | | | | | | | | | | | | | | | | | | Merge "BM Migration 004: Actually drop column"Jenkins2013-02-282-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | BM Migration 004: Actually drop columnRick Harris2013-02-272-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SQLAlchemy-migrate appears to support passing in a Column or a column-name string into `drop_column`. In practice though, only the column-name form actually works. Change-Id: I1bcc28511d652df44f7168fb84c8be7dacd60cfd
* | | | | | | | | | | | | | | | | | | | | Merge "Actually run baremetal migration tests."Jenkins2013-02-281-3/+4
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Actually run baremetal migration tests.Rick Harris2013-02-271-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The baremetal migration tests weren't being run because the test lookup code was looking for a tests of form 'check_#' instead of 'check_###'. Change-Id: I8f162d6493dd09b2d0cff36c40ae9acc5df1269c
* | | | | | | | | | | | | | | | | | | | | Merge "Migration 148: Fix drop table dependency order"Jenkins2013-02-281-19/+7
|\| | | | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Migration 148: Fix drop table dependency orderRick Harris2013-02-261-19/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The downgrade of 148 was broken because instance_actions_events has a FK dependency on instance_actions but was attempted to be deleted first, which caused the sqlalchemy to complain. The fix is to reorder the table deletes in the downgrade. Additional cleanups: * Remove unecessary exception handling which masked errors Change-Id: Iaac77ba0e81071f6bb39e5cc3b599a4138eb3cd2
* | | | | | | | | | | | | | | | | | | | Merge "Migration 147: Prevent duplicate aggregate_hosts"Jenkins2013-02-282-2/+31
|\| | | | | | | | | | | | | | | | | | | | |_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Migration 147: Prevent duplicate aggregate_hostsRick Harris2013-02-262-2/+31
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an aggregate_host record is already present, then the `upgrade` shouldn't attempt to add it again. Change-Id: Ib7ab10fa7c166ccaa3df6a96eb08c7ebcd0af38c
* | | | | | | | | | | | | | | | | | Merge "Add API Sample tests for Snapshots extension."Jenkins2013-02-2722-2/+344
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Add API Sample tests for Snapshots extension.Giampaolo Lauria2013-02-2522-2/+344
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially implements blueprint nova-api-samples Modifies fakes to produce a real timestamp Fixes bug 1126211 Change-Id: I8973d50fa67abbf6f96684ff8a0b898912f09caf
* | | | | | | | | | | | | | | | | | | Merge "Makes sure required powervm config options are set"Jenkins2013-02-271-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Makes sure required powervm config options are setDavid Peraza2013-02-271-4/+6
| | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1132931 Defaulting values of powervm_img_local_path and powervm_img_remote_path configuration options. Change-Id: I310422bccb84fc0ae12e43b06b4d85e683a91daf
* | | | | | | | | | | | | | | | | | | Merge "Bump python-quantumclient version to 2.1.2"Jenkins2013-02-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Bump python-quantumclient version to 2.1.2Aaron Rosen2013-02-271-1/+1
| |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1133381 Change-Id: I0592032e9df1fc165631e7e85f1cdc9ead4beb30
* | | | | | | | | | | | | | / / / / Remove un-needed methods.Matthew Sherborne2013-02-271-12/+0
| |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These methods are un-needed. Their functionality is now provided by the HostAPI and ComputeRPCProxyAPI. Change-Id: I771f1e4669f8b7fb779a0fec0209c3e2a899a469
* | | | | | | | | | | | | | | | | Merge "Revert IP Address column length to 39"Jenkins2013-02-274-0/+274
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Revert IP Address column length to 39Mauro S. M. Rodrigues2013-02-264-0/+274
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In change I35d4565389d03fce86103289cf6447f824efeba0 we changed the cidr/ip address column size to 43 to be able to support ipv6 cidr values, although ips doesn't need that much space so we're reverting it to keep it consistent. Change-Id: Icd2d727fd0733ee0db23c1fa431df4b982cae7b4
* | | | | | | | | | | | | | | | Merge "Update OpenStack LLC to Foundation"Jenkins2013-02-27402-402/+402
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Update OpenStack LLC to FoundationKurt Taylor2013-02-26402-402/+402
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update all references of "LLC" to "Foundation". Change-Id: I009e86784ef4dcf38882d64b0eff484576e04efe
* | | | | | | | | | | | | | | | Merge "Retry floating_ip_fixed_ip_associate on deadlock."Jenkins2013-02-271-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Retry floating_ip_fixed_ip_associate on deadlock.Russell Bryant2013-02-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the floating_ip_fixed_ip_associate method of the sqlalchemy db API to retry if it fails because of a deadlock. The decorator that handles this was introduced in e53e22271ed7e7a9b919d817a8eb50a1ecce16f8. The related bug report shows that this method could benefit from the use of this decorator. Fix bug 1090016. Change-Id: I0159470e6eb2f8017bcb3e659e7b119194dda920
* | | | | | | | | | | | | | | | | Merge "Use a fake coverage module instead of real one."Jenkins2013-02-274-19/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Use a fake coverage module instead of real one.Vishvananda Ishaya2013-02-204-19/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Actually loading the coverage module was leading to odd concurrency conditions where it was interfering with mocked calls. This changes to stub out the coverage class with a fake one so that we don't have to worry about collisions. It also modifies the coverage class to be created lazily so it isn't automatically started at import time. Finally it removes the hack in run_tests.sh ignoring the coverage tests. Fixes bug 1131023 Change-Id: I39de434454f8b0903f6311e731e215a93027bc91
* | | | | | | | | | | | | | | | | | Merge "Fix redefinition of function test_get_host_uptime"Jenkins2013-02-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Fix redefinition of function test_get_host_uptimeJoe Gordon2013-02-261-3/+0
| | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First test_get_host_uptime was missing a parameter that the second test contains. So remove first test. Fixes bug 1133062 Change-Id: Id886f4e52f45505117fd8e7bf30bc4d77cacd47b
* | | | | | | | | | | | | | | | | | Merge "Fix hacking.py to handle parenthesise in from import as"Jenkins2013-02-271-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Fix hacking.py to handle parenthesise in from import asJoe Gordon2013-02-251-0/+4
| |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug 1133070 Support 'from os import (path as p)' Change-Id: Ie2e5b3150efb6f47b16978f3de64fca37e1717a6