summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2007-08-20 10:36:47 -0400
committerMichael DeHaan <mdehaan@redhat.com>2007-08-20 10:36:47 -0400
commit4b6d93d6f8e1006cd80f87ca356933d8ed5bef9b (patch)
tree8c11603f597c78c1dfafb13c1736485b7d0bcba3
parent001e21dd52d82c6984376f52470ff10ba50374e2 (diff)
downloadthird_party-cobbler-4b6d93d6f8e1006cd80f87ca356933d8ed5bef9b.tar.gz
third_party-cobbler-4b6d93d6f8e1006cd80f87ca356933d8ed5bef9b.tar.xz
third_party-cobbler-4b6d93d6f8e1006cd80f87ca356933d8ed5bef9b.zip
Adding zeroconf to changelog
-rw-r--r--CHANGELOG1
-rw-r--r--cobbler/collection.py2
-rw-r--r--tests/tests.py4
3 files changed, 6 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f180cd3..13177dc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@ Cobbler CHANGELOG
- allow find API to search by arbitrary fields
- status and logging now shows system names
- upgraded init scripts
+- zeroconf/avahi publishing for cobblerd service
* Thu Aug 09 2007 - 0.6.0
- bugfix in error path in "cobbler check"
diff --git a/cobbler/collection.py b/cobbler/collection.py
index 16ad9ac..c113481 100644
--- a/cobbler/collection.py
+++ b/cobbler/collection.py
@@ -58,6 +58,8 @@ class Collection(serializable.Serializable):
"""
Return first object in the collection that maches all item='value'
pairs passed, else return None if no objects can be found.
+ When return_list is set, can also return a list. Empty list
+ would be returned instead of None in that case.
"""
matches = []
diff --git a/tests/tests.py b/tests/tests.py
index 291e8c3..7cf939e 100644
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -153,7 +153,9 @@ class Additions(BootTest):
self.failUnlessRaises(CobblerException, self.api.systems().find)
# searching for a list returns a list of correct length
self.assertTrue(len(self.api.systems().find(mac_address="00:16:41:14:B7:71",return_list=True))==1)
-
+ # make sure we can still search without an explicit keyword arg
+ self.assertTrue(len(self.api.systems().find("00:16:41:14:B7:71",return_list=True))==1)
+ self.assertTrue(self.api.systems().find("00:16:41:14:B7:71"))
def test_invalid_distro_non_referenced_kernel(self):
distro = self.api.new_distro()