Merge lp:~frankban/juju-quickstart/fix-macosx-failing-test into lp:juju-quickstart

[Francesco Banconi]

Fix failing test on MacOS.

Also update docs to include vivid.

Tests: `make check`.
No QA required.

https://codereview.appspot.com/191640043/

[Francesco Banconi (frankban)]

Reviewers: mp+246290_code.launchpad.net,

Message:
Please take a look.

Description:
Fix failing test on MacOS.

Also update docs to include vivid.

Tests: `make check`.
No QA required.

https://code.launchpad.net/~frankban/juju-quickstart/fix-macosx-failing-test/+merge/246290

(do not edit description out of merge proposal)

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

Affected files (+17, -7 lines):
   M HACKING.rst
   M README.rst
   A [revision details]
   M quickstart/tests/models/test_jenv.py

Index: HACKING.rst
=== modified file 'HACKING.rst'
--- HACKING.rst 2014-11-12 10:35:40 +0000
+++ HACKING.rst 2015-01-13 12:03:15 +0000
@@ -131,7 +131,7 @@
  ~~~~~~~~~~~~~~

  The general steps for manual QA (until we get a continuous integration set
up
-with functional tests) should be run on trusty and utopic.
+with functional tests) should be run on trusty, utopic and vivid.

  * Ensure juju-quickstart is installed from the juju-gui/quickstart-beta
PPA.::

@@ -309,6 +309,17 @@
     merged without human intervention. A recent branch took about two hours
     from the time the pull request was made.

+Tagging a new release
+~~~~~~~~~~~~~~~~~~~~~
+
+When a new release is successfully done (meaning it passed the QA described
+above and has been correctly published on PyPI, the PPAs and Homebrew), it
is
+time to tag it for future reference. To do that, just run the following
+commands on the trunk branch of Juju Quickstart::
+
+ $ bzr tag {version} # For instance bzr tag "1.6.0"
+ $ bzr push :parent
+
  Updating application and test dependencies
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

@@ -322,7 +333,7 @@

  Also ensure, before updating the application dependencies, that those
packages
  are available in the main Ubuntu repositories for the series we support
(from
-precise to utopic), or in the `Juju Quickstart Beta PPA
+precise to vivid), or in the `Juju Quickstart Beta PPA
  <https://launchpad.net/~juju-gui/+archive/quickstart-beta/+packages>`_.

  Please also keep up to date the possible values for the environments.yaml

Index: README.rst
=== modified file 'README.rst'
--- README.rst 2014-11-10 11:27:04 +0000
+++ README.rst 2015-01-13 12:03:15 +0000
@@ -34,7 +34,7 @@
  ------------------

  Juju Quickstart is available on Ubuntu releases 12.04 LTS (precise), 14.04
LTS
-(trusty), 14.10 (utopic) and on OS X (10.7 and later).
+(trusty), 14.10 (utopic), 15.04 (vivid) and on OS X (10.7 and later).

  Starting from version 1.5.0, Juju Quickstart only supports Juju >= 1.18.1.

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: quickstart/tests/models/test_jenv.py
=== modified file 'quickstart/tests/models/test_jenv.py'
--- quickstart/tests/models/test_jenv.py 2015-01-12 12:10:38 +0000
+++ quickstart/tests/models/test_jenv.py 2015-01-13 11:46:06 +0000
@@ -292,10 +292,7 @@
              dirname = os.path.dirname(path)
     ...

[Brad Crittenden (bac)]

LGTM, thanks.

https://codereview.appspot.com/191640043/

[Brad Crittenden (bac)]

Verified tests pass on OS X 10.10

https://codereview.appspot.com/191640043/

[Martin Hilton (martin-hilton)]

LGTM

https://codereview.appspot.com/191640043/

[Francesco Banconi (frankban)]

*** Submitted:

Fix failing test on MacOS.

Also update docs to include vivid.

Tests: `make check`.
No QA required.

R=bac, martin.hilton
CC=
https://codereview.appspot.com/191640043

https://codereview.appspot.com/191640043/

[Francesco Banconi (frankban)]

Thank you both!

https://codereview.appspot.com/191640043/

=== modified file 'HACKING.rst'
--- HACKING.rst	2014-11-12 10:35:40 +0000
+++ HACKING.rst	2015-01-13 12:33:37 +0000
@@ -131,7 +131,7 @@
 ~~~~~~~~~~~~~~
 
 The general steps for manual QA (until we get a continuous integration set up
-with functional tests) should be run on trusty and utopic.
+with functional tests) should be run on trusty, utopic and vivid.
 
 * Ensure juju-quickstart is installed from the juju-gui/quickstart-beta PPA.::
 
@@ -309,6 +309,17 @@
    merged without human intervention. A recent branch took about two hours
    from the time the pull request was made.
 
+Tagging a new release
+~~~~~~~~~~~~~~~~~~~~~
+
+When a new release is successfully done (meaning it passed the QA described
+above and has been correctly published on PyPI, the PPAs and Homebrew), it is
+time to tag it for future reference. To do that, just run the following
+commands on the trunk branch of Juju Quickstart::
+
+  $ bzr tag {version} # For instance bzr tag "1.6.0"
+  $ bzr push :parent
+
 Updating application and test dependencies
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -322,7 +333,7 @@
 
 Also ensure, before updating the application dependencies, that those packages
 are available in the main Ubuntu repositories for the series we support (from
-precise to utopic), or in the `Juju Quickstart Beta PPA
+precise to vivid), or in the `Juju Quickstart Beta PPA
 <https://launchpad.net/~juju-gui/+archive/quickstart-beta/+packages>`_.
 
 Please also keep up to date the possible values for the environments.yaml

=== modified file 'README.rst'
--- README.rst	2014-11-10 11:27:04 +0000
+++ README.rst	2015-01-13 12:33:37 +0000
@@ -34,7 +34,7 @@
 ------------------
 
 Juju Quickstart is available on Ubuntu releases 12.04 LTS (precise), 14.04 LTS
-(trusty), 14.10 (utopic) and on OS X (10.7 and later).
+(trusty), 14.10 (utopic), 15.04 (vivid) and on OS X (10.7 and later).
 
 Starting from version 1.5.0, Juju Quickstart only supports Juju >= 1.18.1.
 

=== modified file 'quickstart/tests/models/test_jenv.py'
--- quickstart/tests/models/test_jenv.py	2015-01-12 12:10:38 +0000
+++ quickstart/tests/models/test_jenv.py	2015-01-13 12:33:37 +0000
@@ -292,10 +292,7 @@
             dirname = os.path.dirname(path)
             os.mkdir(os.path.join(dirname, 'ec2.jenv'))
             error = jenv.remove('ec2')
-        expected_error = (
-            'cannot remove the ec2 environment: '
-            '[Errno 21] Is a directory: ')
-        self.assertIn(expected_error, error)
+        self.assertIn('cannot remove the ec2 environment: ', error)
 
     def test_error_not_found(self):
         # An error is returned if the environment cannot be found.