Merge lp:~frankban/juju-quickstart/osx-tests into lp:juju-quickstart

[Francesco Banconi]

Fix quickstart test failing on osx.

https://codereview.appspot.com/101970044/

[Francesco Banconi (frankban)]

Reviewers: mp+221513_code.launchpad.net,

Message:
Please take a look.

Description:
Fix quickstart test failing on osx.

https://code.launchpad.net/~frankban/juju-quickstart/osx-tests/+merge/221513

(do not edit description out of merge proposal)

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

Affected files (+3, -3 lines):
   A [revision details]
   M quickstart/tests/test_utils.py

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/test_utils.py
=== modified file 'quickstart/tests/test_utils.py'
--- quickstart/tests/test_utils.py 2014-04-23 12:20:35 +0000
+++ quickstart/tests/test_utils.py 2014-05-30 09:23:00 +0000
@@ -134,9 +134,7 @@
          retcode, output, error = utils.call('ls', 'no-such-file')
          self.assertNotEqual(0, retcode)
          self.assertEqual('', output)
- self.assertEqual(
- 'ls: cannot access no-such-file: No such file or directory\n',
- error)
+ self.assertIn('No such file or directory', error)

      def test_invalid_command(self):
          # An error code and the error are returned if the subprocess fails
to

[Francesco Banconi (frankban)]

Self review: trivial.

https://codereview.appspot.com/101970044/

[Francesco Banconi (frankban)]

*** Submitted:

Fix quickstart test failing on osx.

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

https://codereview.appspot.com/101970044/

=== modified file 'quickstart/tests/test_utils.py'
--- quickstart/tests/test_utils.py	2014-04-23 12:20:35 +0000
+++ quickstart/tests/test_utils.py	2014-05-30 09:47:46 +0000
@@ -134,9 +134,7 @@
         retcode, output, error = utils.call('ls', 'no-such-file')
         self.assertNotEqual(0, retcode)
         self.assertEqual('', output)
-        self.assertEqual(
-            'ls: cannot access no-such-file: No such file or directory\n',
-            error)
+        self.assertIn('No such file or directory', error)
 
     def test_invalid_command(self):
         # An error code and the error are returned if the subprocess fails to