Merge lp:~frankban/charms/trusty/juju-gui/fix-branch-ftest into lp:~juju-gui/charms/trusty/juju-gui/trunk

[Francesco Banconi]

Fix branch functional test.

Skip the test on precise.

https://codereview.appspot.com/160890043/

[Francesco Banconi (frankban)]

Reviewers: mp+238400_code.launchpad.net,

Message:
Please take a look.

Description:
Fix branch functional test.

Skip the test on precise.

https://code.launchpad.net/~frankban/charms/trusty/juju-gui/fix-branch-ftest/+merge/238400

(do not edit description out of merge proposal)

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

Affected files (+5, -0 lines):
   A [revision details]
   M tests/20-functional.test

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-09-12 11:23:44 +0000
+++ tests/20-functional.test 2014-10-15 07:49:26 +0000
@@ -202,6 +202,9 @@
          server_info = self.get_builtin_server_info(hostname)
          self.assertTrue(server_info['sandbox'])

+ @unittest.skipIf(
+ bootstrap_node_series == 'precise',
+ 'deploying from git branches is not supported on precise')
      def test_branch_source(self):
          # Ensure the Juju GUI is correctly deployed from a Git branch.
          options = {'juju-gui-source': JUJU_GUI_TEST_BRANCH}

[Francesco Banconi (frankban)]

Self review: trivial.

https://codereview.appspot.com/160890043/

[Francesco Banconi (frankban)]

*** Submitted:

Fix branch functional test.

Skip the test on precise.

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

https://codereview.appspot.com/160890043/

=== modified file 'tests/20-functional.test'
--- tests/20-functional.test	2014-09-12 11:23:44 +0000
+++ tests/20-functional.test	2014-10-15 08:29:22 +0000
@@ -202,6 +202,9 @@
         server_info = self.get_builtin_server_info(hostname)
         self.assertTrue(server_info['sandbox'])
 
+    @unittest.skipIf(
+        bootstrap_node_series == 'precise',
+        'deploying from git branches is not supported on precise')
     def test_branch_source(self):
         # Ensure the Juju GUI is correctly deployed from a Git branch.
         options = {'juju-gui-source': JUJU_GUI_TEST_BRANCH}