Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/221068
Change subject: conftool: fixup for regex matching
......................................................................
conftool: fixup for regex matching
Change-Id: I33241843bc924393b57a3e16c253a5738c914dfe
---
M conftool/cli/tool.py
M conftool/tests/unit/test_cli_tool.py
M debian/changelog
3 files changed, 14 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/software/conftool
refs/changes/68/221068/1
diff --git a/conftool/cli/tool.py b/conftool/cli/tool.py
index 1ae4eaf..a7de85d 100644
--- a/conftool/cli/tool.py
+++ b/conftool/cli/tool.py
@@ -16,12 +16,13 @@
def host_list(name, cur_dir, act):
warn = False
if name == "all":
- leaves = KVObject.backend.driver.ls(cur_dir)
+ all = KVObject.backend.driver.ls(cur_dir)
+ objlist = [k for (k,v) in all]
if act == "get":
- print json.dumps(dict(leaves))
+ print json.dumps(dict(all))
return []
else:
- retval = leaves.keys()
+ retval = objlist
warn = True
elif not name.startswith('re:'):
return [name]
@@ -32,9 +33,9 @@
except:
_log.critical("Invalid regexp: %s", regex)
sys.exit(1)
- all = KVObject.backend.driver.ls(cur_dir).keys()
- retval = [objname for objname in all if r.match(objname)]
- warn = (len(all) <= 2 * len(retval))
+ objlist = [k for (k,v) in KVObject.backend.driver.ls(cur_dir)]
+ retval = [objname for objname in objlist if r.match(objname)]
+ warn = (len(objlist) <= 2 * len(retval))
if warn and act in ['set', 'del']:
raise_warning()
return retval
diff --git a/conftool/tests/unit/test_cli_tool.py
b/conftool/tests/unit/test_cli_tool.py
index 4fefc74..2c094d1 100644
--- a/conftool/tests/unit/test_cli_tool.py
+++ b/conftool/tests/unit/test_cli_tool.py
@@ -16,16 +16,16 @@
def test_get_hosts(self):
"""Tests getting the host list"""
- host_dir = {
- 'cp1011.example.com': {'pooled': 'yes'},
- 'cp1020.example.com': {'pooled': 'no'},
- 'cp1014.local': {'pooled': 'no'}
- }
+ host_dir = [
+ ('cp1011.example.com', {'pooled': 'yes'}),
+ ('cp1020.example.com', {'pooled': 'no'}),
+ ('cp1014.local', {'pooled': 'no'})
+ ]
self._mock_list(host_dir)
l = tool.host_list('simple', '/whatever', 'get')
self.assertEquals(l, ['simple'])
l = tool.host_list('all', '/whatever', 'dummy')
- self.assertItemsEqual(l, host_dir.keys())
+ self.assertItemsEqual(l, [k for (k,v) in host_dir])
l = tool.host_list('all', '/whatever', 'get')
self.assertEquals(l, [])
l = tool.host_list('re:.*\.local', '/whatever', 'get')
diff --git a/debian/changelog b/debian/changelog
index 9776fbd..288fbd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-conftool (0.1.2) UNRELEASED; urgency=medium
+python-conftool (0.1.2) precise-wikimedia; urgency=medium
* Added regexp matching of targets
--
To view, visit https://gerrit.wikimedia.org/r/221068
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I33241843bc924393b57a3e16c253a5738c914dfe
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/conftool
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
