Merge lp:~elopio/ubuntu-ui-toolkit/fix1204281_package_name into lp:ubuntu-ui-toolkit

Proposed by Leo Arias
Status: Merged
Approved by: Francis Ginther
Approved revision: 652
Merged at revision: 653
Proposed branch: lp:~elopio/ubuntu-ui-toolkit/fix1204281_package_name
Merge into: lp:ubuntu-ui-toolkit
Diff against target: 83 lines (+8/-9)
6 files modified
debian/ubuntu-ui-toolkit-autopilot.install (+1/-1)
run_tests.sh (+3/-3)
tests/autopilot/ubuntuuitoolkit/tests/__init__.py (+1/-1)
tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py (+1/-1)
tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py (+1/-2)
ubuntu-sdk.pro (+1/-1)
To merge this branch: bzr merge lp:~elopio/ubuntu-ui-toolkit/fix1204281_package_name
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Juhapekka Piiroinen (community) Approve
Review via email: mp+176538@code.launchpad.net

Commit message

Renamed the UbuntuUiToolkit python package to ubuntuuitoolkit.

Description of the change

In order to follow pep8 guidelines and a more pythonic style, the name should be all lower case.
This is a good moment for the rename, because we haven't started to use the autopilot helpers on the core apps. We will start after this branch is released.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Juhapekka Piiroinen (juhapekka-piiroinen) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Hit a networking or launchpad issue. re-approving.

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/ubuntu-ui-toolkit-autopilot.install'
2--- debian/ubuntu-ui-toolkit-autopilot.install 2013-04-19 12:54:29 +0000
3+++ debian/ubuntu-ui-toolkit-autopilot.install 2013-07-25 01:44:28 +0000
4@@ -1,1 +1,1 @@
5-tests/autopilot/UbuntuUiToolkit/* usr/lib/python2.7/dist-packages/UbuntuUiToolkit/
6+tests/autopilot/ubuntuuitoolkit/* usr/lib/python2.7/dist-packages/ubuntuuitoolkit/
7
8=== modified file 'run_tests.sh'
9--- run_tests.sh 2013-04-19 12:54:29 +0000
10+++ run_tests.sh 2013-07-25 01:44:28 +0000
11@@ -1,6 +1,6 @@
12 #!/bin/bash
13 #
14-# Copyright 2012 Canonical Ltd.
15+# Copyright 2012, 2013 Canonical Ltd.
16 #
17 # This program is free software; you can redistribute it and/or modify
18 # it under the terms of the GNU Lesser General Public License as published by
19@@ -20,9 +20,9 @@
20 echo running with arg: $1
21
22 if [ "$1" == "" ]; then
23- autopilot run UbuntuUiToolkit
24+ autopilot run ubuntuuitoolkit
25 else
26- autopilot run -o ../../$1 -f xml -r -rd ../../ UbuntuUiToolkit
27+ autopilot run -o ../../$1 -f xml -r -rd ../../ ubuntuuitoolkit
28 fi
29
30 exit 0
31
32=== renamed directory 'tests/autopilot/UbuntuUiToolkit' => 'tests/autopilot/ubuntuuitoolkit'
33=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/__init__.py'
34--- tests/autopilot/UbuntuUiToolkit/tests/__init__.py 2013-07-18 18:42:57 +0000
35+++ tests/autopilot/ubuntuuitoolkit/tests/__init__.py 2013-07-25 01:44:28 +0000
36@@ -27,7 +27,7 @@
37 from testtools.matchers import Is, Not, Equals
38 from autopilot.testcase import AutopilotTestCase
39
40-from UbuntuUiToolkit import emulators
41+from ubuntuuitoolkit import emulators
42
43
44 def get_module_include_path():
45
46=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py'
47--- tests/autopilot/UbuntuUiToolkit/tests/gallery/test_gallery.py 2013-07-24 21:25:15 +0000
48+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py 2013-07-25 01:44:28 +0000
49@@ -24,7 +24,7 @@
50 from autopilot.matchers import Eventually
51 from testtools.matchers import Is, Not, Equals
52
53-from UbuntuUiToolkit import tests
54+from ubuntuuitoolkit import tests
55
56
57 class GalleryTestCase(tests.UbuntuUiToolkitTestCase):
58
59=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py'
60--- tests/autopilot/UbuntuUiToolkit/tests/test_emulators.py 2013-07-19 06:28:20 +0000
61+++ tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py 2013-07-25 01:44:28 +0000
62@@ -16,8 +16,7 @@
63
64 import mock
65
66-from UbuntuUiToolkit import tests
67-from UbuntuUiToolkit import emulators
68+from ubuntuuitoolkit import emulators, tests
69
70
71 class MainViewTestCase(tests.UbuntuUiToolkitTestCase):
72
73=== modified file 'ubuntu-sdk.pro'
74--- ubuntu-sdk.pro 2013-06-30 13:04:37 +0000
75+++ ubuntu-sdk.pro 2013-07-25 01:44:28 +0000
76@@ -22,7 +22,7 @@
77 QMAKE_EXTRA_TARGETS += test_api
78
79 test_components.target = test-components
80-test_components.commands = cd tests/autopilot; autopilot run UbuntuUiToolkit
81+test_components.commands = cd tests/autopilot; autopilot run ubuntuuitoolkit
82 test_components.depends = modules/ubuntu-ui-toolkit.pro
83 QMAKE_EXTRA_TARGETS += test_components
84

Subscribers

People subscribed via source and target branches

to status/vote changes: