Glance

Merge lp:~soren/glance/move-tests-under-glance into lp:~hudson-openstack/glance/trunk

  1. move-tests-under-glance
  2. Merge into trunk
Proposed by Soren Hansen
Status: Merged
Approved by: Brian Waldon
Approved revision: 177
Merged at revision: 178
Proposed branch: lp:~soren/glance/move-tests-under-glance
Merge into: lp:~hudson-openstack/glance/trunk
Diff against target: 210 lines (+21/-24)
15 files modified
MANIFEST.in (+0/-3)
glance/tests/functional/__init__.py (+1/-1)
glance/tests/functional/test_bin_glance.py (+2/-2)
glance/tests/functional/test_curl_api.py (+2/-2)
glance/tests/functional/test_httplib2_api.py (+2/-2)
glance/tests/functional/test_logging.py (+2/-2)
glance/tests/functional/test_misc.py (+2/-2)
glance/tests/functional/test_s3.py (+2/-2)
glance/tests/functional/test_scrubber.py (+2/-2)
glance/tests/unit/test_api.py (+1/-1)
glance/tests/unit/test_clients.py (+1/-1)
glance/tests/unit/test_filesystem_store.py (+1/-1)
glance/tests/unit/test_migrations.py (+1/-1)
run_tests.sh (+1/-1)
setup.py (+1/-1)
To merge this branch: bzr merge lp:~soren/glance/move-tests-under-glance
Reviewer Review Type Date Requested Status
Brian Waldon (community) Approve
Jay Pipes (community) Approve
Review via email: mp+70228@code.launchpad.net

Description of the change

Make tests a package under glance.

To post a comment you must log in.
Revision history for this message
Jay Pipes (jaypipes) wrote :

lgtm. this actually gets us inline with nova and keystone, too.

All tests passing: https://jenkins.openstack.org/view/Glance/job/glance-param/18/console

review: Approve
Revision history for this message
Brian Waldon (bcwaldon) wrote :

Good move.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MANIFEST.in'
2--- MANIFEST.in 2011-04-11 20:21:06 +0000
3+++ MANIFEST.in 2011-08-02 22:12:38 +0000
4@@ -1,9 +1,6 @@
5 include run_tests.sh ChangeLog
6 include README builddeb.sh
7 include MANIFEST.in pylintrc
8-include tests/__init__.py
9-include tests/stubs.py
10-include tests/utils.py
11 include run_tests.py
12 include glance/registry/db/migrate_repo/migrate.cfg
13 include glance/registry/db/migrate_repo/versions/*.sql
14
15=== renamed directory 'tests' => 'glance/tests'
16=== modified file 'glance/tests/functional/__init__.py'
17--- tests/functional/__init__.py 2011-07-25 17:45:35 +0000
18+++ glance/tests/functional/__init__.py 2011-08-02 22:12:38 +0000
19@@ -35,7 +35,7 @@
20 import unittest
21 import urlparse
22
23-from tests.utils import execute, get_unused_port
24+from glance.tests.utils import execute, get_unused_port
25
26 from sqlalchemy import create_engine
27
28
29=== modified file 'glance/tests/functional/test_bin_glance.py'
30--- tests/functional/test_bin_glance.py 2011-08-02 00:23:06 +0000
31+++ glance/tests/functional/test_bin_glance.py 2011-08-02 22:12:38 +0000
32@@ -21,8 +21,8 @@
33 import tempfile
34 import unittest
35
36-from tests import functional
37-from tests.utils import execute
38+from glance.tests import functional
39+from glance.tests.utils import execute
40
41
42 class TestBinGlance(functional.FunctionalTest):
43
44=== modified file 'glance/tests/functional/test_curl_api.py'
45--- tests/functional/test_curl_api.py 2011-07-19 03:04:00 +0000
46+++ glance/tests/functional/test_curl_api.py 2011-08-02 22:12:38 +0000
47@@ -22,8 +22,8 @@
48 import tempfile
49 import unittest
50
51-from tests import functional
52-from tests.utils import execute
53+from glance.tests import functional
54+from glance.tests.utils import execute
55
56 FIVE_KB = 5 * 1024
57 FIVE_GB = 5 * 1024 * 1024 * 1024
58
59=== modified file 'glance/tests/functional/test_httplib2_api.py'
60--- tests/functional/test_httplib2_api.py 2011-08-01 23:42:50 +0000
61+++ glance/tests/functional/test_httplib2_api.py 2011-08-02 22:12:38 +0000
62@@ -23,8 +23,8 @@
63 import os
64 import tempfile
65
66-from tests import functional
67-from tests.utils import execute
68+from glance.tests import functional
69+from glance.tests.utils import execute
70
71 FIVE_KB = 5 * 1024
72 FIVE_GB = 5 * 1024 * 1024 * 1024
73
74=== modified file 'glance/tests/functional/test_logging.py'
75--- tests/functional/test_logging.py 2011-06-28 14:37:31 +0000
76+++ glance/tests/functional/test_logging.py 2011-08-02 22:12:38 +0000
77@@ -20,8 +20,8 @@
78 import os
79 import unittest
80
81-from tests import functional
82-from tests.utils import execute
83+from glance.tests import functional
84+from glance.tests.utils import execute
85
86
87 class TestLogging(functional.FunctionalTest):
88
89=== modified file 'glance/tests/functional/test_misc.py'
90--- tests/functional/test_misc.py 2011-06-28 14:37:31 +0000
91+++ glance/tests/functional/test_misc.py 2011-08-02 22:12:38 +0000
92@@ -17,8 +17,8 @@
93
94 import unittest
95
96-from tests import functional
97-from tests.utils import execute
98+from glance.tests import functional
99+from glance.tests.utils import execute
100
101
102 class TestMiscellaneous(functional.FunctionalTest):
103
104=== modified file 'glance/tests/functional/test_s3.py'
105--- tests/functional/test_s3.py 2011-07-29 18:45:36 +0000
106+++ glance/tests/functional/test_s3.py 2011-08-02 22:12:38 +0000
107@@ -36,8 +36,8 @@
108 import tempfile
109 import unittest
110
111-from tests import functional
112-from tests.utils import execute
113+from glance.tests import functional
114+from glance.tests.utils import execute
115
116 FIVE_KB = 5 * 1024
117 FIVE_GB = 5 * 1024 * 1024 * 1024
118
119=== modified file 'glance/tests/functional/test_scrubber.py'
120--- tests/functional/test_scrubber.py 2011-08-01 18:24:25 +0000
121+++ glance/tests/functional/test_scrubber.py 2011-08-02 22:12:38 +0000
122@@ -21,8 +21,8 @@
123
124 from sqlalchemy import create_engine
125
126-from tests import functional
127-from tests.utils import execute
128+from glance.tests import functional
129+from glance.tests.utils import execute
130
131 from glance import client
132
133
134=== modified file 'glance/tests/unit/test_api.py'
135--- tests/unit/test_api.py 2011-07-21 16:40:20 +0000
136+++ glance/tests/unit/test_api.py 2011-08-02 22:12:38 +0000
137@@ -29,7 +29,7 @@
138 from glance.common import context
139 from glance.registry import server as rserver
140 import glance.registry.db.api
141-from tests import stubs
142+from glance.tests import stubs
143
144 VERBOSE = False
145 DEBUG = False
146
147=== modified file 'glance/tests/unit/test_clients.py'
148--- tests/unit/test_clients.py 2011-07-26 10:11:38 +0000
149+++ glance/tests/unit/test_clients.py 2011-08-02 22:12:38 +0000
150@@ -28,7 +28,7 @@
151 from glance.common import exception
152 import glance.registry.db.api
153 from glance.registry import client as rclient
154-from tests import stubs
155+from glance.tests import stubs
156
157
158 class TestBadClients(unittest.TestCase):
159
160=== modified file 'glance/tests/unit/test_filesystem_store.py'
161--- tests/unit/test_filesystem_store.py 2011-08-01 18:24:25 +0000
162+++ glance/tests/unit/test_filesystem_store.py 2011-08-02 22:12:38 +0000
163@@ -26,7 +26,7 @@
164 from glance.common import exception
165 from glance.store.location import get_location_from_uri
166 from glance.store.filesystem import Store, ChunkedFile
167-from tests import stubs
168+from glance.tests import stubs
169
170 FILESYSTEM_OPTIONS = {
171 'verbose': True,
172
173=== modified file 'glance/tests/unit/test_migrations.py'
174--- tests/unit/test_migrations.py 2011-03-24 23:03:17 +0000
175+++ glance/tests/unit/test_migrations.py 2011-08-02 22:12:38 +0000
176@@ -36,7 +36,7 @@
177
178 from glance.common import exception
179 import glance.registry.db.migration as migration_api
180-from tests.utils import execute
181+from glance.tests.utils import execute
182
183
184 class TestMigrations(unittest.TestCase):
185
186=== modified file 'run_tests.sh'
187--- run_tests.sh 2011-07-30 05:12:44 +0000
188+++ run_tests.sh 2011-08-02 22:12:38 +0000
189@@ -58,7 +58,7 @@
190 #
191 PEP8_EXCLUDE=vcsversion.py
192 PEP8_OPTIONS="--exclude=$PEP8_EXCLUDE --repeat --show-pep8 --show-source"
193- PEP8_INCLUDE="bin/* glance tests tools setup.py run_tests.py"
194+ PEP8_INCLUDE="bin/* glance tools setup.py run_tests.py"
195 pep8 $PEP8_OPTIONS $PEP8_INCLUDE
196 }
197
198
199=== modified file 'setup.py'
200--- setup.py 2011-07-27 12:56:08 +0000
201+++ setup.py 2011-08-02 22:12:38 +0000
202@@ -74,7 +74,7 @@
203 author='OpenStack',
204 author_email='openstack@lists.launchpad.net',
205 url='http://glance.openstack.org/',
206- packages=find_packages(exclude=['tests', 'bin']),
207+ packages=find_packages(exclude=['bin']),
208 test_suite='nose.collector',
209 cmdclass=cmdclass,
210 include_package_data=True,

Subscribers

People subscribed via source and target branches