Merge lp:~frankban/charms/precise/juju-gui/ftests-fixes into lp:~juju-gui/charms/precise/juju-gui/trunk

[Francesco Banconi]

Fix charm functional tests.

Updated Selenium to the last version: it includes
a fix for Firefox 23.

Also updated the force-machine test: use the new
--to juju-core option.

https://codereview.appspot.com/12665043/

[Francesco Banconi (frankban)]

Reviewers: mp+179196_code.launchpad.net,

Message:
Please take a look.

Description:
Fix charm functional tests.

Updated Selenium to the last version: it includes
a fix for Firefox 23.

Also updated the force-machine test: use the new
--to juju-core option.

https://code.launchpad.net/~frankban/charms/precise/juju-gui/ftests-fixes/+merge/179196

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M revision
   M tests/deploy.py
   M tests/requirements.pip
   M tests/test_deploy.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: revision
=== modified file 'revision'
--- revision 2013-08-05 15:00:27 +0000
+++ revision 2013-08-08 13:09:10 +0000
@@ -1,1 +1,1 @@
-66
+67

Index: tests/deploy.py
=== modified file 'tests/deploy.py'
--- tests/deploy.py 2013-06-12 09:07:29 +0000
+++ tests/deploy.py 2013-08-08 13:09:10 +0000
@@ -68,7 +68,7 @@
          config_file = make_charm_config_file({charm: options})
          args.extend(['--config', config_file.name])
      if force_machine is not None:
- args.extend(['--force-machine', str(force_machine)])
+ args.extend(['--to', str(force_machine)])
      args.append('local:{}/{}'.format(series, charm))
      juju(*args)
      juju('expose', charm)

Index: tests/requirements.pip
=== modified file 'tests/requirements.pip'
--- tests/requirements.pip 2013-07-19 14:25:55 +0000
+++ tests/requirements.pip 2013-08-08 13:09:10 +0000
@@ -23,7 +23,7 @@
  python-apt==0.8.5
  -e bzr+http://launchpad.net/python-shelltoolbox#egg=python-shelltoolbox
  PyYAML==3.10
-selenium==2.33.0
+selenium==2.34.0
  Tempita==0.5.1
  tornado==3.1
  xvfbwrapper==0.2.2

Index: tests/test_deploy.py
=== modified file 'tests/test_deploy.py'
--- tests/test_deploy.py 2013-06-12 09:07:29 +0000
+++ tests/test_deploy.py 2013-08-08 13:53:54 +0000
@@ -169,7 +169,7 @@
          expected_deploy_call = mock.call(
              'deploy',
              '--repository', self.repo,
- '--force-machine', '42',
+ '--to', '42',
              self.local_charm,
          )
          deploy_call = self.call_deploy(force_machine=42)

[Francesco Banconi (frankban)]

Self-review: critical + trivial.

https://codereview.appspot.com/12665043/

[Francesco Banconi (frankban)]

*** Submitted:

Fix charm functional tests.

Updated Selenium to the last version: it includes
a fix for Firefox 23.

Also updated the force-machine test: use the new
--to juju-core option.

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

https://codereview.appspot.com/12665043/

=== modified file 'revision'
--- revision	2013-08-05 15:00:27 +0000
+++ revision	2013-08-08 13:56:25 +0000
@@ -1,1 +1,1 @@
-66
+67

=== modified file 'tests/deploy.py'
--- tests/deploy.py	2013-06-12 09:07:29 +0000
+++ tests/deploy.py	2013-08-08 13:56:25 +0000
@@ -68,7 +68,7 @@
         config_file = make_charm_config_file({charm: options})
         args.extend(['--config', config_file.name])
     if force_machine is not None:
-        args.extend(['--force-machine', str(force_machine)])
+        args.extend(['--to', str(force_machine)])
     args.append('local:{}/{}'.format(series, charm))
     juju(*args)
     juju('expose', charm)

=== modified file 'tests/requirements.pip'
--- tests/requirements.pip	2013-07-19 14:25:55 +0000
+++ tests/requirements.pip	2013-08-08 13:56:25 +0000
@@ -23,7 +23,7 @@
 python-apt==0.8.5
 -e bzr+http://launchpad.net/python-shelltoolbox#egg=python-shelltoolbox
 PyYAML==3.10
-selenium==2.33.0
+selenium==2.34.0
 Tempita==0.5.1
 tornado==3.1
 xvfbwrapper==0.2.2

=== modified file 'tests/test_deploy.py'
--- tests/test_deploy.py	2013-06-12 09:07:29 +0000
+++ tests/test_deploy.py	2013-08-08 13:56:25 +0000
@@ -169,7 +169,7 @@
         expected_deploy_call = mock.call(
             'deploy',
             '--repository', self.repo,
-            '--force-machine', '42',
+            '--to', '42',
             self.local_charm,
         )
         deploy_call = self.call_deploy(force_machine=42)