summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Fix Pep8 WarningDirk Mueller2013-01-281-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes E271 multiple spaces after keyword "return _run_shell_command(" Change-Id: Ic6b2c88a0b7cabd04341d073ef837a13c1bb7a29
* | | | Merge "Update copyright on install_venv_common.py"Jenkins2013-01-291-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Update copyright on install_venv_common.pyMatthew Treinish2013-01-281-0/+1
| |/ / | | | | | | | | | | | | | | | | | | This updates the copyrights on install_venv_common.py to include IBM. Change-Id: I5da3d9f1f511f20b332dc206aba4bcd2011a4940
* / / Add TTL to AMQP messagesBrent Eagles2013-01-285-15/+150
|/ / | | | | | | | | | | | | | | | | | | This patch sets a TTL derived from the timeout parameter used when invoking the RPC. Needed for: * Bug 1053614 Change-Id: Idaf9a2a972feac3f95f170c52632033b027b4414
* | Merge "Fixes "is not", "not in" syntax usage."Jenkins2013-01-283-7/+7
|\ \
| * | Fixes "is not", "not in" syntax usage.Zhongyue Luo2013-01-283-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | Replaced "not ... is" to "is not" Replaced "not ... in" to "not in" Removed a redundant parenthesis Change-Id: I9564ab1207ccdcb32d7c2bb9e8f29658b2232ff9
* | | Merge "Add install_venv library."Jenkins2013-01-281-0/+224
|\ \ \
| * | | Add install_venv library.Matthew Treinish2013-01-241-0/+224
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a install_venv.py library that can be used by each project's tools/install_venv.py script. Currently all the projects have very similar install_venv scripts in their respective tools directories that all accomplish the same end result. This just breaks out the common code and puts it in a class that can be imported and used in each project's script. Change-Id: I8346fc4201f35e5d0c475caef893ca71e7db8236
* | | Merge "Prevent parallel test port clashes for zmq."Jenkins2013-01-282-6/+14
|\ \ \
| * | | Prevent parallel test port clashes for zmq.Monty Taylor2013-01-242-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The scheme of incrementing port numbers did not work so well for parallel test runs. Part of blueprint grizzly-testtools. Change-Id: I100e79ae79e4409691145dc721139d1a86839199
* | | | Merge "Replace direct use of testtools BaseTestCase."Jenkins2013-01-2830-132/+121
|\| | |
| * | | Replace direct use of testtools BaseTestCase.Monty Taylor2013-01-2430-132/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the BaseTestCase across the tests in the tree lets us put in log fixtures and consistently handle mox and stubout. Part of blueprint grizzly-testtools. Change-Id: Iba7eb2c63b0c514009b2c28e5930b27726a147b0
* | | | Merge "Remove the last of the nose-isms."Jenkins2013-01-281-13/+12
|\| | |
| * | | Remove the last of the nose-isms.Monty Taylor2013-01-241-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testtools provides a skipTest method, so there's no need to pull in nose directly into the tests. Part of blueprint grizzly/testtools. Change-Id: I97a9f09a27cad0433949a96fc18001ecf69c8ba2
* | | | Merge "Replaced direct usage of stubout with BaseTestCase."Jenkins2013-01-286-39/+13
|\| | |
| * | | Replaced direct usage of stubout with BaseTestCase.Monty Taylor2013-01-246-39/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BaseTestCase properly hooks stubout into fixtures. Just use that. Part of blueprint grizzly-testtools. Change-Id: I4bf6b92b9b16d051d8c6ecaf52cf70925848ed8c
* | | | Merge "Fix up test_qpid to use BaseTestCase."Jenkins2013-01-282-30/+16
|\| | |
| * | | Fix up test_qpid to use BaseTestCase.Monty Taylor2013-01-242-30/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While we're in there, simplify its use of fixtures. Part of blueprint grizzly-testtools. Change-Id: I7ef05cc9c191aab1959a31770f905f34447e64ea
* | | | Merge "Use testtools as test base class."Jenkins2013-01-2845-410/+208
|\| | |
| * | | Use testtools as test base class.Monty Taylor2013-01-2445-410/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the path to testr migration, we need to replace the unittest base classes with testtools. Replace tearDown with addCleanup, addCleanup is more resilient than tearDown. The fixtures library has excellent support for managing and cleaning tempfiles. Use it. Replace skip_ with testtools.skipTest Part of blueprint grizzly-testtools. Change-Id: I45e11bbb1ff9b31f3278d3b016737dcb7850cd98
* | | | Merge "Start adding reusable test fixtures."Jenkins2013-01-283-0/+39
|\| | | | |_|/ |/| |
| * | Start adding reusable test fixtures.Monty Taylor2013-01-243-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | Now that nova is using fixtures, we have grown some that can be used across projects. The mox/stubout fixture is a great example of this - and also can be used in the oslo tests themselves. Change-Id: Ia78019317a6772c5c66a875c948854248383f9ea
* | | Merge "Document tools/flakes is from commons"Jenkins2013-01-261-0/+2
|\ \ \
| * | | Document tools/flakes is from commonsJoe Gordon2013-01-241-0/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | When copying tools around it may not be clear that they came from openstack-common. So add a note at top of code. Had to say from openstack-common since cannot say from oslo-incubator since word oslo is replaced when copied. Change-Id: I7514c88d448f13cb7b11ed1ea81a035c6a201bae
* / | setup: count revs for revno if there are no tagsMark McLoughlin2013-01-251-3/+17
|/ / | | | | | | | | | | | | | | | | | | | | | | We currently use 'git describe --always' to figure out the number of commits there have been leading up to the HEAD commit. However, if there are no tags in the repo, git-describe just returns the sha hash of HEAD and we fail. In that case, use 'git rev-list HEAD | wc -l' so we can be #winning. Change-Id: I345e0ee32189504276b3dfd3367057ce1d4a2b06
* | Merge "UTC ISO8601 from timestamp"Jenkins2013-01-232-0/+12
|\ \
| * | UTC ISO8601 from timestampFlaper Fesp2013-01-212-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Taken from glance xattr.py module. This function converts timestamp formated dates into a UTC Iso 8601 date. It is being required in multiple places now (mostly on clients printing dates) in order to make dates human readable. Change-Id: I6f19325a4c2df241a0ef76bd256280a2930d9265
* | | Merge "Import timeutils.is_soon from keystoneclient"Jenkins2013-01-232-0/+19
|\ \ \
| * | | Import timeutils.is_soon from keystoneclientJulien Danjou2013-01-232-0/+19
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | This is a function defined as will_expire_soon at least twice in python-keystoneclient, and it's actually quite handy. There is a comment on that code about moving to timeutils, and it actually sounds like a good idea since I'm likely to use it in Ceilometer, so here it is. Change-Id: Idf208ce9e7ce9048a38d98212b7f730c6b7c8288 Signed-off-by: Julien Danjou <julien@danjou.info>
* / | Allow update.py to copy toolsJoe Gordon2013-01-232-0/+14
|/ / | | | | | | | | | | With first tool: flakes.py Change-Id: Ie7880927c74ceff174b3b0d2730c499790650921
* | Merge "Enable ZeroMQ tests"Jenkins2013-01-222-1/+1
|\ \
| * | Enable ZeroMQ testsEric Windisch2013-01-192-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ZeroMQ tests were not enabled as the required library was not installed to the tox environment. This change will re-enable zeromq messaging tests for both local development and jenkins. Change-Id: Icffbffcb2b83c74f06075d93e1397c5c9b511a67
* | | Merge "Move logging config options into the log module"Jenkins2013-01-214-142/+123
|\ \ \
| * | | Move logging config options into the log moduleMark McLoughlin2013-01-214-142/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We learned a lesson in Nova - it's best to declare and use config options within a single module if possible. Globally declared and use config options grow like weeds and it becomes harder to find out if, where and how individual options are used. Strangely, in cfg itself, we randomly declare a bunch of logging options which are only used within the openstack.common.log module - let's move the options there and remove the CommonConfigOpts class before they become part of the API we commit to when oslo-config is released. A minor detail in the patch - the logfile and logdir options are already deprecated in favour of log_file and log_dir, but we never got around to removing all other traces of the deprecated options. Change-Id: I3913ea54465658d93dc56e014dfe5d911b0541d6
* | | | Merge "Use revno and git sha for pre-release versioning."Jenkins2013-01-213-12/+41
|\ \ \ \
| * | | | Use revno and git sha for pre-release versioning.Monty Taylor2013-01-183-12/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In discussions with ttx and zul, it became clear that the git describe info for our intra-release case wasn't providing any value and was providing confusion. Additionally, plain git sha's are not providing enough info. So, the scheme settled on that breaks the least amount of things and yet still reduces complexity is: if pre-version: # server projects try: use current tag except: use pre-version+revcount+gitsha else: use git describe | s/-/./ Additionally, we'll use a as a prefix for the revcount, b as the prefix for the milestone portion of a milestone tag, and rc as the prefix for rc's, so that for our releases, python version sorting works as expected. Change-Id: I6f0fe029d225afa8f435bc83216fc144c2402ae0
* | | | | Merge "Add env var version override for packagers."Jenkins2013-01-211-0/+3
|\| | | | | |/ / / |/| | |
| * | | Add env var version override for packagers.Monty Taylor2013-01-181-0/+3
| | |/ | |/| | | | | | | | | | | | | Fixes bug 1100805. Change-Id: I8c8ba8610ed2d9093e188c1412e9689314560015
* / | Remove unused etc/openstack-common.conf.testMark McLoughlin2013-01-211-31/+0
|/ / | | | | | | | | | | This is unused since commit e0f57e92 removed the extensions module. Change-Id: Ia24d01c42fc9fb2e12eea697d217b30d7d6b2a51
* | Merge "Require greenlet 0.3.2 (or later)"Jenkins2013-01-181-1/+1
|\ \
| * | Require greenlet 0.3.2 (or later)Zane Bitter2013-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 0.3.2 resolves a bug that allowed generic "except Exception:" clauses to catch GreenletExit exceptions. bug 1097203 Change-Id: Iecf36df36e5eefa45c70fae69c966bcd1f723c8f Signed-off-by: Zane Bitter <zbitter@redhat.com>
* | | Merge "Fixes import order errors"Jenkins2013-01-188-9/+9
|\ \ \
| * | | Fixes import order errorsZhongyue Luo2013-01-188-9/+9
| | |/ | |/| | | | | | | Change-Id: I3e35230dd2d96ab9f5a8c11b9ec1cd8d2d00e347
* | | trivial pep whitespace fixSteven Hardy2013-01-181-1/+1
| |/ |/| | | | | | | | | | | | | Fix multiple spaces after keyword pep8 error, causes our pep8 gate to fail (pep8 1.3.4) Change-Id: I67ab86ce17a1a91f8dab61efb18b83b22d2e1488 Signed-off-by: Steven Hardy <shardy@redhat.com>
* | Merge "Remove write_requirements"Jenkins2013-01-181-9/+0
|\ \
| * | Remove write_requirementsMonty Taylor2013-01-161-9/+0
| | | | | | | | | | | | | | | | | | | | | Everyone hated this, so we decided to get rid of it at the last summit. Actually, come to think of it, I think we decied to get rid of it in San Fran. Change-Id: I7d93af1eb98a37ff018730669731a7ee22516279
* | | Merge "ThreadGroup remove unused name parameters"Jenkins2013-01-182-7/+5
|\ \ \ | |_|/ |/| |
| * | ThreadGroup remove unused name parametersSteven Hardy2013-01-162-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thread/ThreadGroup constructors take a name parameter which is never used, so we can simplify things a bit by removing it. If anything is referencing the internal self.name it should be using its own name->threadgroup mapping (e.g via a dict or similar container class) Change-Id: I6877a2fcee60ce9fc087d38aa492d7c9d50ce97e Signed-off-by: Steven Hardy <shardy@redhat.com>
* | | Merge "use regexp to parse the mailmap"Jenkins2013-01-171-5/+6
|\ \ \ | |_|/ |/| |
| * | use regexp to parse the mailmapIonuț Arțăriși2013-01-161-5/+6
| | | | | | | | | | | | | | | | | | | | | this also makes parse_mailmap() work with the swift .mailmap and should be more readable Change-Id: I3abb2a18d655e507bee5f621ebc64421d943cf0b