git.iko.soy/unity8
on xenial help sign in
merge trunk
commit8f4a9dd74f6935c48dc084ab6ed507827ff1e62f authorMichał Sawicz <michal.sawicz@canonical.com> dateThu 12 Dec 2013, 13:29 (13 years ago) parentde5d9f739186f6
5 files changed+49−11
compare with xenial
unifiedsplit
.bzrignore+1−4 po/ast.po+6−6 tests/autopilot/.project+17 tests/autopilot/.pydevproject+8 tests/autopilot/unity8/process_helpers.py+17−1
.bzrignore+1−4
@@ -3,8 +3,5 @@
33# QtCreator project files
44/*.user
55# Eclipse project files
6−/.project
7−/.cproject
8−/.settings
9−/.pydevproject
6+.settings
107message.txt
po/ast.po+6−6
@@ -8,15 +8,15 @@ msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2013-11-29 09:21+0100\n"
11−"PO-Revision-Date: 2013-10-03 14:02+0000\n"
11+"PO-Revision-Date: 2013-12-11 20:45+0000\n"
1212"Last-Translator: ivarela <ivarela@ubuntu.com>\n"
1313"Language-Team: Asturian <ast@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2013-11-30 05:33+0000\n"
19−"X-Generator: Launchpad (build 16856)\n"
18+"X-Launchpad-Export-Date: 2013-12-12 06:02+0000\n"
19+"X-Generator: Launchpad (build 16869)\n"
2020
2121#: Components/EdgeDemoOverlay.qml:151
2222msgid "Skip intro"
@@ -141,7 +141,7 @@ msgstr "Falando…"
141141
142142#: Notifications/NotificationMenuItemFactory.qml:89
143143msgid "Show password"
144−msgstr ""
144+msgstr "Amosar contraseña"
145145
146146#: Panel/SearchIndicator.qml:27
147147msgid "Search"
@@ -150,11 +150,11 @@ msgstr "Guetar"
150150#: plugins/Unity/Launcher/launcheritem.cpp:43
151151#: plugins/Unity/Launcher/launcheritem.cpp:73
152152msgid "Lock to Launcher"
153−msgstr ""
153+msgstr "Caltener nel Llanzador"
154154
155155#: plugins/Unity/Launcher/launcheritem.cpp:73
156156msgid "Unlock from Launcher"
157−msgstr ""
157+msgstr "Nun caltener nel llanzador"
158158
159159#: Shell.qml:439
160160#, qt-format
tests/autopilot/.projectnew file+17
@@ -0,0 +1,17 @@
1+<?xml version="1.0" encoding="UTF-8"?>
2+<projectDescription>
3+ <name>Unity8 Autopilot</name>
4+ <comment></comment>
5+ <projects>
6+ </projects>
7+ <buildSpec>
8+ <buildCommand>
9+ <name>org.python.pydev.PyDevBuilder</name>
10+ <arguments>
11+ </arguments>
12+ </buildCommand>
13+ </buildSpec>
14+ <natures>
15+ <nature>org.python.pydev.pythonNature</nature>
16+ </natures>
17+</projectDescription>
tests/autopilot/.pydevprojectnew file+8
@@ -0,0 +1,8 @@
1+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+<?eclipse-pydev version="1.0"?><pydev_project>
3+<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
4+<path>/Unity8 Autopilot</path>
5+</pydev_pathproperty>
6+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
7+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
8+</pydev_project>
tests/autopilot/unity8/process_helpers.py+17−1
@@ -69,7 +69,23 @@ def unlock_unity(unity_proxy_obj=None):
6969 greeter = main_window.get_greeter()
7070 if greeter.created == False:
7171 raise RuntimeWarning("Greeter appears to be already unlocked.")
72− greeter.swipe()
72+
73+ # Because of potential input jerkiness under heavy load,
74+ # retry unlocking the greeter two times.
75+ # https://bugs.launchpad.net/ubuntu/+bug/1260113
76+
77+ retries = 3
78+ while retries > 0:
79+ try:
80+ greeter.swipe()
81+ except AssertionError:
82+ retries -= 1
83+ if retries == 0:
84+ raise
85+ logger.info("Failed to unlock greeter, trying again...")
86+ else:
87+ logger.info("Greeter unlocked, continuing.")
88+ break
7389
7490
7591def restart_unity_with_testability(*args):