Revision 420598d0 kamaki/clients/tests/__init__.py
| b/kamaki/clients/tests/__init__.py | ||
|---|---|---|
| 67 | 67 |
else key |
| 68 | 68 |
|
| 69 | 69 |
def _get_from_cnf(self, key): |
| 70 |
val = (self._cnf.get('test', '%s_%s' % key) if key[0] else None)\
|
|
| 71 |
or self._cnf.get(*key)\ |
|
| 72 |
or self._cnf.get('test', key[1])\
|
|
| 73 |
or self._cnf.get('global', key[1])
|
|
| 70 |
val = 0 |
|
| 71 |
if key[0]: |
|
| 72 |
val = self._cnf.get('test', '%s_%s' % key)\
|
|
| 73 |
or self._cnf.get(*key) |
|
| 74 |
if not val: |
|
| 75 |
val = self._cnf.get('test', key[1])\
|
|
| 76 |
or self._cnf.get('global', key[1])
|
|
| 74 | 77 |
self._fetched[key] = val |
| 75 | 78 |
return val |
| 76 | 79 |
|
| ... | ... | |
| 100 | 103 |
suiteFew.addTest(testCyclades('test_000'))
|
| 101 | 104 |
else: |
| 102 | 105 |
suiteFew.addTest(testCyclades('test_' + argv[1]))
|
| 106 |
""" |
|
| 103 | 107 |
if len(argv) == 0 or argv[0] == 'image': |
| 108 |
from kamaki.clients.tests.image import Image |
|
| 104 | 109 |
if len(argv) == 1: |
| 105 |
suiteFew.addTest(unittest.makeSuite(testImage))
|
|
| 110 |
suiteFew.addTest(makeSuite(Image))
|
|
| 106 | 111 |
else: |
| 107 |
suiteFew.addTest(testImage('test_' + argv[1]))
|
|
| 108 |
""" |
|
| 112 |
suiteFew.addTest(Image('test_' + argv[1]))
|
|
| 109 | 113 |
if len(argv) == 0 or argv[0] == 'astakos': |
| 110 | 114 |
from kamaki.clients.tests.astakos import Astakos |
| 111 | 115 |
if len(argv) == 1: |
Also available in: Unified diff