cura-tools-devel April 2014

cura-tools-devel@lists.fedorahosted.org

3 participants
47 discussions

[cura-tools] openlmi-tools-lmiwbem: merged changes from openlmi-scripts upstream [1/3] (sources) (fbebbaf)
by phatina＠fedoraproject.org 16 Apr '14

16 Apr '14

1 0

[cura-tools] openlmi-tools-lmiwbem: doc: fixed figure creation (3ac714d)
by phatina＠fedoraproject.org 16 Apr '14

16 Apr '14

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : openlmi-tools-lmiwbem >--------------------------------------------------------------- commit 3ac714d85ff92dde036c9728086d5f04432a69df Author: Michal Minar <miminar(a)redhat.com> Date: Mon Apr 14 15:48:01 2014 +0200 doc: fixed figure creation >--------------------------------------------------------------- doc/src/scripts/Makefile | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/src/scripts/Makefile b/doc/src/scripts/Makefile index 72c2f98..73cbb0a 100644 --- a/doc/src/scripts/Makefile +++ b/doc/src/scripts/Makefile @@ -5,12 +5,12 @@ SRCDIR ?= ../../../cli TUTORIAL_SOURCES := mylf/*.md mylf/*.py mylf/lmi/*.py mylf/*/*.py mylf/*/*/*.py \ mylf/doc/*.py mylf/doc/*.rst mylf/doc/Makefile mylf/doc/static TUTORIAL_TARBALL := ../static/mylf.tar.gz -SRCFIGS := ../static/*.svg +SRCFIGS := $(wildcard ../static/*.svg) DSTFIGS := $(patsubst %.svg,%.png,$(SRCFIGS)) .PHONY: help clean html commands.rst -all: api.rst commands.rst $(TUTORIAL_TARBALL) +all: api.rst commands.rst $(TUTORIAL_TARBALL) fig api.rst: gendoc.sh $(wildcard $(SRCDIR)/lmi/scripts/*.py \ $(SRCDIR)/lmi/scripts/common/*.py \ @@ -20,8 +20,8 @@ api.rst: gendoc.sh $(wildcard $(SRCDIR)/lmi/scripts/*.py \ fig: $(DSTFIGS) -%.png: %.src - convert $@ $? +%.png: %.svg + convert $? $@ commands.rst: echo "Command libraries documentation" > $@ @@ -38,7 +38,7 @@ commands.rst: ) >> $@ clean: - -rm -rf modules/ api.rst commands.rst $(TUTORIAL_TARBALL) + -rm -rf modules/ api.rst commands.rst $(TUTORIAL_TARBALL) $(DSTFIGS) $(TUTORIAL_TARBALL): tar -czf $@ mylf

1 0

[cura-tools] master: backport metacommand to python 2.6 (ac24802)
by phatina＠fedoraproject.org 16 Apr '14

16 Apr '14

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit ac248028affada79ac31e8a0893e00ca830b2006 Author: Peter Hatina <phatina(a)redhat.com> Date: Wed Apr 16 12:35:56 2014 +0200 backport metacommand to python 2.6 >--------------------------------------------------------------- cli/lmi/scripts/_metacommand/__init__.py | 6 +++--- cli/lmi/scripts/_metacommand/manager.py | 4 ++-- cli/lmi/scripts/common/command/endpoint.py | 2 +- cli/lmi/scripts/common/session.py | 2 +- cli/lmi/scripts/common/util.py | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cli/lmi/scripts/_metacommand/__init__.py b/cli/lmi/scripts/_metacommand/__init__.py index 46fbe7b..a551a80 100644 --- a/cli/lmi/scripts/_metacommand/__init__.py +++ b/cli/lmi/scripts/_metacommand/__init__.py @@ -139,11 +139,11 @@ class MetaCommand(object): sys.exit(1) add_hosts(*util.get_hosts_credentials(self._options['--host'])) if self._options['--user']: - credentials.update({ + credentials.update( # credentials in file has precedence over --user option - h : credentials.get(h, (self._options['--user'], '')) + dict((h, credentials.get(h, (self._options['--user'], ''))) for h in hostnames if h not in credentials - }) + )) self._session = Session(self, hostnames, credentials, same_credentials=self._options['--same-credentials']) return self._session diff --git a/cli/lmi/scripts/_metacommand/manager.py b/cli/lmi/scripts/_metacommand/manager.py index e51293c..f38f141 100644 --- a/cli/lmi/scripts/_metacommand/manager.py +++ b/cli/lmi/scripts/_metacommand/manager.py @@ -157,8 +157,8 @@ class CommandManager(object): entry points -- are preserved. """ if keep_custom: - keep = { n: c for n, c in self._commands.items() - if isinstance(c, _CustomCommandWrapper)} + keep = dict((n, c) for n, c in self._commands.items() + if isinstance(c, _CustomCommandWrapper)) else: keep = {} self._commands = {} diff --git a/cli/lmi/scripts/common/command/endpoint.py b/cli/lmi/scripts/common/command/endpoint.py index 1357eac..b38af50 100644 --- a/cli/lmi/scripts/common/command/endpoint.py +++ b/cli/lmi/scripts/common/command/endpoint.py @@ -176,7 +176,7 @@ class LmiEndPointCommand(base.LmiBaseCommand): argspec = inspect.getargspec( factory.__init__ if type(factory) is type else factory) if not argspec.keywords: - kwargs = {k: v for k, v in opts.items() if k in argspec.args} + kwargs = dict((k, v) for k, v in opts.items() if k in argspec.args) self._formatter = factory(self.app.stdout, **kwargs) return self._formatter diff --git a/cli/lmi/scripts/common/session.py b/cli/lmi/scripts/common/session.py index 46a1034..e977e5a 100644 --- a/cli/lmi/scripts/common/session.py +++ b/cli/lmi/scripts/common/session.py @@ -43,7 +43,7 @@ class Session(object): def __init__(self, app, hosts, credentials=None, same_credentials=False): self._app = app - self._connections = {h: None for h in hosts} + self._connections = dict((h, None) for h in hosts) # { hostname : (username, password, verified), ... } # where verified is a flag saying, whether these credentials # were successfuly used for logging in diff --git a/cli/lmi/scripts/common/util.py b/cli/lmi/scripts/common/util.py index 4ee2161..0101dbe 100644 --- a/cli/lmi/scripts/common/util.py +++ b/cli/lmi/scripts/common/util.py @@ -94,8 +94,8 @@ class FilteredDict(dict): def __lt__(self, other): if isinstance(other, dict): - return { k: v for k, v in self._original.items() - if k in self._keys} < other + return dict((k, v) for k, v in self._original.items() + if k in self._keys) < other if not isinstance(other, FilteredDict): raise TypeError("Can not compare FilteredDict to objects" " of other types!")

1 0

[cura-tools] master: fix obsolete label in documentation (3da689b)
by phatina＠fedoraproject.org 16 Apr '14

16 Apr '14

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 3da689b5f33259f79ea97b79925235e93427988f Author: Peter Hatina <phatina(a)redhat.com> Date: Wed Apr 16 09:49:09 2014 +0200 fix obsolete label in documentation >--------------------------------------------------------------- doc/src/shell/classes.rst | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/doc/src/shell/classes.rst b/doc/src/shell/classes.rst index a295a7d..2098a60 100644 --- a/doc/src/shell/classes.rst +++ b/doc/src/shell/classes.rst @@ -172,8 +172,6 @@ code: ... > -.. _class_valuemap_properties: - **NOTE:** The suffix "**Values**" provides a way, how to access ValueMap properties.

1 0

[cura-tools] master: fix broken documentation for lmishell (c1d97cb)
by phatina＠fedoraproject.org 16 Apr '14

16 Apr '14

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit c1d97cb4fabad63ddf1bb624bc55022f46f46d9b Author: Peter Hatina <phatina(a)redhat.com> Date: Wed Apr 16 09:44:37 2014 +0200 fix broken documentation for lmishell >--------------------------------------------------------------- cli/lmi/shell/LMIClass.py | 4 ++-- doc/src/shell/classes.rst | 2 ++ doc/src/shell/structure.rst | 10 ---------- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/cli/lmi/shell/LMIClass.py b/cli/lmi/shell/LMIClass.py index 730fddc..ca39740 100644 --- a/cli/lmi/shell/LMIClass.py +++ b/cli/lmi/shell/LMIClass.py @@ -268,7 +268,7 @@ class LMIClass(LMIWrapperBaseObject): """ :returns: list of strings of the constant names - **Usage:** :ref:`class_valuemap_properties`. + **Usage:** :ref:`class_get_valuemap_properties`. """ return self._valuemap_properties_list @@ -278,7 +278,7 @@ class LMIClass(LMIWrapperBaseObject): """ Prints out the list of string of constant names. - **Usage:** :ref:`class_valuemap_properties`. + **Usage:** :ref:`class_get_valuemap_properties`. """ for i in self._valuemap_properties_list: sys.stdout.write("%s\n" % i) diff --git a/doc/src/shell/classes.rst b/doc/src/shell/classes.rst index 2098a60..a295a7d 100644 --- a/doc/src/shell/classes.rst +++ b/doc/src/shell/classes.rst @@ -172,6 +172,8 @@ code: ... > +.. _class_valuemap_properties: + **NOTE:** The suffix "**Values**" provides a way, how to access ValueMap properties. diff --git a/doc/src/shell/structure.rst b/doc/src/shell/structure.rst deleted file mode 100644 index 4c9daec..0000000 --- a/doc/src/shell/structure.rst +++ /dev/null @@ -1,10 +0,0 @@ -Structure -========= -LMIShell is based on a python interpreter and added logic, therefore what you -can do in pure python, it is possible in LMIShell. There are classes added to -manipulate with CIM classes, instance names, instances, etc. Additional -classes are added to fulfill wrapper pattern and expose only those methods, -which are necessary for the purpose of a shell. Following scheme depicts a -structure of the LMIShell. - -.. image:: ../static/lmi-scheme.png

1 0

[cura-tools] master: added pyparsing dependency to setup (3b391fc)
by miminar＠fedoraproject.org 16 Apr '14

16 Apr '14

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 3b391fc0d0d0672eeeb509f575f4c31f97ae6021 Author: Michal Minar <miminar(a)redhat.com> Date: Wed Apr 16 09:33:01 2014 +0200 added pyparsing dependency to setup Required by newer versions of lmi meta-command. >--------------------------------------------------------------- cli/setup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cli/setup.py b/cli/setup.py index 4d69008..c198764 100644 --- a/cli/setup.py +++ b/cli/setup.py @@ -71,7 +71,7 @@ setup( , 'lmi.scripts.common.command' , 'lmi.scripts.common.formatter' , 'lmi.scripts.common.versioncheck']), - install_requires=["docopt >= 0.6", "openlmi"], + install_requires=["docopt >= 0.6", "openlmi", "pyparsing"], scripts=["lmishell"], entry_points={

1 0

[cura-tools] master: backport to python 2.6 (f43b3b8)
by phatina＠fedoraproject.org 16 Apr '14

16 Apr '14

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit f43b3b8050840d857cd8a9ee23c0d16ecf7be6c5 Author: Peter Hatina <phatina(a)redhat.com> Date: Wed Apr 16 08:08:04 2014 +0200 backport to python 2.6 >--------------------------------------------------------------- cli/lmi/shell/LMIInstance.py | 4 ++-- cli/lmi/shell/LMIMethod.py | 5 ++--- cli/lmi/shell/LMIUtil.py | 21 +++++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cli/lmi/shell/LMIInstance.py b/cli/lmi/shell/LMIInstance.py index 9597447..96f1940 100644 --- a/cli/lmi/shell/LMIInstance.py +++ b/cli/lmi/shell/LMIInstance.py @@ -617,8 +617,8 @@ class LMIInstance(LMIWrapperBaseObject): :returns: dictionary of :py:class:`CIMInstance` properties :raises: :py:exc:`.LMIDeletedObjectError` """ - return pywbem.NocaseDict({ - k: x.value for k, x in self._cim_instance.properties.iteritems()}) + return pywbem.NocaseDict(dict((k, x.value) + for k, x in self._cim_instance.properties.iteritems())) @lmi_possibly_deleted(None) def property_value(self, prop_name): diff --git a/cli/lmi/shell/LMIMethod.py b/cli/lmi/shell/LMIMethod.py index 8147312..4bb6b3e 100644 --- a/cli/lmi/shell/LMIMethod.py +++ b/cli/lmi/shell/LMIMethod.py @@ -198,9 +198,8 @@ class LMIMethod(LMIWrapperBaseObject): rval = None rparams = pywbem.NocaseDict() if not job_inst.JobOutParameters is None: - rparams = pywbem.NocaseDict({ - k: x.value - for k, x in job_inst.JobOutParameters.properties.iteritems()}) + rparams = pywbem.NocaseDict(dict((k, x.value) + for k, x in job_inst.JobOutParameters.properties.iteritems())) rval = rparams["__ReturnValue"] del rparams["__ReturnValue"] # NocaseDict has no pop() errorstr = "" diff --git a/cli/lmi/shell/LMIUtil.py b/cli/lmi/shell/LMIUtil.py index 493cf77..cf81d86 100644 --- a/cli/lmi/shell/LMIUtil.py +++ b/cli/lmi/shell/LMIUtil.py @@ -132,8 +132,9 @@ def _lmi_do_cast(t, value, cast): """ cast_func = cast.get(t.lower(), lambda x: x) if isinstance(value, (dict, pywbem.NocaseDict)): - return pywbem.NocaseDict({ - k: _lmi_do_cast(t, val, cast) for k, val in value.iteritems()}) + return pywbem.NocaseDict( + dict((k, _lmi_do_cast(t, val, cast)) + for k, val in value.iteritems())) elif isinstance(value, list): return map(lambda val: _lmi_do_cast(t, val, cast), value) elif isinstance(value, tuple): @@ -266,9 +267,9 @@ def lmi_transform_to_lmi(conn, value): elif isinstance(value, pywbem.CIMFloat): return float(value) elif isinstance(value, (dict, pywbem.NocaseDict)): - return pywbem.NocaseDict({ - k: lmi_transform_to_lmi(conn, val) - for k, val in value.iteritems()}) + return pywbem.NocaseDict( + dict((k, lmi_transform_to_lmi(conn, val)) + for k, val in value.iteritems())) elif isinstance(value, list): return map(lambda val: lmi_transform_to_lmi(conn, val), value) elif isinstance(value, tuple): @@ -290,9 +291,9 @@ def lmi_transform_to_cim_param(t, value): elif isinstance(value, LMIObjectFactory().LMIInstanceName): return value.wrapped_object elif isinstance(value, (dict, pywbem.NocaseDict)): - return pywbem.NocaseDict({ - k: lmi_transform_to_cim_param(t, val) - for k, val in value.iteritems()}) + return pywbem.NocaseDict( + dict((k, lmi_transform_to_cim_param(t, val)) + for k, val in value.iteritems())) elif isinstance(value, list): return map(lambda val: lmi_transform_to_cim_param(t, val), value) elif isinstance(value, tuple): @@ -344,7 +345,7 @@ def lmi_associators(assoc_classes): def make_key(path): path.host = None return hashlib.md5(path.classname.lower() + path.namespace.lower() + \ - str({ k.lower() : v for k, v in path.keybindings.iteritems() })).hexdigest() + str(dict((k.lower(), v) for k, v in path.keybindings.iteritems()))).hexdigest() result = [] @@ -368,7 +369,7 @@ def lmi_associators(assoc_classes): # Get instances, which will be joined as associators for ref_class_name in ref_class_names: (inst_list, out, err) = conn._client._get_instances(ref_class_name) - instances.update({ make_key(inst.path) : inst for inst in inst_list }) + instances.update(dict((make_key(inst.path), inst) for inst in inst_list)) # Join associated objects (assoc_instance_names, out, err) = conn._client._get_instance_names(assoc_class.classname)

1 0

[cura-tools] openlmi-tools-lmiwbem: fix missing x509 authentication (fb92688)
by phatina＠fedoraproject.org 15 Apr '14

15 Apr '14

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : openlmi-tools-lmiwbem >--------------------------------------------------------------- commit fb92688504d520224456a07562a6e2b24ea7990a Author: Peter Hatina <phatina(a)redhat.com> Date: Tue Apr 15 15:19:32 2014 +0200 fix missing x509 authentication >--------------------------------------------------------------- cli/lmi/shell/LMIBaseClient.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/cli/lmi/shell/LMIBaseClient.py b/cli/lmi/shell/LMIBaseClient.py index 925a568..b3772f1 100644 --- a/cli/lmi/shell/LMIBaseClient.py +++ b/cli/lmi/shell/LMIBaseClient.py @@ -71,8 +71,7 @@ class LMIBaseClient(object): if conn_type == LMIBaseClient.CONN_TYPE_PEGASUS_UDS: self._cliconn.connectLocally() else: - # TODO: X509 authentication - self._cliconn.connect(self._uri, username, password) + self._cliconn.connect(self._uri, username, password, cert_file, key_file) def __del__(self): self._cliconn.disconnect()

1 0

[cura-tools] openlmi-tools-lmiwbem: drop forgotten parameters in LMINamespace::classes() (24ced30)
by phatina＠fedoraproject.org 15 Apr '14

15 Apr '14

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : openlmi-tools-lmiwbem >--------------------------------------------------------------- commit 24ced30aa1c0c8749743069d20f7b94ff3af1307 Author: Peter Hatina <phatina(a)redhat.com> Date: Mon Apr 14 16:07:55 2014 +0200 drop forgotten parameters in LMINamespace::classes() >--------------------------------------------------------------- cli/lmi/shell/LMINamespace.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/lmi/shell/LMINamespace.py b/cli/lmi/shell/LMINamespace.py index 7feb514..5b8b83d 100644 --- a/cli/lmi/shell/LMINamespace.py +++ b/cli/lmi/shell/LMINamespace.py @@ -70,7 +70,7 @@ class LMINamespace(LMIWrapperBaseObject): self._name, DeepInheritance=True) return class_name_list - def print_classes(self, filter_key="", exact_match=False): + def print_classes(self): """ Prints out a list of classes. @@ -80,7 +80,7 @@ class LMINamespace(LMIWrapperBaseObject): **Usage:** :ref:`namespaces_available_classes`. """ - for c in self.classes(filter_key, exact_match): + for c in self.classes(): sys.stdout.write("%s\n" % c) def cql(self, query):

1 0

[cura-tools] master: merged changes from openlmi-scripts upstream [2/3] (tests) (16c3011)
by miminar＠fedoraproject.org 14 Apr '14

14 Apr '14

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 16c3011e7e2346da8e56eecaad2973c0434c8b2a Author: Michal Minar <miminar(a)redhat.com> Date: Mon Apr 14 14:04:43 2014 +0200 merged changes from openlmi-scripts upstream [2/3] (tests) This commit updates tests. This includes all the commits from upstream in range: 94d6fc5a0ce34b5a7beb7a1bb6594336a195497c .. abb4d798871d6df701bf13745bc6a2ba3fd442e9 >--------------------------------------------------------------- cli/test/README.md | 7 + cli/test/cmdver/README.md | 1 + .../mylf => cli/test/cmdver}/lmi/__init__.py | 0 .../test/cmdver/lmi/scripts}/__init__.py | 0 cli/test/cmdver/lmi/scripts/cmdver/__init__.py | 135 +++++++++++ .../test/cmdver/lmi/scripts/cmdver/devel.py | 7 +- .../test/cmdver/lmi/scripts/cmdver/pre042.py | 7 +- .../test/cmdver/lmi/scripts/cmdver/swbase.py | 26 ++- .../test/cmdver/lmi/scripts/cmdver/ver042.py | 7 +- {doc/src/scripts/mylf => cli/test/cmdver}/setup.py | 22 +- cli/test/{base.sh => test_unit.sh} | 48 +++-- cli/test/test_versioning.sh | 236 ++++++++++++++++++++ cli/test/unit/test_common.py | 79 +++++++ 13 files changed, 547 insertions(+), 28 deletions(-) diff --git a/cli/test/README.md b/cli/test/README.md index ff7ce48..14cf2ae 100644 --- a/cli/test/README.md +++ b/cli/test/README.md @@ -11,6 +11,10 @@ Dependencies Openlmi scripts need not be installed. +Remote host shall have `openlmi-software` and `openlmi-hardware` installed. If +not, `LMI_SOFTWARE_PROVIDER_VERSION` and `LMI_HARDWARE_PROVIDER_VERSION` needs +to be set to `none`. + Run --- Install and run any CIM broker on this or any remote host. Ensure that LMIShell @@ -19,6 +23,9 @@ can connect to it. Export these variables: * LMI_CIMOM_URL * LMI_CIMOM_USERNAME * LMI_CIMOM_PASSWORD + * LMI_SOFTWARE_PROVIDER_VERSION - version of software provider registered + with CIMOM + * LMI_HARDWARE_PROVIDER_VERSION Execute: $ ./run.sh diff --git a/cli/test/cmdver/README.md b/cli/test/cmdver/README.md new file mode 100644 index 0000000..14c401e --- /dev/null +++ b/cli/test/cmdver/README.md @@ -0,0 +1 @@ +Subcommand just for testing purposes. diff --git a/doc/src/scripts/mylf/lmi/__init__.py b/cli/test/cmdver/lmi/__init__.py similarity index 100% copy from doc/src/scripts/mylf/lmi/__init__.py copy to cli/test/cmdver/lmi/__init__.py diff --git a/doc/src/scripts/mylf/lmi/__init__.py b/cli/test/cmdver/lmi/scripts/__init__.py similarity index 100% copy from doc/src/scripts/mylf/lmi/__init__.py copy to cli/test/cmdver/lmi/scripts/__init__.py diff --git a/cli/test/cmdver/lmi/scripts/cmdver/__init__.py b/cli/test/cmdver/lmi/scripts/cmdver/__init__.py new file mode 100644 index 0000000..f9e0c8b --- /dev/null +++ b/cli/test/cmdver/lmi/scripts/cmdver/__init__.py @@ -0,0 +1,135 @@ +# Copyright (C) 2013-2014 Red Hat, Inc. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +# The views and conclusions contained in the software and documentation are +# those of the authors and should not be interpreted as representing official +# policies, either expressed or implied, of the FreeBSD Project. + +import pywbem +from lmi.scripts.common import command +from lmi.scripts.common import get_computer_system + +# 1st entry point +class CmdverSw(command.LmiSelectCommand): + """ + This is a short description for CmdverSw. + """ + SELECT = ( + ('OpenLMI-Software < 0.4.2', 'lmi.scripts.cmdver.pre042.Cmd'), + ('OpenLMI-Software == 0.4.2', 'lmi.scripts.cmdver.ver042.Cmd'), + ('OpenLMI-Software > 0.4.2', 'lmi.scripts.cmdver.devel.Cmd'), + ) + +def get_hw_profile_version(ns): + try: + return ns.connection.root.interop.wql('SELECT * FROM PG_RegisteredProfile' + ' WHERE RegisteredName="OpenLMI-Hardware"')[0].RegisteredVersion + except pywbem.CIMError, IndexError: + return None + +class SystemInfo(command.LmiLister): + COLUMNS = [] + PRE042 = False + + def execute(self, ns): + cls = ns.LMI_Chassis + inst = cls.first_instance() + verstr = get_hw_profile_version(ns) + if self.PRE042: + verstr += ' (PRE 0.4.2)' + return [('Prov version', verstr), + ('Chassis Type', cls.ChassisPackageTypeValues.value_name( + inst.ChassisPackageType))] + +class HostnameInfo(command.LmiLister): + COLUMNS = [] + PRE042 = False + + def execute(self, ns): + verstr = get_hw_profile_version(ns) + if self.PRE042: + verstr += ' (PRE 0.4.2)' + return [('Prov version', verstr), + ('Hostname', get_computer_system(ns).Name)] + +class PreSystemInfo(SystemInfo): + PRE042 = True + +class PreHostnameInfo(HostnameInfo): + PRE042 = True + +class HwCmd(command.LmiCommandMultiplexer): + """ + Hardware testing command. + + Usage: + %(cmd)s system + %(cmd)s hostname + """ + COMMANDS = { + 'system' : SystemInfo, + 'hostname' : HostnameInfo + } + OWN_USAGE = True + +class PreHwCmd(HwCmd): + COMMANDS = { + 'system' : PreSystemInfo, + 'hostname' : PreHostnameInfo + } + +class NoHwRegistered(command.LmiLister): + """ + Hardware testing command. + + Usage: %(cmd)s <cmd> + """ + COLUMNS = [] + OWN_USAGE = True + def execute(self, ns, cmd): + return [('Given command', cmd), ('Prov version', 'N/A')] + +# 2nd entry point +class CmdverHw(command.LmiSelectCommand): + """ + This is a short description for CmdverHw. + """ + SELECT = ( + ('OpenLMI-Hardware < 0.4.2', PreHwCmd), + ('OpenLMI-Hardware >= 0.4.2 & class LMI_Chassis == 0.3.0', HwCmd) + ) + DEFAULT = NoHwRegistered + +# 3rd entry point +class Cmdver(command.LmiCommandMultiplexer): + """ + Command for testing version dependencies. + + Usage: + %(cmd)s (sw|hw) [<args>...] + """ + COMMANDS = { + 'sw' : CmdverSw, + 'hw' : CmdverHw + } + OWN_USAGE = True diff --git a/doc/src/scripts/mylf/lmi/__init__.py b/cli/test/cmdver/lmi/scripts/cmdver/devel.py similarity index 91% copy from doc/src/scripts/mylf/lmi/__init__.py copy to cli/test/cmdver/lmi/scripts/cmdver/devel.py index b1a2ff0..624428e 100644 --- a/doc/src/scripts/mylf/lmi/__init__.py +++ b/cli/test/cmdver/lmi/scripts/cmdver/devel.py @@ -24,4 +24,9 @@ # The views and conclusions contained in the software and documentation are # those of the authors and should not be interpreted as representing official # policies, either expressed or implied, of the FreeBSD Project. -__import__('pkg_resources').declare_namespace(__name__) + +from lmi.scripts.common import command +from lmi.scripts.cmdver import swbase + +class Cmd(swbase.SwCmdBase): + ADDITIONAL_VERSION_INFO = ' (DEVEL)' diff --git a/doc/src/scripts/mylf/lmi/__init__.py b/cli/test/cmdver/lmi/scripts/cmdver/pre042.py similarity index 91% copy from doc/src/scripts/mylf/lmi/__init__.py copy to cli/test/cmdver/lmi/scripts/cmdver/pre042.py index b1a2ff0..e7565ae 100644 --- a/doc/src/scripts/mylf/lmi/__init__.py +++ b/cli/test/cmdver/lmi/scripts/cmdver/pre042.py @@ -24,4 +24,9 @@ # The views and conclusions contained in the software and documentation are # those of the authors and should not be interpreted as representing official # policies, either expressed or implied, of the FreeBSD Project. -__import__('pkg_resources').declare_namespace(__name__) + +from lmi.scripts.common import command +from lmi.scripts.cmdver import swbase + +class Cmd(swbase.SwCmdBase): + ADDITIONAL_VERSION_INFO = ' (PRE 0.4.2)' diff --git a/doc/src/scripts/mylf/lmi/scripts/__init__.py b/cli/test/cmdver/lmi/scripts/cmdver/swbase.py similarity index 71% copy from doc/src/scripts/mylf/lmi/scripts/__init__.py copy to cli/test/cmdver/lmi/scripts/cmdver/swbase.py index b1a2ff0..eed9dc2 100644 --- a/doc/src/scripts/mylf/lmi/scripts/__init__.py +++ b/cli/test/cmdver/lmi/scripts/cmdver/swbase.py @@ -24,4 +24,28 @@ # The views and conclusions contained in the software and documentation are # those of the authors and should not be interpreted as representing official # policies, either expressed or implied, of the FreeBSD Project. -__import__('pkg_resources').declare_namespace(__name__) +""" +Software testing command. + +Usage: %(cmd)s +""" + +import pywbem +from lmi.scripts.common import command + +def get_sw_profile_version(ns): + try: + return ns.connection.root.interop.wql('SELECT * FROM PG_RegisteredProfile' + ' WHERE RegisteredName="OpenLMI-Software"')[0].RegisteredVersion + except pywbem.CIMError, IndexError: + return None + +class SwCmdBase(command.LmiLister): + OWN_USAGE = __doc__ + COLUMNS = [] + ADDITIONAL_VERSION_INFO = '' + + def execute(self, ns): + return [('Prov version', + get_sw_profile_version(ns) + self.ADDITIONAL_VERSION_INFO)] + diff --git a/doc/src/scripts/mylf/lmi/__init__.py b/cli/test/cmdver/lmi/scripts/cmdver/ver042.py similarity index 91% copy from doc/src/scripts/mylf/lmi/__init__.py copy to cli/test/cmdver/lmi/scripts/cmdver/ver042.py index b1a2ff0..433b539 100644 --- a/doc/src/scripts/mylf/lmi/__init__.py +++ b/cli/test/cmdver/lmi/scripts/cmdver/ver042.py @@ -24,4 +24,9 @@ # The views and conclusions contained in the software and documentation are # those of the authors and should not be interpreted as representing official # policies, either expressed or implied, of the FreeBSD Project. -__import__('pkg_resources').declare_namespace(__name__) + +from lmi.scripts.common import command +from lmi.scripts.cmdver import swbase + +class Cmd(swbase.SwCmdBase): + ADDITIONAL_VERSION_INFO = ' (VER 0.4.2)' diff --git a/doc/src/scripts/mylf/setup.py b/cli/test/cmdver/setup.py similarity index 56% copy from doc/src/scripts/mylf/setup.py copy to cli/test/cmdver/setup.py index 9281962..58ea463 100644 --- a/doc/src/scripts/mylf/setup.py +++ b/cli/test/cmdver/setup.py @@ -9,14 +9,14 @@ except IOError: long_description = '' setup( - name='openlmi-scripts-mylf', - version='0.0.1', - description='OpenLMI scripts for LogicalFile profile', + name='openlmi-scripts-cmdver', + version='0.1.2', + description='Test command for versioning.', long_description=long_description, - author=u'Michal', - author_email='Minar', - url='https://github.com/openlmi/openlmi-mylf', - download_url='https://github.com/openlmi/openlmi-mylf/tarball/master', + author=u'Michal Minar', + author_email='miminar(a)redhat.com', + url='https://github.com/openlmi/openlmi-cmdver', + download_url='https://github.com/openlmi/openlmi-cmdver/tarball/master', platforms=['Any'], license="BSD", classifiers=[ @@ -33,12 +33,16 @@ setup( install_requires=['openlmi-scripts'], namespace_packages=['lmi', 'lmi.scripts'], - packages=['lmi', 'lmi.scripts', 'lmi.scripts.mylf'], + packages=['lmi', 'lmi.scripts', 'lmi.scripts.cmdver'], include_package_data=True, entry_points={ 'lmi.scripts.cmd': [ - 'mylf = lmi.scripts.mylf.cmd:MyLF', + # All subcommands of lmi command should go here. + # See http://pythonhosted.org/openlmi-scripts/script-development.html#writing-set… + 'ver-sw = lmi.scripts.cmdver:CmdverSw', + 'ver-hw = lmi.scripts.cmdver:CmdverHw', + 'ver = lmi.scripts.cmdver:Cmdver', ], }, ) diff --git a/cli/test/base.sh b/cli/test/test_unit.sh similarity index 69% copy from cli/test/base.sh copy to cli/test/test_unit.sh index acec1be..04fe17b 100644 --- a/cli/test/base.sh +++ b/cli/test/test_unit.sh @@ -27,25 +27,43 @@ # those of the authors and should not be interpreted as representing official # policies, either expressed or implied, of the FreeBSD Project. # -# Authors: Jan Safranek <jsafrane(a)redhat.com> # Authors: Michal Minar <miminar(a)redhat.com> -# Basic framework for all 'lmi' tests. -# It is based on Beakerlib, https://fedorahosted.org/beakerlib/ +. ./base.sh -. /usr/share/beakerlib/beakerlib.sh +# Set the full test name +TEST="openlmi-scripts/test/test_cmd.sh" -LMI_CIMOM_URL=${LMI_CIMOM_URL:-kvm-rhel7} -LMI_CIMOM_USERNAME=${LMI_CIMOM_USERNAME:-root} -LMI_CIMOM_PASSWORD=${LMI_CIMOM_PASSWORD:-redhat} +PACKAGE="openlmi-scripts" -SCHEMA=$(echo $LMI_CIMOM_URL | sed -n 's!^$[[:alpha:]]\+://$.*!\1!p') -HOSTNAME=$(echo $LMI_CIMOM_URL | sed -e 's!^.*//!!' -e 's!/.*!!') -LMI="lmi" -[ -n "$HOSTNAME" ] && \ - LMI+=" -n -h $SCHEMA$LMI_CIMOM_USERNAME:$LMI_CIMOM_PASSWORD@$HOSTNAME" -export LMI +rlJournalStart -# for some tests no other options are welcomed -export LMI_=`echo $LMI | cut -d \ -f 1` +rlPhaseStartSetup + rlLogInfo "Creating temporary python sandbox" + sandbox=`mktemp -d` + export PYTHONPATH="$sandbox" + pushd .. + rlLogInfo "Installing lmi meta-command" + rlRun "python setup.py develop --install-dir=$sandbox" + popd + export "$sandbox:$PATH" +rlPhaseEnd +rlPhaseStartTest + rlLogInfo "Running unittests" + + pushd unit + for i in test_*.py; do + rlRun "python $i" + done + popd # unit + +rlPhaseEnd + +rlPhaseStartCleanup + rlLogInfo "Removing temporary python sandbox" + rm -rf "$sandbox" +rlPhaseEnd + +rlJournalPrintText +rlJournalEnd diff --git a/cli/test/test_versioning.sh b/cli/test/test_versioning.sh new file mode 100644 index 0000000..0f7f5b6 --- /dev/null +++ b/cli/test/test_versioning.sh @@ -0,0 +1,236 @@ +#!/bin/bash +# +# Copyright (c) 2014, Red Hat, Inc. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +# The views and conclusions contained in the software and documentation are +# those of the authors and should not be interpreted as representing official +# policies, either expressed or implied, of the FreeBSD Project. +# +# Authors: Michal Minar <miminar(a)redhat.com> + +. ./base.sh + +EXIT_CODE_UNSATISFIED=5 +DEFAULT_VERSION='0.4.2' + +# Set the full test name +TEST="openlmi-scripts/test/test_versioning" + +# Package being tested +PACKAGE="openlmi-scripts" + +function cmp2int() { + digits=( `echo $1 | tr '.' ' '` ) + result=0 + for i in `seq 0 $((${#digits[@]} - 1))`; do + result=$((result*100)) + result=$((result + ${digits[$i]})) + done + echo $result +} + +rlJournalStart + +if [[ -z "${LMI_SOFTWARE_PROVIDER_VERSION}" ]]; then + msg="No version specified for OpenLMI-Software. Defaulting to " + msg+="{$DEFAULT_VERSION}." + rlLogInfo "$msg" + LMI_SOFTWARE_PROVIDER_VERSION="${DEFAULT_VERSION}" +elif [[ "$LMI_SOFTWARE_PROVIDER_VERSION" == none ]]; then + LMI_SOFTWARE_PROVIDER_VERSION='' +fi +if [[ -z "${LMI_HARDWARE_PROVIDER_VERSION}" ]]; then + msg="No version specified for OpenLMI-Hardware Defaulting to " + msg+="{$DEFAULT_VERSION}." + rlLogInfo "$msg" + LMI_HARDWARE_PROVIDER_VERSION="${DEFAULT_VERSION}" +elif [[ "$LMI_SOFTWARE_PROVIDER_VERSION" == none ]]; then + LMI_HARDWARE_PROVIDER_VERSION='' +fi + +rlPhaseStartSetup + rlLogInfo "Creating temporary python sandbox" + sandbox=`mktemp -d` + export PYTHONPATH="$sandbox" + pushd .. + rlLogInfo "Installing lmi meta-command" + rlRun "python setup.py develop --install-dir=$sandbox" + popd + rlLogInfo "Installing testing command" + pushd cmdver + rlRun "python setup.py develop --install-dir=$sandbox" + popd + export "$sandbox:$PATH" +rlPhaseEnd + +rlPhaseStartTest + rlLogInfo "Test help on select command" + + rlRun -s "$LMI_ help" + rlAssertEquals "Check the number of subcommands available." \ + `grep '^\s\+[[:alnum:]-]\+\s\+-\s\+' $rlRun_LOG | wc -l` 4 + rlAssertGrep '\<ver\>\s\+-\s\+Command for testing version dependencies\.$' \ + $rlRun_LOG + rlAssertGrep '\<ver-hw\s\+-\s\+This is a short description for CmdverHw\.$' \ + $rlRun_LOG + rlAssertGrep '\<ver-sw\s\+-\s\+This is a short description for CmdverSw\.$' \ + $rlRun_LOG + rm $rlRun_LOG + + rlRun -s "$LMI help ver" + rlAssertGrep "^Command for testing version dependencies.$" $rlRun_LOG + rlAssertGrep "^Usage:$" $rlRun_LOG + rlAssertGrep "^\s\+lmi ver (sw\\|hw) \[<args>\.\.\.\]$'" $rlRun_LOG + rm $rlRun_LOG + + if [[ -z "$LMI_SOFTWARE_PROVIDER_VERSION" ]]; then + rlRun -s "$LMI help ver-sw" $EXIT_CODE_UNSATISFIED + rlAssertGrep "error\s*:\s\+Profile and class dependencies were not satisfied for" \ + $rlRun_LOG + rm $rlRun_LOG + + rlRun -s "$LMI help ver sw" $EXIT_CODE_UNSATISFIED + rlAssertGrep "error\s*:\s\+Profile and class dependencies were not satisfied for" \ + $rlRun_LOG + rm $rlRun_LOG + + else + rlRun -s "$LMI help ver-sw" + rlAssertGrep "^Software testing command.$" $rlRun_LOG + rlAssertGrep "Usage: lmi ver-sw" $rlRun_LOG + rm $rlRun_LOG + + rlRun -s "$LMI help ver sw" 0 + rlAssertGrep "^Software testing command.$" $rlRun_LOG + rlAssertGrep "Usage: lmi ver sw" $rlRun_LOG + rm $rlRun_LOG + fi + + if [[ -z "$LMI_HARDWARE_PROVIDER_VERSION" ]]; then + rlRun -s "$LMI help ver-hw" + rlAssertGrep "^Hardware testing command\.$" $rlRun_LOG + rlAssertGrep "^Usage: lmi ver-hw <cmd>$" $rlRun_LOG + rm $rlRun_LOG + + rlRun -s "$LMI help ver hw" + rlAssertGrep "^Hardware testing command\.$" $rlRun_LOG + rlAssertGrep "^Usage: lmi ver hw <cmd>$" $rlRun_LOG + rm $rlRun_LOG + + else + rlRun -s "$LMI help ver-hw" + rlAssertGrep "^Hardware testing command\.$" $rlRun_LOG + rlAssertGrep "^Usage:$" $rlRun_LOG + rlAssertGrep "^\s\+lmi ver-hw system$" $rlRun_LOG + rlAssertGrep "^\s\+lmi ver-hw hostname$" $rlRun_LOG + rm $rlRun_LOG + + rlRun -s "$LMI help ver hw" 0 + rlAssertGrep "^Hardware testing command.$" $rlRun_LOG + rlAssertGrep "^Usage:$" $rlRun_LOG + rlAssertGrep "^\s\+lmi ver hw system$" $rlRun_LOG + rlAssertGrep "^\s\+lmi ver hw hostname$" $rlRun_LOG + rm $rlRun_LOG + + rlRun -s "$LMI help ver hw system" 0 + rlAssertGrep "^Hardware testing command.$" $rlRun_LOG + rlAssertGrep "^Usage:$" $rlRun_LOG + rlAssertGrep "^\s\+lmi ver hw system$" $rlRun_LOG + rlAssertGrep "^\s\+lmi ver hw hostname$" $rlRun_LOG + rm $rlRun_LOG + fi + +rlPhaseEnd + +rlPhaseStartTest + rlLogInfo "Test software testing command" + + if [[ -z "$LMI_SOFTWARE_PROVIDER_VERSION" ]]; then + rlRun -s "$LMI ver-sw" $EXIT_CODE_UNSATISFIED + rlAssertGrep "Profile and class dependencies were not satisfied" \ + $rlRun_LOG + rm $rlRun_LOG + + elif [[ `cmp2int $LMI_SOFTWARE_PROVIDER_VERSION` -lt `cmp2int 0.4.2` ]]; then + + rlRun -s "$LMI ver-sw" + rlAssertGrep "Prov version.*${LMI_SOFTWARE_PROVIDER_VERSION} (PRE 0.4.2)" $rlRun_LOG + rm $rlRun_LOG + + elif [[ `cmp2int $LMI_SOFTWARE_PROVIDER_VERSION` == `cmp2int 0.4.2` ]]; then + rlRun -s "$LMI ver-sw" + rlAssertGrep "Prov version.*${LMI_SOFTWARE_PROVIDER_VERSION} (VER 0.4.2)" $rlRun_LOG + rm $rlRun_LOG + + else + rlRun -s "$LMI ver-sw" + rlAssertGrep "Prov version.*${LMI_SOFTWARE_PROVIDER_VERSION} (DEVEL)" $rlRun_LOG + rm $rlRun_LOG + fi + +rlPhaseEnd + +rlPhaseStartTest + rlLogInfo "Test hardware testing command" + + if [[ -z "$LMI_HARDWARE_PROVIDER_VERSION" ]]; then + for cmd in "system" "hostname"; do + rlRun -s "$LMI ver-hw $cmd" + rlAssertEquals "Printed table has just 2 rows" \ + `cat $rlRun_LOG | wc -l` 2 + rlAssertGrep "^Given command\s\+$cmd$" $rlRun_LOG + rlAssertGrep "^Prov version\s\+N/A" $rlRun_LOG + rm $rlRun_LOG + done + + else + if [[ `cmp2int $LMI_HARDWARE_PROVIDER_VERSION` -lt `cmp2int 0.4.2` ]]; then + ver_suffix=' (PRE 0.4.2)' + else + ver_suffix='' + fi + for cmd in "system" "hostname"; do + rlRun -s "$LMI ver-hw $cmd" + rlAssertEquals "Printed table has just 2 rows" \ + `cat $rlRun_LOG | wc -l` 2 + rlAssertGrep "^Prov version\s\+$LMI_SOFTWARE_PROVIDER_VERSION$ver_suffix\$" \ + $rlRun_LOG + if [[ $cmd == system ]]; then + reg="^Chassis Type\s\+.*" + else + reg="^Hostname\s\+$HOSTNAME" $rlRun_LOG + fi + rm $rlRun_LOG + done + fi + +rlPhaseEnd + +rlPhaseStartCleanup + rlLogInfo "Removing temporary python sandbox" + rm -rf "$sandbox" +rlPhaseEnd + +rlJournalPrintText +rlJournalEnd diff --git a/cli/test/unit/test_common.py b/cli/test/unit/test_common.py new file mode 100644 index 0000000..955d964 --- /dev/null +++ b/cli/test/unit/test_common.py @@ -0,0 +1,79 @@ +import unittest + +from lmi.scripts.common.util import FilteredDict + +class FilteredDictTest(unittest.TestCase): + + def test_empty(self): + d = FilteredDict(tuple(), {}) + self.assertEqual(0, len(d)) + self.assertNotIn('key', d) + self.assertEqual(0, len(d.keys())) + self.assertEqual(0, len(d.values())) + self.assertEqual(0, len(d.items())) + self.assertRaises(KeyError, d.__getitem__, 'key') + self.assertRaises(KeyError, d.__setitem__, 'key', 'value') + + def test_empty_keys(self): + d = FilteredDict(tuple(), {'a': 1}) + self.assertEqual(0, len(d)) + self.assertNotIn('a', d) + self.assertEqual(0, len(d.keys())) + self.assertEqual(0, len(d.values())) + self.assertEqual(0, len(d.items())) + self.assertRaises(KeyError, d.__getitem__, 'a') + self.assertRaises(KeyError, d.__setitem__, 'a', 2) + + def test_empty_origin(self): + d = FilteredDict(tuple('a'), {}) + self.assertEqual(0, len(d)) + self.assertNotIn('a', d) + self.assertEqual(0, len(d.keys())) + self.assertEqual(0, len(d.values())) + self.assertEqual(0, len(d.items())) + self.assertRaises(KeyError, d.__getitem__, 'a') + d['a'] = 1 + self.assertEqual(1, len(d)) + self.assertEqual(1, d['a']) + self.assertIn('a', d) + self.assertEqual(['a',], d.keys()) + self.assertEqual([1], d.values()) + self.assertEqual([('a', 1)], d.items()) + di = d.iteritems() + self.assertEqual(('a', 1), di.next()) + self.assertRaises(StopIteration, di.next) + d['a'] = 2 + self.assertEqual(2, d['a']) + del d['a'] + self.assertEqual(0, len(d)) + + def test_filled(self): + original = {'b': 2, 'c': 3} + d = FilteredDict(('a', 'b'), original) + self.assertEqual(1, len(d)) + self.assertNotIn('a', d) + self.assertIn('b', d) + self.assertNotIn('c', d) + self.assertEqual(1, len(d.keys())) + self.assertEqual(1, len(d.values())) + self.assertEqual(1, len(d.items())) + self.assertRaises(KeyError, d.__getitem__, 'a') + self.assertEqual(2, d['b']) + di = d.iteritems() + self.assertEqual(('b', 2), di.next()) + self.assertRaises(StopIteration, di.next) + self.assertEqual(2, d.pop('b')) + self.assertEqual(0, len(d)) + self.assertEqual({'c': 3}, original) + d.update({'a': 1, 'b': 4}) + self.assertEqual({'a': 1, 'b': 4, 'c': 3}, original) + self.assertEqual(2, len(d)) + self.assertEqual(set((('a', 1), ('b', 4))), set(d.items())) + d.clear() + self.assertEqual(0, len(d)) + self.assertEqual({'c': 3}, original) + self.assertRaises(KeyError, d.__setitem__, 'c', 5) + self.assertRaises(KeyError, d.update, {'b': 2, 'c': 3}) + +if __name__ == '__main__': + unittest.main()

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

cura-tools-devel April 2014