Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(3259)

Issue 14579044: Fix upload-tools for released versions; fix tests

Can't Edit
Can't Publish+Mail
Start Review
Created:
10 years, 6 months ago by axw
Modified:
10 years, 6 months ago
Reviewers:
mp+190085, fwereade
Visibility:
Public.

Description

Fix upload-tools for released versions; fix tests (Cherry picked from juju-core to juju-core/1.16) There was an issue with sync.Upload/SyncTools for release versions. Upload sets Dev to true in SyncContext, and calls SyncTools. SyncTools then sets Dev to false because MinorVersion==-1. This caused SyncTools to fail, since uploaded tools are *always* dev (version.Build++). Also, several bootstrap and upgrade-juju tests have been fixed for running in release versions (tested with version.version=="1.16.0"). Finally, some test cleanup (don't connect commands to stdio in tests): - Added nullContext helper - Make runCommand panic if ctx is nil - Replace runCommand(nil...) with runCommand(nullContext()...) Fixes #1237123 https://code.launchpad.net/~axwalk/juju-core/1.16/+merge/190085 (do not edit description out of merge proposal)

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+69 lines, -24 lines) Patch
A [revision details] View 1 chunk +2 lines, -0 lines 0 comments Download
M cmd/juju/bootstrap_test.go View 10 chunks +48 lines, -16 lines 0 comments Download
M cmd/juju/cmd_test.go View 5 chunks +15 lines, -5 lines 0 comments Download
M environs/sync/sync.go View 2 chunks +4 lines, -3 lines 0 comments Download

Messages

Total messages: 2
axw
Please take a look.
10 years, 6 months ago (2013-10-09 10:40:32 UTC) #1
fwereade
10 years, 6 months ago (2013-10-09 12:55:31 UTC) #2
LGTM
Sign in to reply to this message.

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b