python-jujuclient

Merge lp://staging/~thumper/python-jujuclient/jes-cache-file into lp://staging/python-jujuclient

jes-cache-file
Merge into trunk

Proposed by Tim Penhey on 2015-06-10

Status:	Superseded
Proposed branch:	lp://staging/~thumper/python-jujuclient/jes-cache-file
Merge into:	lp://staging/python-jujuclient
Diff against target:	202 lines (+137/-4) 3 files modified .bzrignore (+1/-0) jujuclient.py (+35/-3) test_jujuclient.py (+101/-1)
To merge this branch:	bzr merge lp://staging/~thumper/python-jujuclient/jes-cache-file
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
juju-deployers		2015-06-10	Pending
Review via email: mp+261586@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2015-07-17.

Description of the change

With the jes feature flag, we now don't store environment details in .jenv files, but in a single cache.yaml file.

This branch teaches python-jujuclient how to get the required information out of it.

Revision history for this message

Tim Penhey (thumper) wrote on 2015-06-10:

I have not been able to run the tests for some reason, and I am unfamiliar with tox:

$ JUJU_TEST_ENV="mary2" tox -e py27
Traceback (most recent call last):
  File "/usr/bin/tox", line 9, in <module>
    load_entry_point('tox==1.6.0', 'console_scripts', 'tox')()
  File "/usr/lib/python2.7/dist-packages/tox/_cmdline.py", line 25, in main
    config = parseconfig(args, 'tox')
  File "/usr/lib/python2.7/dist-packages/tox/_config.py", line 44, in parseconfig
    parseini(config, inipath)
  File "/usr/lib/python2.7/dist-packages/tox/_config.py", line 236, in __init__
    config)
  File "/usr/lib/python2.7/dist-packages/tox/_config.py", line 292, in _makeenvconfig
    vc.setenv = reader.getdict(section, 'setenv')
  File "/usr/lib/python2.7/dist-packages/tox/_config.py", line 419, in getdict
    s = self.getdefault(section, name, None)
  File "/usr/lib/python2.7/dist-packages/tox/_config.py", line 511, in getdefault
    x = self._replace(x)
  File "/usr/lib/python2.7/dist-packages/tox/_config.py", line 618, in _replace
    return rexpattern.sub(replace_func, x)
  File "/usr/lib/python2.7/dist-packages/tox/_config.py", line 609, in _replace_match_no_quote
    return self._replace_match(match, quote=False)
  File "/usr/lib/python2.7/dist-packages/tox/_config.py", line 604, in _replace_match
    return handler(match, quote)
  File "/usr/lib/python2.7/dist-packages/tox/_config.py", line 541, in _replace_env
    (envkey, envkey))
tox.ConfigError: ConfigError: substitution env:'JUJU_TEST_ENV:"test"': unkown environment variable 'JUJU_TEST_ENV:"test"'