Code review comment for lp:~uros-jovanovic/charms/trusty/juju-gui/hackingreview

Reviewers: mp+226270_code.launchpad.net,

Message:
Please take a look.

Description:
minor change in hacking.md

https://code.launchpad.net/~uros-jovanovic/charms/trusty/juju-gui/hackingreview/+merge/226270

(do not edit description out of merge proposal)

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

Affected files (+12, -6 lines):
   M HACKING.md
   A [revision details]
   M tests/20-functional.test
   M tests/deploy.py

Index: HACKING.md
=== modified file 'HACKING.md'
--- HACKING.md 2014-04-22 10:28:39 +0000
+++ HACKING.md 2014-07-10 10:24:19 +0000
@@ -140,10 +140,10 @@
  When something goes wrong, on your local machine run
  `juju debug-hooks juju-gui/0` or similar. This will initially put you on
the
  unit that has the problem. You can look at what is going on in
-`/var/lib/juju/units/[NAME OF UNIT]`. There is a charm.log file to
-investigate, and a charm directory which contains the charm. The charm
-directory contains the `juju-gui` and `juju` directories, so everything you
-need is there.
+`/var/lib/juju/agents/[NAME OF UNIT]` (or instead of agents use
`containers`
+in the local environment. There is a charm.log file to investigate, and a
+charm directory which contains the charm. The charm directory contains the
+`juju-gui` and `juju` directories, so everything you need is there.

  If juju recognized an error (for instance, the unit is in
an "install-error"
  state) then you can do more. In another terminal on your local machine,
run

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>

Index: tests/20-functional.test
=== modified file 'tests/20-functional.test'
--- tests/20-functional.test 2014-04-14 17:00:09 +0000
+++ tests/20-functional.test 2014-07-10 11:53:35 +0000
@@ -23,6 +23,7 @@
  import unittest
  import urllib2
  import urlparse
+import os

  from selenium.webdriver import Firefox
  from selenium.webdriver.support import ui
@@ -50,6 +51,10 @@
      print(err)
  bootstrap_node_series = juju_status()['machines']['0']['series']

+forced_machine = 0
+env_par = os.getenv('JUJU_ENV')
+if env_par == "local":
+ forced_machine = None

  def juju_deploy_gui(options=None):
      """Deploy the Juju GUI charm with the given options.
@@ -62,7 +67,7 @@
      service_name = make_service_name(prefix='juju-gui-')
      unit_info = juju_deploy(
          'juju-gui', service_name=service_name, options=options,
- force_machine=0, series=bootstrap_node_series)
+ force_machine=forced_machine, series=bootstrap_node_series)
      return service_name, unit_info

Index: tests/deploy.py
=== modified file 'tests/deploy.py'
--- tests/deploy.py 2014-04-22 09:27:01 +0000
+++ tests/deploy.py 2014-07-10 11:53:35 +0000
@@ -32,7 +32,6 @@
      wait_for_unit,
  )

-
  rsync = command('rsync', '-a',
                  '--exclude', '.git',
                  '--exclude', '.bzr',