projects
/
ganeti-local
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel-2.1'
[ganeti-local]
/
test
/
ganeti.confd_client_unittest.py
diff --git
a/test/ganeti.confd_client_unittest.py
b/test/ganeti.confd_client_unittest.py
index
e3f966d
..
d116483
100755
(executable)
--- a/
test/ganeti.confd_client_unittest.py
+++ b/
test/ganeti.confd_client_unittest.py
@@
-30,6
+30,8
@@
from ganeti import errors
import ganeti.confd.client
+import testutils
+
class ResettableMock(object):
def __init__(self, *args, **kwargs):
@@
-182,4
+184,4
@@
class TestClient(unittest.TestCase):
if __name__ == '__main__':
- unittest.main()
+ testutils.GanetiTestProgram()