← Back to branch summary

~mthaddon/mojo/test-process-config-changes-from-diff

« back to all changes in this revision

Viewing changes to mojo/cli.py

  • Committer: Matthew Wedgwood
  • Date: 2013-07-08 20:17:10 UTC
  • Revision ID: matthew.wedgwood@canonical.com-20130708201710-m33in03q1a9n6r6k
Include existing env when setting pythonpath, actually run the verify script

Show diffs side-by-side

added added

removed removed

Lines of Context:
mojo/cli.py
121
121
    deploy_config = mojo.get_config_file(workspace, "services", args.envtag)
122
122
    deployer_dir = get_dep_dir("juju-deployer")
123
123
    deployer = os.path.abspath(os.path.join(deployer_dir, 'deployer.py'))
124
 
    env = {
125
 
        'PYTHONPATH': [],
126
 
        'JUJU_ENV': os.environ.get("JUJU_ENV", ""),
127
 
    }
128
 
    env['PYTHONPATH'].append(get_dep_dir("websocket-client"))
129
 
    env['PYTHONPATH'].append(get_dep_dir("python-jujuclient"))
 
124
    env = os.environ.copy()
 
125
    env['PYTHONPATH'] = ":".join([get_dep_dir("websocket-client"),
 
126
                                  get_dep_dir("python-jujuclient")])
130
127
    # get the deployment name
131
128
    cmd = ['python', deployer, '-c', deploy_config, "-l"]
132
129
    deploy_name = subprocess.check_output(cmd, env=env).split("\n")[0]
144
141
    deploy_config = mojo.get_config_file(workspace, "relations", args.envtag)
145
142
    deployer_dir = get_dep_dir("juju-deployer")
146
143
    deployer = os.path.abspath(os.path.join(deployer_dir, 'deployer.py'))
147
 
    env = {
148
 
        'PYTHONPATH': [],
149
 
        'JUJU_ENV': os.environ.get("JUJU_ENV", ""),
150
 
    }
151
 
    env['PYTHONPATH'].append(get_dep_dir("websocket-client"))
152
 
    env['PYTHONPATH'].append(get_dep_dir("python-jujuclient"))
 
144
    env = os.environ.copy()
 
145
    env['PYTHONPATH'] = ":".join([get_dep_dir("websocket-client"),
 
146
                                  get_dep_dir("python-jujuclient")])
153
147
    # get the deployment name
154
148
    cmd = ['python', deployer, '-c', deploy_config, "-l"]
155
149
    deploy_name = subprocess.check_output(cmd, env=env).split("\n")[0]
166
160
 
167
161
def verify(args):
168
162
    "Verify the running service"
169
 
    pass
 
163
    run_script("verify", args.workspace, args.envtag, critical=True)
170
164
 
171
165
# -----------------------
172
166
# main