Merge lp:~frankban/juju-quickstart/lbox-requiring-sudo into lp:juju-quickstart

Proposed by Francesco Banconi
Status: Merged
Merged at revision: 119
Proposed branch: lp:~frankban/juju-quickstart/lbox-requiring-sudo
Merge into: lp:juju-quickstart
Diff against target: 59 lines (+7/-4)
5 files modified
.lbox.check (+3/-0)
Makefile (+1/-1)
quickstart/app.py (+1/-1)
quickstart/tests/models/test_envs.py (+1/-1)
tox.ini (+1/-1)
To merge this branch: bzr merge lp:~frankban/juju-quickstart/lbox-requiring-sudo
Reviewer Review Type Date Requested Status
Juju GUI Hackers Pending
Review via email: mp+249047@code.launchpad.net

Description of the change

Avoid requiring sudo privileges on lbox submit.

https://codereview.appspot.com/199470043/

To post a comment you must log in.
Revision history for this message
Francesco Banconi (frankban) wrote :

Reviewers: mp+249047_code.launchpad.net,

Message:
Please take a look.

Description:
Avoid requiring sudo privileges on lbox submit.

https://code.launchpad.net/~frankban/juju-quickstart/lbox-requiring-sudo/+merge/249047

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/199470043/

Affected files (+5, -0 lines):
   M .lbox.check
   A [revision details]

Index: .lbox.check
=== modified file '.lbox.check'
--- .lbox.check 2013-10-14 11:43:06 +0000
+++ .lbox.check 2015-02-09 10:19:10 +0000
@@ -1,3 +1,6 @@
  #!/bin/sh

+# Avoid requiring sudo privileges to install system dependencies.
+touch .sysdeps-installed
+# Run all the unit tests.
  make check

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision:
<email address hidden>
+New revision:
<email address hidden>

Revision history for this message
Francesco Banconi (frankban) wrote :
120. By Francesco Banconi

Ignore lambda pep8 and fix lint errors.

Revision history for this message
Francesco Banconi (frankban) wrote :
Revision history for this message
Francesco Banconi (frankban) wrote :

*** Submitted:

Avoid requiring sudo privileges on lbox submit.

R=
CC=
https://codereview.appspot.com/199470043

https://codereview.appspot.com/199470043/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.lbox.check'
--- .lbox.check 2013-10-14 11:43:06 +0000
+++ .lbox.check 2015-02-09 10:38:39 +0000
@@ -1,3 +1,6 @@
1#!/bin/sh1#!/bin/sh
22
3# Avoid requiring sudo privileges to install system dependencies.
4touch .sysdeps-installed
5# Run all the unit tests.
3make check6make check
47
=== modified file 'Makefile'
--- Makefile 2015-01-30 16:42:29 +0000
+++ Makefile 2015-02-09 10:38:39 +0000
@@ -104,7 +104,7 @@
104104
105.PHONY: lint105.PHONY: lint
106lint: setup106lint: setup
107 @$(DEVENV)/bin/flake8 --show-source quickstart107 @$(DEVENV)/bin/flake8 --ignore E731 --show-source quickstart
108108
109.PHONY: release109.PHONY: release
110release: check110release: check
111111
=== modified file 'quickstart/app.py'
--- quickstart/app.py 2015-01-12 15:00:52 +0000
+++ quickstart/app.py 2015-02-09 10:38:39 +0000
@@ -257,7 +257,7 @@
257 Raise a ProgramExit if the agent is not ready after ten minutes or if the257 Raise a ProgramExit if the agent is not ready after ten minutes or if the
258 agent is in an error state.258 agent is in an error state.
259 """259 """
260 timeout = time.time() + (60*10)260 timeout = time.time() + (60 * 10)
261 while time.time() < timeout:261 while time.time() < timeout:
262 retcode, output, error = utils.call(262 retcode, output, error = utils.call(
263 juju_command, 'status', '-e', env_name, '--format', 'yaml')263 juju_command, 'status', '-e', env_name, '--format', 'yaml')
264264
=== modified file 'quickstart/tests/models/test_envs.py'
--- quickstart/tests/models/test_envs.py 2014-11-12 16:09:30 +0000
+++ quickstart/tests/models/test_envs.py 2015-02-09 10:38:39 +0000
@@ -712,7 +712,7 @@
712 env_metadata = self.env_type_db['ec2']712 env_metadata = self.env_type_db['ec2']
713 expected = [713 expected = [
714 'type', 'name', 'access-key', 'secret-key', 'region',714 'type', 'name', 'access-key', 'secret-key', 'region',
715 'admin-secret', 'default-series', 'control-bucket', 'is-default']715 'admin-secret', 'default-series', 'control-bucket', 'is-default']
716 expected_required = [716 expected_required = [
717 'type', 'name', 'access-key', 'secret-key',717 'type', 'name', 'access-key', 'secret-key',
718 'is-default']718 'is-default']
719719
=== modified file 'tox.ini'
--- tox.ini 2015-01-30 16:26:02 +0000
+++ tox.ini 2015-02-09 10:38:39 +0000
@@ -108,4 +108,4 @@
108[testenv:lint]108[testenv:lint]
109usedevelop = True109usedevelop = True
110deps = flake8==2.3.0110deps = flake8==2.3.0
111commands = flake8 --show-source quickstart111commands = flake8 --ignore E731 --show-source quickstart

Subscribers

People subscribed via source and target branches