Merge into devel : lp1385162 : Code : Charm Helpers

Status:	Superseded
Proposed branch:	lp://qastaging/~xianghui/charm-helpers/lp1385162
Merge into:	lp://qastaging/charm-helpers
Diff against target:	53 lines (+31/-3) 2 files modified charmhelpers/contrib/openstack/context.py (+6/-3) tests/contrib/openstack/test_os_contexts.py (+25/-0)
To merge this branch:	bzr merge lp://qastaging/~xianghui/charm-helpers/lp1385162
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Edward Hope-Morley	2014-10-27	Needs Fixing on 2014-11-12
OpenStack Charmers	2014-11-12	Pending
Review via email: mp+239675@code.qastaging.launchpad.net

Description of the change

Hooks failed if no network splits is set and enable https.
vips length should be larger than 0 and network_config should be checked before used if multinet is enabled.

Revision history for this message

Edward Hope-Morley (hopem) wrote on 2014-11-03:

#

Download full text (4.1 KiB)

Getting some unit test failures:

$ make test
Starting tests...
nose.plugins.cover: ERROR: Coverage not available: unable to import coverage module
.................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................{u'DISTRIB_CODENAME': u'saucy', u'DISTRIB_RELEASE': u'13.10', u'DISTRIB_ID': u'Ubuntu', u'DISTRIB_DESCRIPTION': u'"Ubuntu Saucy Salamander (development branch)"'}
{u'DISTRIB_CODENAME': u'saucy', u'DISTRIB_RELEASE': u'13.10', u'DISTRIB_ID': u'Ubuntu', u'DISTRIB_DESCRIPTION': u'"Ubuntu Saucy Salamander (development branch)"'}
{u'DISTRIB_CODENAME': u'saucy', u'DISTRIB_RELEASE': u'13.10', u'DISTRIB_ID': u'Ubuntu', u'DISTRIB_DESCRIPTION': u'"Ubuntu Saucy Salamander (development branch)"'}
{u'DISTRIB_CODENAME': u'saucy', u'DISTRIB_RELEASE': u'13.10', u'DISTRIB_ID': u'Ubuntu', u'DISTRIB_DESCRIPTION': u'"Ubuntu Saucy Salamander (development branch)"'}
...............................................................................................................................................E: Could not open lock file /var/lib/dpkg/lock - open (13: Permission denied)
E: Unable to lock the administration directory (/var/lib/dpkg/), are you root?
F.E...................................
======================================================================
ERROR: Failure: OSError ([Errno 2] No such file or directory)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/nose/loader.py", line 411, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/python2.7/dist-packages/nose/importer.py", line 47, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/python2.7/dist-packages/nose/importer.py", line 94, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/home/gizmo/Documents/reviews/charm-helpers/lp1385162/tests/fetch/test_giturl.py", line 8, in <module>
    from charmhelpers.fetch import (
  File "/home/gizmo/Documents/reviews/charm-helpers/lp1385162/charmhelpers/fetch/giturl.py", line 12, in <module>
    apt_install("python-git")
  File "/home/gizmo/Documents/reviews/charm-helpers/lp1385162/charmhelpers/fetch/__init__.py", line 157, in apt_install
    options))
  File "/home/gizmo/Documents/reviews/charm-helpers/lp1385162/charmhelpers/core/hookenv.py", line 67, in log
    subprocess.call(command)
  File "/usr/lib/python2.7/subprocess.py", line 522, in call
    return Popen(*popenargs, **kwargs).wait()
  File "/usr/lib/python2.7/subprocess.py", line 710, in __init__
    errread, errwrite)
  File "/usr/lib/python2.7/subprocess.py", line 1327, in _execute_child
    raise child_e...

Getting some unit test failures:

$ make test
Starting tests...
nose.plugins.cover: ERROR: Coverage not available: unable to import coverage module
.................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................{u'DISTRIB_CODENAME': u'saucy', u'DISTRIB_RELEASE': u'13.10', u'DISTRIB_ID': u'Ubuntu', u'DISTRIB_DESCRIPTION': u'"Ubuntu Saucy Salamander (development branch)"'}
{u'DISTRIB_CODENAME': u'saucy', u'DISTRIB_RELEASE': u'13.10', u'DISTRIB_ID': u'Ubuntu', u'DISTRIB_DESCRIPTION': u'"Ubuntu Saucy Salamander (development branch)"'}
{u'DISTRIB_CODENAME': u'saucy', u'DISTRIB_RELEASE': u'13.10', u'DISTRIB_ID': u'Ubuntu', u'DISTRIB_DESCRIPTION': u'"Ubuntu Saucy Salamander (development branch)"'}
{u'DISTRIB_CODENAME': u'saucy', u'DISTRIB_RELEASE': u'13.10', u'DISTRIB_ID': u'Ubuntu', u'DISTRIB_DESCRIPTION': u'"Ubuntu Saucy Salamander (development branch)"'}
...............................................................................................................................................E: Could not open lock file /var/lib/dpkg/lock - open (13: Permission denied)
E: Unable to lock the administration directory (/var/lib/dpkg/), are you root?
F.E...................................
======================================================================
ERROR: Failure: OSError ([Errno 2] No such file or directory)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/nose/loader.py", line 411, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/python2.7/dist-packages/nose/importer.py", line 47, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/python2.7/dist-packages/nose/importer.py", line 94, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/home/gizmo/Documents/reviews/charm-helpers/lp1385162/tests/fetch/test_giturl.py", line 8, in <module>
    from charmhelpers.fetch import (
  File "/home/gizmo/Documents/reviews/charm-helpers/lp1385162/charmhelpers/fetch/giturl.py", line 12, in <module>
    apt_install("python-git")
  File "/home/gizmo/Documents/reviews/charm-helpers/lp1385162/charmhelpers/fetch/__init__.py", line 157, in apt_install
    options))
  File "/home/gizmo/Documents/reviews/charm-helpers/lp1385162/charmhelpers/core/hookenv.py", line 67, in log
    subprocess.call(command)
  File "/usr/lib/python2.7/subprocess.py", line 522, in call
    return Popen(*popenargs, **kwargs).wait()
  File "/usr/lib/python2.7/subprocess.py", line 710, in __init__
    errread, errwrite)
  File "/usr/lib/python2.7/subprocess.py", line 1327, in _execute_child
    raise child_exception
OSError: [Errno 2] No such file or directory

======================================================================
FAIL: tests.fetch.test_fetch.PluginTest.test_plugins_are_valid
----------------------------------------------------------------------
_StringException: Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/mock.py", line 1210, in patched
    return func(*args, **keywargs)
  File "/home/gizmo/Documents/reviews/charm-helpers/lp1385162/tests/fetch/test_fetch.py", line 407, in test_plugins_are_valid
    self.assertEqual(len(fetch.FETCH_HANDLERS), len(plugins))
  File "/usr/lib/python2.7/dist-packages/testtools/testcase.py", line 321, in assertEqual
    self.assertThat(observed, matcher, message)
  File "/usr/lib/python2.7/dist-packages/testtools/testcase.py", line 406, in assertThat
    raise mismatch_error
MismatchError: 3 != 2

----------------------------------------------------------------------
Ran 758 tests in 5.971s

FAILED (errors=1, failures=1)
make: *** [test] Error 1

review: Needs Fixing

Revision history for this message

Edward Hope-Morley (hopem) wrote on 2014-11-12:

#

Seems the above error is not caused by this patch I'm ok to let it through. Please fixup the minor nit below though (and same in https://code.launchpad.net/~xianghui/charms/trusty/keystone/lp1385162/+merge/239679).

Since this piece of code is identical to the chunk in keystone it would be nicer to have it pulled out of ApacheSSLContext.__call__() into a function that could be called by both...

review: Needs Fixing

lp://qastaging/~xianghui/charm-helpers/lp1385162 updated on 2014-11-13

247. By Xiang Hui on 2014-11-13: Fix minor issue.
248. By Xiang Hui on 2014-11-13: Sync lp:charm-helpers.

Revision history for this message

Xiang Hui (xianghui) wrote on 2014-11-13:

#

> Seems the above error is not caused by this patch I'm ok to let it through.
> Please fixup the minor nit below though (and same in https://code.launchpad.ne
> t/~xianghui/charms/trusty/keystone/lp1385162/+merge/239679).
>
> Since this piece of code is identical to the chunk in keystone it would be
> nicer to have it pulled out of ApacheSSLContext.__call__() into a function
> that could be called by both...
Good idea, but maybe it's better to do it in another branch to avoid side effect brought by refactor.

lp://qastaging/~xianghui/charm-helpers/lp1385162 updated on 2014-11-13

249. By Xiang Hui on 2014-11-13: Fetch apachessl context configuration as a method for other charms calling
250. By Xiang Hui on 2014-11-13: Fetch duplicate code with keystone canonical_name() in context.

Unmerged revisions

250. By Xiang Hui on 2014-11-13: Fetch duplicate code with keystone canonical_name() in context.
249. By Xiang Hui on 2014-11-13: Fetch apachessl context configuration as a method for other charms calling
248. By Xiang Hui on 2014-11-13: Sync lp:charm-helpers.
247. By Xiang Hui on 2014-11-13: Fix minor issue.
246. By Xiang Hui on 2014-10-26: Remove get_ifaces_cidr()
245. By Xiang Hui on 2014-10-24: network splits should be used with multi vips.
244. By Xiang Hui on 2014-10-24: Add get_ifaces_cidr().

Charm Helpers

Merge lp://qastaging/~xianghui/charm-helpers/lp1385162 into lp://qastaging/charm-helpers

Commit message

Description of the change

Unmerged revisions

Preview Diff

Subscribers