Merge lp:~ara/mago/mago into lp:~mago-contributors/mago/mago-1.0
- mago
- Merge into mago-1.0
Status: | Merged |
---|---|
Merged at revision: | not available |
Proposed branch: | lp:~ara/mago/mago |
Merge into: | lp:~mago-contributors/mago/mago-1.0 |
Diff against target: | None lines |
To merge this branch: | bzr merge lp:~ara/mago/mago |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Javier Collado (community) | Approve | ||
Review via email:
|
Commit message
Description of the change
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ara Pulido (ara) wrote : | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ara Pulido (ara) wrote : | # |
I also removed the debian packaging, as we are not using it and it is very outdated.
If we decide to package Mago, we can add it later again.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Javier Collado (javier.collado) wrote : | # |
Hello,
desktoptesting package should be renamed to mago also, right?
Best regards,
Javier
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ara Pulido (ara) wrote : | # |
I was not sure about that point.
Before, the project name was ubuntu-
I wouldn't like people to think that the project is just the library.
would libmago a better name?
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Javier Collado (javier.collado) wrote : | # |
I would stick to mago just to have a short name. I think there are many projects whose name mean multiple things and that's not a problem.
Best regards,
Javier
> I was not sure about that point.
> Before, the project name was ubuntu-
> desktoptesting.
>
> I wouldn't like people to think that the project is just the library.
>
> would libmago a better name?
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Nagappan Alagappan (nagappan) wrote : | # |
> would libmago a better name?
What mago stands for ? I like libmago though :)
Thanks
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ara Pulido (ara) wrote : | # |
> I would stick to mago just to have a short name. I think there are many
> projects whose name mean multiple things and that's not a problem.
>
I think libmago is short enough and it would be better for packaging in the future. If we create a package in the future, mago could be the source package providing as binaries: mago and libmago (and maybe magotests)
- 57. By Ara Pulido
-
Changed the package name to mago
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ara Pulido (ara) wrote : | # |
Package name changed.
Regards,
Ara.
> Hello,
>
> desktoptesting package should be renamed to mago also, right?
>
> Best regards,
> Javier
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ara Pulido (ara) wrote : | # |
Is there anything else needed? I would like to have this small change approved ASAP, so I can announce the new name at the list.
Thanks,
Ara.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Javier Collado (javier.collado) wrote : | # |
After the package name change, I don't have any other concern.
Preview Diff
1 | === renamed file 'bin/ubuntu-desktop-test' => 'bin/mago' | |||
2 | --- bin/ubuntu-desktop-test 2009-06-03 14:40:26 +0000 | |||
3 | +++ bin/mago 2009-06-09 15:22:50 +0000 | |||
4 | @@ -22,7 +22,7 @@ | |||
5 | 22 | 22 | ||
6 | 23 | # Globals | 23 | # Globals |
7 | 24 | TESTS_SHARE = "." | 24 | TESTS_SHARE = "." |
9 | 25 | TESTS_HOME = os.environ["HOME"] + "/.ubuntu-desktop-test" | 25 | TESTS_HOME = os.environ["HOME"] + "/.mago" |
10 | 26 | SCREENSHOTS_SHARE = "/tmp/ldtp-screenshots" | 26 | SCREENSHOTS_SHARE = "/tmp/ldtp-screenshots" |
11 | 27 | 27 | ||
12 | 28 | # For the moment, all applications should be running in English | 28 | # For the moment, all applications should be running in English |
13 | @@ -224,7 +224,7 @@ | |||
14 | 224 | usage = "%prog [OPTIONS]" | 224 | usage = "%prog [OPTIONS]" |
15 | 225 | parser = OptionParser(usage=usage) | 225 | parser = OptionParser(usage=usage) |
16 | 226 | 226 | ||
18 | 227 | default_target = "~/.ubuntu-desktop-test" | 227 | default_target = "~/.mago" |
19 | 228 | default_log_level = "critical" | 228 | default_log_level = "critical" |
20 | 229 | 229 | ||
21 | 230 | parser.add_option("-l", "--log", | 230 | parser.add_option("-l", "--log", |
22 | 231 | 231 | ||
23 | === removed directory 'debian' | |||
24 | === removed file 'debian/changelog' | |||
25 | --- debian/changelog 2009-03-10 01:49:07 +0000 | |||
26 | +++ debian/changelog 1970-01-01 00:00:00 +0000 | |||
27 | @@ -1,12 +0,0 @@ | |||
28 | 1 | ubuntu-desktop-testing (0.1-0ubuntu2) jaunty; urgency=low | ||
29 | 2 | |||
30 | 3 | * Various fixes for Checkbox integration | ||
31 | 4 | * Fixed packaging for Jaunty/Python 2.6 | ||
32 | 5 | |||
33 | 6 | -- Dave Murphy <schwuk@ubuntu.com> Tue, 10 Mar 2009 01:47:13 +0000 | ||
34 | 7 | |||
35 | 8 | ubuntu-desktop-testing (0.1-0ubuntu1) intrepid; urgency=low | ||
36 | 9 | |||
37 | 10 | * Initial release. | ||
38 | 11 | |||
39 | 12 | -- Ara Pulido <apulido@gmail.com> Thu, 31 Jul 2008 07:16:11 -0400 | ||
40 | 13 | 0 | ||
41 | === removed file 'debian/compat' | |||
42 | --- debian/compat 2008-08-21 11:18:49 +0000 | |||
43 | +++ debian/compat 1970-01-01 00:00:00 +0000 | |||
44 | @@ -1,1 +0,0 @@ | |||
45 | 1 | 5 | ||
46 | 2 | 0 | ||
47 | === removed file 'debian/control' | |||
48 | --- debian/control 2008-08-27 11:33:17 +0000 | |||
49 | +++ debian/control 1970-01-01 00:00:00 +0000 | |||
50 | @@ -1,26 +0,0 @@ | |||
51 | 1 | Source: ubuntu-desktop-testing | ||
52 | 2 | Section: utils | ||
53 | 3 | Priority: optional | ||
54 | 4 | XSBC-Original-Maintainer: Ara Pulido <apulido@gmail.com> | ||
55 | 5 | Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com> | ||
56 | 6 | Standards-Version: 3.8.0 | ||
57 | 7 | XS-Python-Version: current | ||
58 | 8 | Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), python-central, python-dev (>= 2.4), python-distutils-extra | ||
59 | 9 | Vcs-Bzr: https://code.launchpad.net/~hardware-certification/checkbox/trunk | ||
60 | 10 | |||
61 | 11 | Package: ubuntu-desktop-tests | ||
62 | 12 | Architecture: all | ||
63 | 13 | Depends: ${misc:Depends}, ${python:Depends}, ldtp, python-ldtp, desktop-testing-library | ||
64 | 14 | Recommends: xsltproc, firefox | ||
65 | 15 | XB-Python-Version: ${python:Versions} | ||
66 | 16 | Description: Ubuntu Desktop Tests | ||
67 | 17 | A set of desktop tests that can be used with the desktop-testing-library to test Ubuntu automatically. | ||
68 | 18 | Vcs-Bzr: https://code.launchpad.net/~apulido/ubuntu-desktop-testing/ubuntu-desktop-testing | ||
69 | 19 | |||
70 | 20 | Package: desktop-testing-library | ||
71 | 21 | Architecture: all | ||
72 | 22 | Depends: ${misc:Depends}, ${python:Depends}, ldtp, python-ldtp | ||
73 | 23 | XB-Python-Version: ${python:Versions} | ||
74 | 24 | Description: Desktop Testing library | ||
75 | 25 | Library for desktop testing. It allows the user to write desktop tests for Ubuntu withouth needing to know how LDTP framework works internally. | ||
76 | 26 | Vcs-Bzr: https://code.launchpad.net/~apulido/ubuntu-desktop-testing/ubuntu-desktop-testing | ||
77 | 27 | 0 | ||
78 | === removed file 'debian/copyright' | |||
79 | --- debian/copyright 2008-08-27 11:33:17 +0000 | |||
80 | +++ debian/copyright 1970-01-01 00:00:00 +0000 | |||
81 | @@ -1,30 +0,0 @@ | |||
82 | 1 | This package was debianized by Ara Pulido <ara.pulido@canonical.com> | ||
83 | 2 | Thu Jul 31 07:41:17 EDT 2008 | ||
84 | 3 | |||
85 | 4 | It was downloaded from http://launchpad.net/ubuntu-tests | ||
86 | 5 | |||
87 | 6 | Upstream Authors: | ||
88 | 7 | Ara Pulido <ara.pulido@ubuntu.com> | ||
89 | 8 | |||
90 | 9 | Copyright: | ||
91 | 10 | Copyright (c) 2008 Canonical | ||
92 | 11 | |||
93 | 12 | License: | ||
94 | 13 | |||
95 | 14 | This package is free software: you can redistribute it and/or modify | ||
96 | 15 | it under the terms of the GNU Lesser General Public License as published by | ||
97 | 16 | the Free Software Foundation, either version 3 of the License, or | ||
98 | 17 | (at your option) any later version. | ||
99 | 18 | |||
100 | 19 | This program is distributed in the hope that it will be useful, | ||
101 | 20 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
102 | 21 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
103 | 22 | GNU Lesser General Public License for more details. | ||
104 | 23 | |||
105 | 24 | You should have received a copy of the GNU Lesser General Public License | ||
106 | 25 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
107 | 26 | |||
108 | 27 | On Debian systems, the complete text of the GNU Lesser General | ||
109 | 28 | Public License can be found in `/usr/share/common-licenses/LGPL'. | ||
110 | 29 | |||
111 | 30 | The entire code base may be distributed under the terms of the GNU Lesser General Public License (LGPL). | ||
112 | 31 | 0 | ||
113 | === removed file 'debian/desktop-testing-library.install' | |||
114 | --- debian/desktop-testing-library.install 2009-03-10 01:49:07 +0000 | |||
115 | +++ debian/desktop-testing-library.install 1970-01-01 00:00:00 +0000 | |||
116 | @@ -1,1 +0,0 @@ | |||
117 | 1 | usr/lib/python*/dist-packages/desktoptesting/* | ||
118 | 2 | 0 | ||
119 | === removed file 'debian/pycompat' | |||
120 | --- debian/pycompat 2008-08-21 11:18:49 +0000 | |||
121 | +++ debian/pycompat 1970-01-01 00:00:00 +0000 | |||
122 | @@ -1,1 +0,0 @@ | |||
123 | 1 | 2 | ||
124 | 2 | 0 | ||
125 | === removed file 'debian/rules' | |||
126 | --- debian/rules 2009-03-10 01:49:07 +0000 | |||
127 | +++ debian/rules 1970-01-01 00:00:00 +0000 | |||
128 | @@ -1,13 +0,0 @@ | |||
129 | 1 | #!/usr/bin/make -f | ||
130 | 2 | |||
131 | 3 | DEB_PYTHON_SYSTEM := pycentral | ||
132 | 4 | |||
133 | 5 | include /usr/share/cdbs/1/rules/debhelper.mk | ||
134 | 6 | include /usr/share/cdbs/1/class/python-distutils.mk | ||
135 | 7 | include /usr/share/cdbs/1/rules/simple-patchsys.mk | ||
136 | 8 | |||
137 | 9 | DEB_DH_INSTALL_SOURCEDIR := debian/tmp | ||
138 | 10 | DEB_PYTHON_INSTALL_ARGS_ALL := --no-compile --install-layout=deb | ||
139 | 11 | |||
140 | 12 | clean:: | ||
141 | 13 | -find . -name \*.mo -exec rm {} \; | ||
142 | 14 | 0 | ||
143 | === removed file 'debian/ubuntu-desktop-tests.install' | |||
144 | --- debian/ubuntu-desktop-tests.install 2008-10-20 23:27:39 +0000 | |||
145 | +++ debian/ubuntu-desktop-tests.install 1970-01-01 00:00:00 +0000 | |||
146 | @@ -1,2 +0,0 @@ | |||
147 | 1 | usr/bin/ubuntu-desktop-test | ||
148 | 2 | usr/share/ubuntu-desktop-tests/* | ||
149 | 3 | 0 | ||
150 | === modified file 'report.xsl' | |||
151 | --- report.xsl 2009-03-30 14:49:24 +0000 | |||
152 | +++ report.xsl 2009-06-09 15:22:50 +0000 | |||
153 | @@ -4,7 +4,7 @@ | |||
154 | 4 | <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> | 4 | <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> |
155 | 5 | <head> | 5 | <head> |
156 | 6 | <title> | 6 | <title> |
158 | 7 | Ubuntu LDTP Tests Report | 7 | Mago Tests Report |
159 | 8 | </title> | 8 | </title> |
160 | 9 | <!-- Launchpad style sheet --> | 9 | <!-- Launchpad style sheet --> |
161 | 10 | <style type="text/css" media="screen, print">@import url(https://edge.launchpad.net/+icing/rev7667/+style-slimmer.css);</style> | 10 | <style type="text/css" media="screen, print">@import url(https://edge.launchpad.net/+icing/rev7667/+style-slimmer.css);</style> |
162 | @@ -93,10 +93,10 @@ | |||
163 | 93 | <p> | 93 | <p> |
164 | 94 | <br/> | 94 | <br/> |
165 | 95 | </p> | 95 | </p> |
167 | 96 | <h1>Ubuntu LDTP Tests Report</h1> | 96 | <h1>Mago Tests Report</h1> |
168 | 97 | <p> | 97 | <p> |
171 | 98 | This are the results from a run of Ubuntu Desktop Tests. <br/> | 98 | This are the results from a run of Mago Desktop Tests. <br/> |
172 | 99 | If you find false positives, please, report bugs against <a href="https://launchpad.net/ubuntu-desktop-testing/+filebug">ubuntu-desktop-testing</a> project. | 99 | If you find false positives, please, report bugs against <a href="https://launchpad.net/mago/+filebug">Mago</a> project. |
173 | 100 | </p> | 100 | </p> |
174 | 101 | <h2><b>Suite: <xsl:value-of select="suite/@name" /></b> (Class: <xsl:value-of select="suite/class" />)</h2> | 101 | <h2><b>Suite: <xsl:value-of select="suite/@name" /></b> (Class: <xsl:value-of select="suite/class" />)</h2> |
175 | 102 | <h2>Description: <xsl:value-of select="suite/description" /></h2> | 102 | <h2>Description: <xsl:value-of select="suite/description" /></h2> |
176 | 103 | 103 | ||
177 | === modified file 'setup.py' | |||
178 | --- setup.py 2009-05-26 15:13:02 +0000 | |||
179 | +++ setup.py 2009-06-09 15:22:50 +0000 | |||
180 | @@ -83,34 +83,34 @@ | |||
181 | 83 | infile = os.path.join("bin", os.path.basename(outfile)) | 83 | infile = os.path.join("bin", os.path.basename(outfile)) |
182 | 84 | substitute_variables(infile, outfile, { | 84 | substitute_variables(infile, outfile, { |
183 | 85 | 'TESTS_SHARE = "."': | 85 | 'TESTS_SHARE = "."': |
185 | 86 | 'TESTS_SHARE = "/usr/share/ubuntu-desktop-tests"'}) | 86 | 'TESTS_SHARE = "/usr/share/mago"'}) |
186 | 87 | 87 | ||
187 | 88 | 88 | ||
188 | 89 | setup( | 89 | setup( |
190 | 90 | name = "ubuntu-desktop-testing", | 90 | name = "mago", |
191 | 91 | version = changelog_version(), | 91 | version = changelog_version(), |
192 | 92 | author = "Ara Pulido", | 92 | author = "Ara Pulido", |
193 | 93 | author_email = "ara.pulido@canonical.com", | 93 | author_email = "ara.pulido@canonical.com", |
194 | 94 | license = "LGPL", | 94 | license = "LGPL", |
196 | 95 | description = "Ubuntu Desktop Testing", | 95 | description = "Mago", |
197 | 96 | long_description = """ | 96 | long_description = """ |
198 | 97 | This project provides a library and scripts for desktop testing. | 97 | This project provides a library and scripts for desktop testing. |
199 | 98 | """, | 98 | """, |
200 | 99 | data_files = [ | 99 | data_files = [ |
215 | 100 | ("share/ubuntu-desktop-tests", ["report.xsl", "conffile.ini"]), | 100 | ("share/mago", ["report.xsl", "conffile.ini"]), |
216 | 101 | ("share/ubuntu-desktop-tests/gedit", ["gedit/*.*"]), | 101 | ("share/mago/gedit", ["gedit/*.*"]), |
217 | 102 | ("share/ubuntu-desktop-tests/gedit/data", ["gedit/data/*"]), | 102 | ("share/mago/gedit/data", ["gedit/data/*"]), |
218 | 103 | ("share/ubuntu-desktop-tests/notify-osd", ["notify-osd/*.*"]), | 103 | ("share/mago/notify-osd", ["notify-osd/*.*"]), |
219 | 104 | ("share/ubuntu-desktop-tests/notify-osd/data", ["notify-osd/data/*"]), | 104 | ("share/mago/notify-osd/data", ["notify-osd/data/*"]), |
220 | 105 | ("share/ubuntu-desktop-tests/indicator-applet", ["indicator-applet/*.*"]), | 105 | ("share/mago/indicator-applet", ["indicator-applet/*.*"]), |
221 | 106 | ("share/ubuntu-desktop-tests/indicator-applet/data", ["indicator-applet/data/*"]), | 106 | ("share/mago/indicator-applet/data", ["indicator-applet/data/*"]), |
222 | 107 | ("share/ubuntu-desktop-tests/gnome-panel", ["gnome-panel/*.*"]), | 107 | ("share/mago/gnome-panel", ["gnome-panel/*.*"]), |
223 | 108 | ("share/ubuntu-desktop-tests/gnome-panel/data", ["gnome-panel/data/*"]), | 108 | ("share/mago/gnome-panel/data", ["gnome-panel/data/*"]), |
224 | 109 | ("share/ubuntu-desktop-tests/update-manager", ["update-manager/*.*"]), | 109 | ("share/mago/update-manager", ["update-manager/*.*"]), |
225 | 110 | ("share/ubuntu-desktop-tests/update-manager/data", ["update-manager/data/*"]), | 110 | ("share/mago/update-manager/data", ["update-manager/data/*"]), |
226 | 111 | ("share/ubuntu-desktop-tests/seahorse", ["seahorse/*.*"]), | 111 | ("share/mago/seahorse", ["seahorse/*.*"]), |
227 | 112 | ("share/ubuntu-desktop-tests/seahorse/data", ["seahorse/data/*"])], | 112 | ("share/mago/seahorse/data", ["seahorse/data/*"])], |
228 | 113 | scripts = ["bin/ubuntu-desktop-test"], | 113 | scripts = ["bin/mago"], |
229 | 114 | packages = ["desktoptesting", | 114 | packages = ["desktoptesting", |
230 | 115 | "desktoptesting.application", | 115 | "desktoptesting.application", |
231 | 116 | "desktoptesting.test_suite"], | 116 | "desktoptesting.test_suite"], |
These are minor changes to be able to announce the new project name to the mailing list.
This is not related to the changes of dry_run and/or test_discovery.
This is just a quick name fix so we can expose this publicly as soon as possible.