2015-11-25 10:17:18 -06:00
|
|
|
# encoding: utf-8
|
|
|
|
|
2011-05-27 13:17:22 -05:00
|
|
|
# Authors:
|
|
|
|
# Jan Cholasta <jcholast@redhat.com>
|
|
|
|
#
|
|
|
|
# Copyright (C) 2011 Red Hat
|
|
|
|
# see file 'COPYING' for use and warranty information
|
|
|
|
#
|
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
|
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
|
|
# (at your option) any later version.
|
|
|
|
#
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
"""
|
|
|
|
Test the `ipapython/ipautil.py` module.
|
|
|
|
"""
|
|
|
|
|
|
|
|
import nose
|
2015-07-30 10:29:39 -05:00
|
|
|
import pytest
|
Use Python3-compatible dict method names
Python 2 has keys()/values()/items(), which return lists,
iterkeys()/itervalues()/iteritems(), which return iterators,
and viewkeys()/viewvalues()/viewitems() which return views.
Python 3 has only keys()/values()/items(), which return views.
To get iterators, one can use iter() or a for loop/comprehension;
for lists there's the list() constructor.
When iterating through the entire dict, without modifying the dict,
the difference between Python 2's items() and iteritems() is
negligible, especially on small dicts (the main overhead is
extra memory, not CPU time). In the interest of simpler code,
this patch changes many instances of iteritems() to items(),
iterkeys() to keys() etc.
In other cases, helpers like six.itervalues are used.
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
2015-08-11 06:51:14 -05:00
|
|
|
import six
|
2011-05-27 13:17:22 -05:00
|
|
|
|
|
|
|
from ipapython import ipautil
|
|
|
|
|
2015-04-24 07:39:48 -05:00
|
|
|
pytestmark = pytest.mark.tier0
|
|
|
|
|
2011-05-27 13:17:22 -05:00
|
|
|
|
2014-10-23 06:31:45 -05:00
|
|
|
def make_ipaddress_checker(addr, words=None, prefixlen=None):
|
|
|
|
def check_ipaddress():
|
2011-05-27 13:17:22 -05:00
|
|
|
try:
|
|
|
|
ip = ipautil.CheckedIPAddress(addr, match_local=False)
|
|
|
|
assert ip.words == words and ip.prefixlen == prefixlen
|
2016-03-11 12:51:07 -06:00
|
|
|
except Exception:
|
2011-05-27 13:17:22 -05:00
|
|
|
assert words is None and prefixlen is None
|
2014-10-23 06:31:45 -05:00
|
|
|
check_ipaddress.description = "Test IP address parsing and verification (%s)" % addr
|
|
|
|
return check_ipaddress
|
|
|
|
|
2011-05-27 13:17:22 -05:00
|
|
|
|
|
|
|
def test_ip_address():
|
|
|
|
addrs = [
|
2016-09-02 06:25:19 -05:00
|
|
|
('0.0.0.0/0',),
|
2011-05-27 13:17:22 -05:00
|
|
|
('10.11.12.13', (10, 11, 12, 13), 8),
|
|
|
|
('10.11.12.13/14', (10, 11, 12, 13), 14),
|
2012-03-19 07:52:11 -05:00
|
|
|
('10.11.12.13%zoneid',),
|
|
|
|
('10.11.12.13%zoneid/14',),
|
2011-05-27 13:17:22 -05:00
|
|
|
('10.11.12.1337',),
|
|
|
|
('10.11.12.13/33',),
|
|
|
|
('127.0.0.1',),
|
2011-05-27 06:51:21 -05:00
|
|
|
('241.1.2.3',),
|
|
|
|
('169.254.1.2',),
|
2016-09-02 06:25:19 -05:00
|
|
|
('10.11.12.0/24', (10, 11, 12, 0), 24),
|
2016-09-02 10:07:03 -05:00
|
|
|
('10.0.0.255', (10, 0, 0, 255), 8),
|
2011-05-27 06:51:21 -05:00
|
|
|
('224.5.6.7',),
|
2016-09-02 10:07:03 -05:00
|
|
|
('10.11.12.255/24', (10, 11, 12, 255), 24),
|
|
|
|
('255.255.255.255',),
|
2011-05-27 13:17:22 -05:00
|
|
|
|
2016-09-02 06:25:19 -05:00
|
|
|
('::/0',),
|
2011-05-27 13:17:22 -05:00
|
|
|
('2001::1', (0x2001, 0, 0, 0, 0, 0, 0, 1), 64),
|
|
|
|
('2001::1/72', (0x2001, 0, 0, 0, 0, 0, 0, 1), 72),
|
2012-03-19 07:52:11 -05:00
|
|
|
('2001::1%zoneid', (0x2001, 0, 0, 0, 0, 0, 0, 1), 64),
|
|
|
|
('2001::1%zoneid/72',),
|
2011-05-27 13:17:22 -05:00
|
|
|
('2001::1beef',),
|
|
|
|
('2001::1/129',),
|
|
|
|
('::1',),
|
2011-05-27 06:51:21 -05:00
|
|
|
('6789::1',),
|
|
|
|
('fe89::1',),
|
2016-09-02 06:25:19 -05:00
|
|
|
('2001::/64', (0x2001, 0, 0, 0, 0, 0, 0, 0), 64),
|
2011-05-27 06:51:21 -05:00
|
|
|
('ff01::1',),
|
2011-05-27 13:17:22 -05:00
|
|
|
|
|
|
|
('junk',)
|
|
|
|
]
|
|
|
|
|
|
|
|
for addr in addrs:
|
2014-10-23 06:31:45 -05:00
|
|
|
yield make_ipaddress_checker(*addr)
|
2012-04-20 06:03:16 -05:00
|
|
|
|
|
|
|
|
2012-06-15 04:17:49 -05:00
|
|
|
class TestCIDict(object):
|
|
|
|
def setup(self):
|
2012-04-20 06:03:16 -05:00
|
|
|
self.cidict = ipautil.CIDict()
|
|
|
|
self.cidict["Key1"] = "val1"
|
|
|
|
self.cidict["key2"] = "val2"
|
|
|
|
self.cidict["KEY3"] = "VAL3"
|
|
|
|
|
2013-02-05 09:24:46 -06:00
|
|
|
def test_init(self):
|
|
|
|
cidict = ipautil.CIDict()
|
|
|
|
assert dict(cidict.items()) == {}
|
|
|
|
cidict = ipautil.CIDict([('a', 2), ('b', 3), ('C', 4)])
|
|
|
|
assert dict(cidict.items()) == {'a': 2, 'b': 3, 'C': 4}
|
|
|
|
cidict = ipautil.CIDict([('a', 2), ('b', None)], b=3, C=4)
|
|
|
|
assert dict(cidict.items()) == {'a': 2, 'b': 3, 'C': 4}
|
|
|
|
cidict = ipautil.CIDict({'a': 2, 'b': None}, b=3, C=4)
|
|
|
|
assert dict(cidict.items()) == {'a': 2, 'b': 3, 'C': 4}
|
|
|
|
cidict = ipautil.CIDict(a=2, b=3, C=4)
|
|
|
|
assert dict(cidict.items()) == {'a': 2, 'b': 3, 'C': 4}
|
|
|
|
|
2012-06-15 04:17:49 -05:00
|
|
|
def test_len(self):
|
|
|
|
nose.tools.assert_equal(3, len(self.cidict))
|
2012-04-20 06:03:16 -05:00
|
|
|
|
2012-06-15 04:17:49 -05:00
|
|
|
def test_getitem(self):
|
|
|
|
nose.tools.assert_equal("val1", self.cidict["Key1"])
|
|
|
|
nose.tools.assert_equal("val1", self.cidict["key1"])
|
|
|
|
nose.tools.assert_equal("val2", self.cidict["KEY2"])
|
|
|
|
nose.tools.assert_equal("VAL3", self.cidict["key3"])
|
|
|
|
nose.tools.assert_equal("VAL3", self.cidict["KEY3"])
|
|
|
|
with nose.tools.assert_raises(KeyError):
|
2016-06-03 03:47:39 -05:00
|
|
|
self.cidict["key4"] # pylint: disable=pointless-statement
|
2012-06-15 04:17:49 -05:00
|
|
|
|
|
|
|
def test_get(self):
|
|
|
|
nose.tools.assert_equal("val1", self.cidict.get("Key1"))
|
|
|
|
nose.tools.assert_equal("val1", self.cidict.get("key1"))
|
|
|
|
nose.tools.assert_equal("val2", self.cidict.get("KEY2"))
|
|
|
|
nose.tools.assert_equal("VAL3", self.cidict.get("key3"))
|
|
|
|
nose.tools.assert_equal("VAL3", self.cidict.get("KEY3"))
|
|
|
|
nose.tools.assert_equal("default", self.cidict.get("key4", "default"))
|
|
|
|
|
|
|
|
def test_setitem(self):
|
2012-04-20 06:03:16 -05:00
|
|
|
self.cidict["key4"] = "val4"
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal("val4", self.cidict["key4"])
|
2012-04-20 06:03:16 -05:00
|
|
|
self.cidict["KEY4"] = "newval4"
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal("newval4", self.cidict["key4"])
|
2012-04-20 06:03:16 -05:00
|
|
|
|
2012-06-15 04:17:49 -05:00
|
|
|
def test_del(self):
|
2015-07-30 10:29:39 -05:00
|
|
|
assert "Key1" in self.cidict
|
2012-04-20 06:03:16 -05:00
|
|
|
del(self.cidict["Key1"])
|
2015-07-30 10:29:39 -05:00
|
|
|
assert "Key1" not in self.cidict
|
2012-04-20 06:03:16 -05:00
|
|
|
|
2015-07-30 10:29:39 -05:00
|
|
|
assert "key2" in self.cidict
|
2012-04-20 06:03:16 -05:00
|
|
|
del(self.cidict["KEY2"])
|
2015-07-30 10:29:39 -05:00
|
|
|
assert "key2" not in self.cidict
|
2012-04-20 06:03:16 -05:00
|
|
|
|
2012-06-15 04:17:49 -05:00
|
|
|
def test_clear(self):
|
|
|
|
nose.tools.assert_equal(3, len(self.cidict))
|
2012-04-20 06:03:16 -05:00
|
|
|
self.cidict.clear()
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal(0, len(self.cidict))
|
2014-12-16 07:45:37 -06:00
|
|
|
assert self.cidict == {}
|
Use Python3-compatible dict method names
Python 2 has keys()/values()/items(), which return lists,
iterkeys()/itervalues()/iteritems(), which return iterators,
and viewkeys()/viewvalues()/viewitems() which return views.
Python 3 has only keys()/values()/items(), which return views.
To get iterators, one can use iter() or a for loop/comprehension;
for lists there's the list() constructor.
When iterating through the entire dict, without modifying the dict,
the difference between Python 2's items() and iteritems() is
negligible, especially on small dicts (the main overhead is
extra memory, not CPU time). In the interest of simpler code,
this patch changes many instances of iteritems() to items(),
iterkeys() to keys() etc.
In other cases, helpers like six.itervalues are used.
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
2015-08-11 06:51:14 -05:00
|
|
|
assert list(self.cidict) == []
|
|
|
|
assert list(self.cidict.values()) == []
|
|
|
|
assert list(self.cidict.items()) == []
|
|
|
|
if six.PY2:
|
|
|
|
assert self.cidict.keys() == []
|
|
|
|
assert self.cidict.values() == []
|
|
|
|
assert self.cidict.items() == []
|
2014-12-16 07:45:37 -06:00
|
|
|
assert self.cidict._keys == {}
|
2012-04-20 06:03:16 -05:00
|
|
|
|
2012-06-15 04:17:49 -05:00
|
|
|
def test_copy(self):
|
2012-04-20 06:03:16 -05:00
|
|
|
copy = self.cidict.copy()
|
2013-02-05 09:24:46 -06:00
|
|
|
assert copy == self.cidict
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal(3, len(copy))
|
2015-07-30 10:29:39 -05:00
|
|
|
assert "Key1" in copy
|
|
|
|
assert "key1" in copy
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal("val1", copy["Key1"])
|
2012-04-20 06:03:16 -05:00
|
|
|
|
Use Python3-compatible dict method names
Python 2 has keys()/values()/items(), which return lists,
iterkeys()/itervalues()/iteritems(), which return iterators,
and viewkeys()/viewvalues()/viewitems() which return views.
Python 3 has only keys()/values()/items(), which return views.
To get iterators, one can use iter() or a for loop/comprehension;
for lists there's the list() constructor.
When iterating through the entire dict, without modifying the dict,
the difference between Python 2's items() and iteritems() is
negligible, especially on small dicts (the main overhead is
extra memory, not CPU time). In the interest of simpler code,
this patch changes many instances of iteritems() to items(),
iterkeys() to keys() etc.
In other cases, helpers like six.itervalues are used.
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
2015-08-11 06:51:14 -05:00
|
|
|
@pytest.mark.skipif(not six.PY2, reason="Python 2 only")
|
2012-06-15 04:17:49 -05:00
|
|
|
def test_haskey(self):
|
|
|
|
assert self.cidict.has_key("KEY1")
|
|
|
|
assert self.cidict.has_key("key2")
|
|
|
|
assert self.cidict.has_key("key3")
|
2012-04-20 06:03:16 -05:00
|
|
|
|
2013-02-05 09:24:46 -06:00
|
|
|
assert not self.cidict.has_key("Key4")
|
|
|
|
|
|
|
|
def test_contains(self):
|
|
|
|
assert "KEY1" in self.cidict
|
|
|
|
assert "key2" in self.cidict
|
|
|
|
assert "key3" in self.cidict
|
|
|
|
|
|
|
|
assert "Key4" not in self.cidict
|
|
|
|
|
2012-06-15 04:17:49 -05:00
|
|
|
def test_items(self):
|
Use Python3-compatible dict method names
Python 2 has keys()/values()/items(), which return lists,
iterkeys()/itervalues()/iteritems(), which return iterators,
and viewkeys()/viewvalues()/viewitems() which return views.
Python 3 has only keys()/values()/items(), which return views.
To get iterators, one can use iter() or a for loop/comprehension;
for lists there's the list() constructor.
When iterating through the entire dict, without modifying the dict,
the difference between Python 2's items() and iteritems() is
negligible, especially on small dicts (the main overhead is
extra memory, not CPU time). In the interest of simpler code,
this patch changes many instances of iteritems() to items(),
iterkeys() to keys() etc.
In other cases, helpers like six.itervalues are used.
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
2015-08-11 06:51:14 -05:00
|
|
|
items = list(self.cidict.items())
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal(3, len(items))
|
2012-04-20 06:03:16 -05:00
|
|
|
items_set = set(items)
|
2012-06-15 04:17:49 -05:00
|
|
|
assert ("Key1", "val1") in items_set
|
|
|
|
assert ("key2", "val2") in items_set
|
|
|
|
assert ("KEY3", "VAL3") in items_set
|
2012-04-20 06:03:16 -05:00
|
|
|
|
2015-08-12 08:39:46 -05:00
|
|
|
assert list(self.cidict.items()) == list(self.cidict.iteritems()) == list(zip(
|
|
|
|
self.cidict.keys(), self.cidict.values()))
|
2013-02-05 09:24:46 -06:00
|
|
|
|
|
|
|
def test_iter(self):
|
|
|
|
assert list(self.cidict) == list(self.cidict.keys())
|
|
|
|
assert sorted(self.cidict) == sorted(['Key1', 'key2', 'KEY3'])
|
|
|
|
|
2012-06-15 04:17:49 -05:00
|
|
|
def test_iteritems(self):
|
2012-04-20 06:03:16 -05:00
|
|
|
items = []
|
|
|
|
for (k,v) in self.cidict.iteritems():
|
|
|
|
items.append((k,v))
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal(3, len(items))
|
2012-04-20 06:03:16 -05:00
|
|
|
items_set = set(items)
|
2012-06-15 04:17:49 -05:00
|
|
|
assert ("Key1", "val1") in items_set
|
|
|
|
assert ("key2", "val2") in items_set
|
|
|
|
assert ("KEY3", "VAL3") in items_set
|
2012-04-20 06:03:16 -05:00
|
|
|
|
2012-06-15 04:17:49 -05:00
|
|
|
def test_iterkeys(self):
|
2012-04-20 06:03:16 -05:00
|
|
|
keys = []
|
|
|
|
for k in self.cidict.iterkeys():
|
|
|
|
keys.append(k)
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal(3, len(keys))
|
2012-04-20 06:03:16 -05:00
|
|
|
keys_set = set(keys)
|
2012-06-15 04:17:49 -05:00
|
|
|
assert "Key1" in keys_set
|
|
|
|
assert "key2" in keys_set
|
|
|
|
assert "KEY3" in keys_set
|
2012-04-20 06:03:16 -05:00
|
|
|
|
2012-06-15 04:17:49 -05:00
|
|
|
def test_itervalues(self):
|
2012-04-20 06:03:16 -05:00
|
|
|
values = []
|
|
|
|
for k in self.cidict.itervalues():
|
|
|
|
values.append(k)
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal(3, len(values))
|
2012-04-20 06:03:16 -05:00
|
|
|
values_set = set(values)
|
2012-06-15 04:17:49 -05:00
|
|
|
assert "val1" in values_set
|
|
|
|
assert "val2" in values_set
|
|
|
|
assert "VAL3" in values_set
|
2012-04-20 06:03:16 -05:00
|
|
|
|
2012-06-15 04:17:49 -05:00
|
|
|
def test_keys(self):
|
Use Python3-compatible dict method names
Python 2 has keys()/values()/items(), which return lists,
iterkeys()/itervalues()/iteritems(), which return iterators,
and viewkeys()/viewvalues()/viewitems() which return views.
Python 3 has only keys()/values()/items(), which return views.
To get iterators, one can use iter() or a for loop/comprehension;
for lists there's the list() constructor.
When iterating through the entire dict, without modifying the dict,
the difference between Python 2's items() and iteritems() is
negligible, especially on small dicts (the main overhead is
extra memory, not CPU time). In the interest of simpler code,
this patch changes many instances of iteritems() to items(),
iterkeys() to keys() etc.
In other cases, helpers like six.itervalues are used.
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
2015-08-11 06:51:14 -05:00
|
|
|
keys = list(self.cidict.keys())
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal(3, len(keys))
|
2012-04-20 06:03:16 -05:00
|
|
|
keys_set = set(keys)
|
2012-06-15 04:17:49 -05:00
|
|
|
assert "Key1" in keys_set
|
|
|
|
assert "key2" in keys_set
|
|
|
|
assert "KEY3" in keys_set
|
2012-04-20 06:03:16 -05:00
|
|
|
|
Use Python3-compatible dict method names
Python 2 has keys()/values()/items(), which return lists,
iterkeys()/itervalues()/iteritems(), which return iterators,
and viewkeys()/viewvalues()/viewitems() which return views.
Python 3 has only keys()/values()/items(), which return views.
To get iterators, one can use iter() or a for loop/comprehension;
for lists there's the list() constructor.
When iterating through the entire dict, without modifying the dict,
the difference between Python 2's items() and iteritems() is
negligible, especially on small dicts (the main overhead is
extra memory, not CPU time). In the interest of simpler code,
this patch changes many instances of iteritems() to items(),
iterkeys() to keys() etc.
In other cases, helpers like six.itervalues are used.
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
2015-08-11 06:51:14 -05:00
|
|
|
assert list(self.cidict.keys()) == list(self.cidict.iterkeys())
|
2013-02-05 09:24:46 -06:00
|
|
|
|
2012-06-15 04:17:49 -05:00
|
|
|
def test_values(self):
|
Use Python3-compatible dict method names
Python 2 has keys()/values()/items(), which return lists,
iterkeys()/itervalues()/iteritems(), which return iterators,
and viewkeys()/viewvalues()/viewitems() which return views.
Python 3 has only keys()/values()/items(), which return views.
To get iterators, one can use iter() or a for loop/comprehension;
for lists there's the list() constructor.
When iterating through the entire dict, without modifying the dict,
the difference between Python 2's items() and iteritems() is
negligible, especially on small dicts (the main overhead is
extra memory, not CPU time). In the interest of simpler code,
this patch changes many instances of iteritems() to items(),
iterkeys() to keys() etc.
In other cases, helpers like six.itervalues are used.
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
2015-08-11 06:51:14 -05:00
|
|
|
values = list(self.cidict.values())
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal(3, len(values))
|
2012-04-20 06:03:16 -05:00
|
|
|
values_set = set(values)
|
2012-06-15 04:17:49 -05:00
|
|
|
assert "val1" in values_set
|
|
|
|
assert "val2" in values_set
|
|
|
|
assert "VAL3" in values_set
|
2012-04-20 06:03:16 -05:00
|
|
|
|
Use Python3-compatible dict method names
Python 2 has keys()/values()/items(), which return lists,
iterkeys()/itervalues()/iteritems(), which return iterators,
and viewkeys()/viewvalues()/viewitems() which return views.
Python 3 has only keys()/values()/items(), which return views.
To get iterators, one can use iter() or a for loop/comprehension;
for lists there's the list() constructor.
When iterating through the entire dict, without modifying the dict,
the difference between Python 2's items() and iteritems() is
negligible, especially on small dicts (the main overhead is
extra memory, not CPU time). In the interest of simpler code,
this patch changes many instances of iteritems() to items(),
iterkeys() to keys() etc.
In other cases, helpers like six.itervalues are used.
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
2015-08-11 06:51:14 -05:00
|
|
|
assert list(self.cidict.values()) == list(self.cidict.itervalues())
|
2013-02-05 09:24:46 -06:00
|
|
|
|
2012-06-15 04:17:49 -05:00
|
|
|
def test_update(self):
|
2012-04-20 06:03:16 -05:00
|
|
|
newdict = { "KEY2": "newval2",
|
|
|
|
"key4": "val4" }
|
|
|
|
self.cidict.update(newdict)
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal(4, len(self.cidict))
|
2012-04-20 06:03:16 -05:00
|
|
|
|
Use Python3-compatible dict method names
Python 2 has keys()/values()/items(), which return lists,
iterkeys()/itervalues()/iteritems(), which return iterators,
and viewkeys()/viewvalues()/viewitems() which return views.
Python 3 has only keys()/values()/items(), which return views.
To get iterators, one can use iter() or a for loop/comprehension;
for lists there's the list() constructor.
When iterating through the entire dict, without modifying the dict,
the difference between Python 2's items() and iteritems() is
negligible, especially on small dicts (the main overhead is
extra memory, not CPU time). In the interest of simpler code,
this patch changes many instances of iteritems() to items(),
iterkeys() to keys() etc.
In other cases, helpers like six.itervalues are used.
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
2015-08-11 06:51:14 -05:00
|
|
|
items = list(self.cidict.items())
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal(4, len(items))
|
2012-04-20 06:03:16 -05:00
|
|
|
items_set = set(items)
|
2012-06-15 04:17:49 -05:00
|
|
|
assert ("Key1", "val1") in items_set
|
2012-04-20 06:03:16 -05:00
|
|
|
# note the update "overwrites" the case of the key2
|
2012-06-15 04:17:49 -05:00
|
|
|
assert ("KEY2", "newval2") in items_set
|
|
|
|
assert ("KEY3", "VAL3") in items_set
|
|
|
|
assert ("key4", "val4") in items_set
|
2012-04-20 06:03:16 -05:00
|
|
|
|
2013-02-05 09:24:46 -06:00
|
|
|
def test_update_dict_and_kwargs(self):
|
|
|
|
self.cidict.update({'a': 'va', 'b': None}, b='vb', key2='v2')
|
|
|
|
assert dict(self.cidict.items()) == {
|
|
|
|
'a': 'va', 'b': 'vb',
|
|
|
|
'Key1': 'val1', 'key2': 'v2', 'KEY3': 'VAL3'}
|
|
|
|
|
|
|
|
def test_update_list_and_kwargs(self):
|
|
|
|
self.cidict.update([('a', 'va'), ('b', None)], b='vb', key2='val2')
|
|
|
|
assert dict(self.cidict.items()) == {
|
|
|
|
'a': 'va', 'b': 'vb',
|
|
|
|
'Key1': 'val1', 'key2': 'val2', 'KEY3': 'VAL3'}
|
|
|
|
|
2013-09-23 03:46:01 -05:00
|
|
|
def test_update_duplicate_values_dict(self):
|
|
|
|
with nose.tools.assert_raises(ValueError):
|
|
|
|
self.cidict.update({'a': 'va', 'A': None, 'b': 3})
|
|
|
|
|
|
|
|
def test_update_duplicate_values_list(self):
|
|
|
|
with nose.tools.assert_raises(ValueError):
|
|
|
|
self.cidict.update([('a', 'va'), ('A', None), ('b', 3)])
|
|
|
|
|
|
|
|
def test_update_duplicate_values_kwargs(self):
|
|
|
|
with nose.tools.assert_raises(ValueError):
|
|
|
|
self.cidict.update(a='va', A=None, b=3)
|
|
|
|
|
2013-02-05 09:24:46 -06:00
|
|
|
def test_update_kwargs(self):
|
|
|
|
self.cidict.update(b='vb', key2='val2')
|
|
|
|
assert dict(self.cidict.items()) == {
|
|
|
|
'b': 'vb', 'Key1': 'val1', 'key2': 'val2', 'KEY3': 'VAL3'}
|
|
|
|
|
2012-06-15 04:17:49 -05:00
|
|
|
def test_setdefault(self):
|
|
|
|
nose.tools.assert_equal("val1", self.cidict.setdefault("KEY1", "default"))
|
2012-04-20 06:03:16 -05:00
|
|
|
|
2015-07-30 10:29:39 -05:00
|
|
|
assert "KEY4" not in self.cidict
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal("default", self.cidict.setdefault("KEY4", "default"))
|
2015-07-30 10:29:39 -05:00
|
|
|
assert "KEY4" in self.cidict
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal("default", self.cidict["key4"])
|
2012-04-20 06:03:16 -05:00
|
|
|
|
2015-07-30 10:29:39 -05:00
|
|
|
assert "KEY5" not in self.cidict
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal(None, self.cidict.setdefault("KEY5"))
|
2015-07-30 10:29:39 -05:00
|
|
|
assert "KEY5" in self.cidict
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal(None, self.cidict["key5"])
|
2012-04-20 06:03:16 -05:00
|
|
|
|
2012-06-15 04:17:49 -05:00
|
|
|
def test_pop(self):
|
|
|
|
nose.tools.assert_equal("val1", self.cidict.pop("KEY1", "default"))
|
2015-07-30 10:29:39 -05:00
|
|
|
assert "key1" not in self.cidict
|
2012-04-20 06:03:16 -05:00
|
|
|
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal("val2", self.cidict.pop("KEY2"))
|
2015-07-30 10:29:39 -05:00
|
|
|
assert "key2" not in self.cidict
|
2012-04-20 06:03:16 -05:00
|
|
|
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal("default", self.cidict.pop("key4", "default"))
|
|
|
|
with nose.tools.assert_raises(KeyError):
|
2012-04-20 06:03:16 -05:00
|
|
|
self.cidict.pop("key4")
|
|
|
|
|
2012-06-15 04:17:49 -05:00
|
|
|
def test_popitem(self):
|
2012-04-20 06:03:16 -05:00
|
|
|
items = set(self.cidict.items())
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal(3, len(self.cidict))
|
2012-04-20 06:03:16 -05:00
|
|
|
|
|
|
|
item = self.cidict.popitem()
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal(2, len(self.cidict))
|
|
|
|
assert item in items
|
2012-04-20 06:03:16 -05:00
|
|
|
items.discard(item)
|
|
|
|
|
|
|
|
item = self.cidict.popitem()
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal(1, len(self.cidict))
|
|
|
|
assert item in items
|
2012-04-20 06:03:16 -05:00
|
|
|
items.discard(item)
|
|
|
|
|
|
|
|
item = self.cidict.popitem()
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal(0, len(self.cidict))
|
|
|
|
assert item in items
|
2012-04-20 06:03:16 -05:00
|
|
|
items.discard(item)
|
|
|
|
|
2013-02-05 09:24:46 -06:00
|
|
|
def test_fromkeys(self):
|
|
|
|
dct = ipautil.CIDict.fromkeys(('A', 'b', 'C'))
|
|
|
|
assert sorted(dct.keys()) == sorted(['A', 'b', 'C'])
|
2015-09-18 04:30:15 -05:00
|
|
|
assert list(dct.values()) == [None] * 3
|
2013-02-05 09:24:46 -06:00
|
|
|
|
|
|
|
|
2012-06-15 04:17:49 -05:00
|
|
|
class TestTimeParser(object):
|
|
|
|
def test_simple(self):
|
2012-04-20 06:03:16 -05:00
|
|
|
timestr = "20070803"
|
|
|
|
|
|
|
|
time = ipautil.parse_generalized_time(timestr)
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal(2007, time.year)
|
|
|
|
nose.tools.assert_equal(8, time.month)
|
|
|
|
nose.tools.assert_equal(3, time.day)
|
|
|
|
nose.tools.assert_equal(0, time.hour)
|
|
|
|
nose.tools.assert_equal(0, time.minute)
|
|
|
|
nose.tools.assert_equal(0, time.second)
|
|
|
|
|
|
|
|
def test_hour_min_sec(self):
|
2012-04-20 06:03:16 -05:00
|
|
|
timestr = "20051213141205"
|
|
|
|
|
|
|
|
time = ipautil.parse_generalized_time(timestr)
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal(2005, time.year)
|
|
|
|
nose.tools.assert_equal(12, time.month)
|
|
|
|
nose.tools.assert_equal(13, time.day)
|
|
|
|
nose.tools.assert_equal(14, time.hour)
|
|
|
|
nose.tools.assert_equal(12, time.minute)
|
|
|
|
nose.tools.assert_equal(5, time.second)
|
|
|
|
|
|
|
|
def test_fractions(self):
|
2012-04-20 06:03:16 -05:00
|
|
|
timestr = "2003092208.5"
|
|
|
|
|
|
|
|
time = ipautil.parse_generalized_time(timestr)
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal(2003, time.year)
|
|
|
|
nose.tools.assert_equal(9, time.month)
|
|
|
|
nose.tools.assert_equal(22, time.day)
|
|
|
|
nose.tools.assert_equal(8, time.hour)
|
|
|
|
nose.tools.assert_equal(30, time.minute)
|
|
|
|
nose.tools.assert_equal(0, time.second)
|
2012-04-20 06:03:16 -05:00
|
|
|
|
|
|
|
timestr = "199203301544,25"
|
|
|
|
|
|
|
|
time = ipautil.parse_generalized_time(timestr)
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal(1992, time.year)
|
|
|
|
nose.tools.assert_equal(3, time.month)
|
|
|
|
nose.tools.assert_equal(30, time.day)
|
|
|
|
nose.tools.assert_equal(15, time.hour)
|
|
|
|
nose.tools.assert_equal(44, time.minute)
|
|
|
|
nose.tools.assert_equal(15, time.second)
|
2012-04-20 06:03:16 -05:00
|
|
|
|
|
|
|
timestr = "20060401185912,8"
|
|
|
|
|
|
|
|
time = ipautil.parse_generalized_time(timestr)
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal(2006, time.year)
|
|
|
|
nose.tools.assert_equal(4, time.month)
|
|
|
|
nose.tools.assert_equal(1, time.day)
|
|
|
|
nose.tools.assert_equal(18, time.hour)
|
|
|
|
nose.tools.assert_equal(59, time.minute)
|
|
|
|
nose.tools.assert_equal(12, time.second)
|
|
|
|
nose.tools.assert_equal(800000, time.microsecond)
|
|
|
|
|
|
|
|
def test_time_zones(self):
|
2016-01-15 09:58:38 -06:00
|
|
|
# pylint: disable=no-member
|
|
|
|
|
2012-04-20 06:03:16 -05:00
|
|
|
timestr = "20051213141205Z"
|
|
|
|
|
|
|
|
time = ipautil.parse_generalized_time(timestr)
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal(0, time.tzinfo.houroffset)
|
|
|
|
nose.tools.assert_equal(0, time.tzinfo.minoffset)
|
2012-04-20 06:03:16 -05:00
|
|
|
offset = time.tzinfo.utcoffset(time.tzinfo.dst())
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal(0, offset.seconds)
|
2012-04-20 06:03:16 -05:00
|
|
|
|
|
|
|
timestr = "20051213141205+0500"
|
|
|
|
|
|
|
|
time = ipautil.parse_generalized_time(timestr)
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal(5, time.tzinfo.houroffset)
|
|
|
|
nose.tools.assert_equal(0, time.tzinfo.minoffset)
|
2012-04-20 06:03:16 -05:00
|
|
|
offset = time.tzinfo.utcoffset(time.tzinfo.dst())
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal(5 * 60 * 60, offset.seconds)
|
2012-04-20 06:03:16 -05:00
|
|
|
|
|
|
|
timestr = "20051213141205-0500"
|
|
|
|
|
|
|
|
time = ipautil.parse_generalized_time(timestr)
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal(-5, time.tzinfo.houroffset)
|
|
|
|
nose.tools.assert_equal(0, time.tzinfo.minoffset)
|
2012-04-20 06:03:16 -05:00
|
|
|
# NOTE - the offset is always positive - it's minutes
|
|
|
|
# _east_ of UTC
|
|
|
|
offset = time.tzinfo.utcoffset(time.tzinfo.dst())
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal((24 - 5) * 60 * 60, offset.seconds)
|
2012-04-20 06:03:16 -05:00
|
|
|
|
|
|
|
timestr = "20051213141205-0930"
|
|
|
|
|
|
|
|
time = ipautil.parse_generalized_time(timestr)
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal(-9, time.tzinfo.houroffset)
|
|
|
|
nose.tools.assert_equal(-30, time.tzinfo.minoffset)
|
2012-04-20 06:03:16 -05:00
|
|
|
offset = time.tzinfo.utcoffset(time.tzinfo.dst())
|
2012-06-15 04:17:49 -05:00
|
|
|
nose.tools.assert_equal(((24 - 9) * 60 * 60) - (30 * 60), offset.seconds)
|
2015-11-25 10:17:18 -06:00
|
|
|
|
|
|
|
|
|
|
|
def test_run():
|
|
|
|
result = ipautil.run(['echo', 'foo\x02bar'],
|
|
|
|
capture_output=True,
|
|
|
|
capture_error=True)
|
|
|
|
assert result.returncode == 0
|
|
|
|
assert result.output == 'foo\x02bar\n'
|
|
|
|
assert result.raw_output == b'foo\x02bar\n'
|
|
|
|
assert result.error_output == ''
|
|
|
|
assert result.raw_error_output == b''
|
|
|
|
|
|
|
|
|
|
|
|
def test_run_no_capture_output():
|
|
|
|
result = ipautil.run(['echo', 'foo\x02bar'])
|
|
|
|
assert result.returncode == 0
|
|
|
|
assert result.output is None
|
|
|
|
assert result.raw_output == b'foo\x02bar\n'
|
|
|
|
assert result.error_output is None
|
|
|
|
assert result.raw_error_output == b''
|
|
|
|
|
|
|
|
|
|
|
|
def test_run_bytes():
|
|
|
|
result = ipautil.run(['echo', b'\x01\x02'], capture_output=True)
|
|
|
|
assert result.returncode == 0
|
2016-01-26 06:56:54 -06:00
|
|
|
assert result.raw_output == b'\x01\x02\n'
|
2015-11-25 10:17:18 -06:00
|
|
|
|
|
|
|
|
|
|
|
def test_run_decode():
|
|
|
|
result = ipautil.run(['echo', u'á'.encode('utf-8')],
|
|
|
|
encoding='utf-8', capture_output=True)
|
|
|
|
assert result.returncode == 0
|
|
|
|
if six.PY3:
|
|
|
|
assert result.output == 'á\n'
|
|
|
|
else:
|
|
|
|
assert result.output == 'á\n'.encode('utf-8')
|
|
|
|
|
|
|
|
|
|
|
|
def test_run_decode_bad():
|
|
|
|
if six.PY3:
|
|
|
|
with pytest.raises(UnicodeDecodeError):
|
|
|
|
ipautil.run(['echo', b'\xa0\xa1'],
|
|
|
|
capture_output=True,
|
|
|
|
encoding='utf-8')
|
|
|
|
else:
|
|
|
|
result = ipautil.run(['echo', '\xa0\xa1'],
|
|
|
|
capture_output=True,
|
|
|
|
encoding='utf-8')
|
|
|
|
assert result.returncode == 0
|
|
|
|
assert result.output == '\xa0\xa1\n'
|
|
|
|
|
|
|
|
|
|
|
|
def test_backcompat():
|
|
|
|
result = out, err, rc = ipautil.run(['echo', 'foo\x02bar'],
|
|
|
|
capture_output=True,
|
|
|
|
capture_error=True)
|
|
|
|
assert rc is result.returncode
|
|
|
|
assert out is result.output
|
|
|
|
assert err is result.error_output
|