← Back to branch summary

~nick-dedekind/ubuntu-ui-toolkit/prevent-slider-mouse-stealing

« back to all changes in this revision

Viewing changes to tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_toolbar.py

  • Committer: Leonardo Arias Fonseca
  • Date: 2015-04-14 21:02:06 UTC
  • mto: (1000.471.4 staging)
  • mto: This revision was merged to the branch mainline in revision 1178.
  • Revision ID: leo.arias@canonical.com-20150414210206-mdnp0ul72iqnj089
https://launchpad.net/bugs/1429163
Removed python2 support from autopilot tests and helpers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_toolbar.py
14
14
# You should have received a copy of the GNU Lesser General Public License
15
15
# along with this program. If not, see <http://www.gnu.org/licenses/>.
16
16
 
17
 
try:
18
 
    from unittest import mock
19
 
except ImportError:
20
 
    import mock
 
17
from unittest import mock
21
18
 
22
19
import ubuntuuitoolkit
23
20
from ubuntuuitoolkit import tests
62
59
""")
63
60
 
64
61
    def setUp(self):
65
 
        super(ToolbarTestCase, self).setUp()
 
62
        super().setUp()
66
63
        self.toolbar = self.main_view.get_toolbar()
67
64
        # toolbar may be opened or closed now, depending on whether
68
65
        # the application has been deactivated and resumed already