Merge lp:~benji/charms/precise/juju-gui/test-failure into lp:~juju-gui/charms/precise/juju-gui/trunk

Proposed by Benji York
Status: Merged
Approved by: Benji York
Approved revision: 147
Merged at revision: 146
Proposed branch: lp:~benji/charms/precise/juju-gui/test-failure
Merge into: lp:~juju-gui/charms/precise/juju-gui/trunk
Diff against target: 20 lines (+3/-1)
2 files modified
.bzrignore (+2/-0)
test-requirements.pip (+1/-1)
To merge this branch: bzr merge lp:~benji/charms/precise/juju-gui/test-failure
Reviewer Review Type Date Requested Status
Benji York (community) Approve
Review via email: mp+201045@code.launchpad.net

This proposal supersedes a proposal from 2014-01-09.

Description of the change

Update selenium to fix functional test failure running firefox

To post a comment you must log in.
Revision history for this message
Benji York (benji) wrote :

An lbox mix-up caused me to have to re-create this MP, but Francesco approved the review so I'm self-approving this one.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2013-11-19 02:50:54 +0000
+++ .bzrignore 2014-01-09 16:57:57 +0000
@@ -7,3 +7,5 @@
7server/MANIFEST7server/MANIFEST
8tests/.venv8tests/.venv
9tests/download-cache9tests/download-cache
10juju-plugins
11juju-test
1012
=== modified file 'test-requirements.pip'
--- test-requirements.pip 2013-11-19 02:50:54 +0000
+++ test-requirements.pip 2014-01-09 16:57:57 +0000
@@ -43,7 +43,7 @@
43mock==1.0.143mock==1.0.1
4444
45# Charm tests.45# Charm tests.
46selenium==2.34.046selenium==2.39.0
47xvfbwrapper==0.2.247xvfbwrapper==0.2.2
4848
4949

Subscribers

People subscribed via source and target branches

to all changes: