Merge lp:~cjohnston/ubuntu-ci-services-itself/fix-flake8-issues into lp:ubuntu-ci-services-itself
- fix-flake8-issues
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Chris Johnston |
Approved revision: | 235 |
Merged at revision: | 236 |
Proposed branch: | lp:~cjohnston/ubuntu-ci-services-itself/fix-flake8-issues |
Merge into: | lp:ubuntu-ci-services-itself |
Diff against target: |
351 lines (+35/-49) 15 files modified
branch-source-builder/run_worker (+1/-0) branch-source-builder/upload_package.py (+3/-4) branch-source-builder/watch_ppa.py (+1/-1) charms/precise/webui/hooks/hooks.py (+0/-1) ci-utils/ci_utils/nova_client/__init__.py (+14/-22) ci-utils/ci_utils/tests/test_jenkins.py (+0/-2) ci-utils/ci_utils/tests/test_tmpdir.py (+1/-1) juju-deployer/test_update.py (+2/-2) juju-deployer/update.py (+3/-3) lander/bin/lander_archiver.py (+0/-1) ppa-assigner/ppa_assigner/management/commands/integration_test.py (+4/-3) run-tests (+2/-2) test_runner/tstrun/testbed.py (+0/-2) test_runner/tstrun/tests/test_data_store.py (+0/-1) tests/data_store/test.py (+4/-4) |
To merge this branch: | bzr merge lp:~cjohnston/ubuntu-ci-services-itself/fix-flake8-issues |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Vincent Ladeuil (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email:
|
Commit message
Fix misc flake8 issues around the project
Description of the change
We should adhere to pep8
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:235
http://
Executed test runs:
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ursula Junque (ursinha) wrote : | # |
The changes look good (can't disagree with flake8 cleanup :)). I see that all cupstream2distro reused code needs pep8 love, so might be too much for this branch, but I found three worth fixing in this branch:
branch-
ci-utils/
cli/tests/
Other than that that's great.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Vincent Ladeuil (vila) wrote : | # |
> We should adhere to pep8
+1
Yet, it's not good if it's not automatic. It's on my TODO list as part of our test story but not at the top yet (ucitests provides a base class that can be used for that but does not work (yet) on precise).
...
Now that I think about it, I should just skip that on precise, I don't think there are a lot of us developing on precise ... will make a MP later.
...
In fact, I already did almost all that is needed in ucitests-0.0.8, so less work than I think.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Chris Johnston (cjohnston) wrote : | # |
On Thu, Feb 13, 2014 at 11:00 AM, Ursula Junque <email address hidden> wrote:
> The changes look good (can't disagree with flake8 cleanup :)). I see that
> all cupstream2distro reused code needs pep8 love, so might be too much for
> this branch, but I found three worth fixing in this branch:
>
Since cupstream2distro was a direct copy and paste, I disagree with making
changes to it. If we want to fix them, I think they should be fixed
upstream first and then brought to us, otherwise making changes across both
will become more difficult. I also didn't even look at any of the charms
other than webui for that same reason.
>
> branch-
> ci-utils/
> is assigned to but never used
> cli/tests/
>
>
cli was fixed in a previous MP. UPLOAD_LIST and id I was going to talk to
the developers about. UPLOAD_LIST looks like there is part of a story
missing.
> Other than that that's great.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ursula Junque (ursinha) wrote : | # |
> On Thu, Feb 13, 2014 at 11:00 AM, Ursula Junque <email address hidden> wrote:
>
> > The changes look good (can't disagree with flake8 cleanup :)). I see that
> > all cupstream2distro reused code needs pep8 love, so might be too much for
> > this branch, but I found three worth fixing in this branch:
> >
>
> Since cupstream2distro was a direct copy and paste, I disagree with making
> changes to it. If we want to fix them, I think they should be fixed
> upstream first and then brought to us, otherwise making changes across both
> will become more difficult. I also didn't even look at any of the charms
> other than webui for that same reason.
I'm not sure they're only copy&paste, from fginther's MP it seems the code was copied and adapted, so it's unclear we're bringing upstream changes to our code. But that's a separate thing, I think, as it needs further discussion.
>
>
> >
> > branch-
> > ci-utils/
> > is assigned to but never used
> > cli/tests/
> >
> >
> cli was fixed in a previous MP. UPLOAD_LIST and id I was going to talk to
> the developers about. UPLOAD_LIST looks like there is part of a story
> missing.
>
>
> > Other than that that's great.
Preview Diff
1 | === modified file 'branch-source-builder/run_worker' | |||
2 | --- branch-source-builder/run_worker 2014-02-11 20:57:36 +0000 | |||
3 | +++ branch-source-builder/run_worker 2014-02-12 21:16:08 +0000 | |||
4 | @@ -32,6 +32,7 @@ | |||
5 | 32 | from ci_utils import amqp_utils | 32 | from ci_utils import amqp_utils |
6 | 33 | TIME_BETWEEN_CHECKS = 60 | 33 | TIME_BETWEEN_CHECKS = 60 |
7 | 34 | 34 | ||
8 | 35 | |||
9 | 35 | def on_message(msg): | 36 | def on_message(msg): |
10 | 36 | log.info('on_message: {}'.format(msg.body)) | 37 | log.info('on_message: {}'.format(msg.body)) |
11 | 37 | params = json.loads(msg.body) | 38 | params = json.loads(msg.body) |
12 | 38 | 39 | ||
13 | === modified file 'branch-source-builder/upload_package.py' | |||
14 | --- branch-source-builder/upload_package.py 2014-02-07 17:32:37 +0000 | |||
15 | +++ branch-source-builder/upload_package.py 2014-02-12 21:16:08 +0000 | |||
16 | @@ -17,7 +17,6 @@ | |||
17 | 17 | import argparse | 17 | import argparse |
18 | 18 | import atexit | 18 | import atexit |
19 | 19 | from dput.changes import parse_changes_file | 19 | from dput.changes import parse_changes_file |
20 | 20 | import json | ||
21 | 21 | import logging | 20 | import logging |
22 | 22 | import os | 21 | import os |
23 | 23 | import re | 22 | import re |
24 | @@ -43,9 +42,9 @@ | |||
25 | 43 | 42 | ||
26 | 44 | 43 | ||
27 | 45 | def cleanup(directory): | 44 | def cleanup(directory): |
31 | 46 | if os.path.exists(directory) and os.path.isdir(directory): | 45 | if os.path.exists(directory) and os.path.isdir(directory): |
32 | 47 | logging.info('Removing temp directory: {}'.format(directory)) | 46 | logging.info('Removing temp directory: {}'.format(directory)) |
33 | 48 | shutil.rmtree(directory) | 47 | shutil.rmtree(directory) |
34 | 49 | 48 | ||
35 | 50 | 49 | ||
36 | 51 | def create_temp_dir(): | 50 | def create_temp_dir(): |
37 | 52 | 51 | ||
38 | === modified file 'branch-source-builder/watch_ppa.py' | |||
39 | --- branch-source-builder/watch_ppa.py 2014-02-07 17:32:37 +0000 | |||
40 | +++ branch-source-builder/watch_ppa.py 2014-02-12 21:16:08 +0000 | |||
41 | @@ -80,7 +80,7 @@ | |||
42 | 80 | # Get archs available and archs to ignore | 80 | # Get archs available and archs to ignore |
43 | 81 | (available_archs_in_ppa, | 81 | (available_archs_in_ppa, |
44 | 82 | arch_all_arch) = launchpadmanager.get_available_and_all_archs( | 82 | arch_all_arch) = launchpadmanager.get_available_and_all_archs( |
46 | 83 | lp_series, monitored_ppa) | 83 | lp_series, monitored_ppa) |
47 | 84 | (archs_to_eventually_ignore, | 84 | (archs_to_eventually_ignore, |
48 | 85 | archs_to_unconditionally_ignore) = launchpadmanager.get_ignored_archs() | 85 | archs_to_unconditionally_ignore) = launchpadmanager.get_ignored_archs() |
49 | 86 | logging.info('Arches available in ppa: {}'.format(available_archs_in_ppa)) | 86 | logging.info('Arches available in ppa: {}'.format(available_archs_in_ppa)) |
50 | 87 | 87 | ||
51 | === modified file 'charms/precise/webui/hooks/hooks.py' | |||
52 | --- charms/precise/webui/hooks/hooks.py 2014-01-27 21:44:48 +0000 | |||
53 | +++ charms/precise/webui/hooks/hooks.py 2014-02-12 21:16:08 +0000 | |||
54 | @@ -2,7 +2,6 @@ | |||
55 | 2 | 2 | ||
56 | 3 | import distutils.dir_util | 3 | import distutils.dir_util |
57 | 4 | import grp | 4 | import grp |
58 | 5 | import json | ||
59 | 6 | import os | 5 | import os |
60 | 7 | import pwd | 6 | import pwd |
61 | 8 | import re | 7 | import re |
62 | 9 | 8 | ||
63 | === modified file 'ci-utils/ci_utils/nova_client/__init__.py' | |||
64 | --- ci-utils/ci_utils/nova_client/__init__.py 2014-01-29 23:01:46 +0000 | |||
65 | +++ ci-utils/ci_utils/nova_client/__init__.py 2014-02-12 21:16:08 +0000 | |||
66 | @@ -38,19 +38,18 @@ | |||
67 | 38 | self.nova = novaclient.Client(**creds) | 38 | self.nova = novaclient.Client(**creds) |
68 | 39 | image = self.nova.images.find(name=imagename) | 39 | image = self.nova.images.find(name=imagename) |
69 | 40 | inst_flavor = self.nova.flavors.find(name=flavor) | 40 | inst_flavor = self.nova.flavors.find(name=flavor) |
71 | 41 | SSH_KEYNAME=os.path.expanduser('~/.ssh/id_rsa') | 41 | SSH_KEYNAME = os.path.expanduser('~/.ssh/id_rsa') |
72 | 42 | if not os.path.exists(SSH_KEYNAME): | 42 | if not os.path.exists(SSH_KEYNAME): |
73 | 43 | subprocess.call( | 43 | subprocess.call( |
75 | 44 | ['ssh-keygen','-t','rsa','-f',SSH_KEYNAME,'-N','']) | 44 | ['ssh-keygen', '-t', 'rsa', '-f', SSH_KEYNAME, '-N', '']) |
76 | 45 | if not self.nova.keypairs.findall(name="sshkey"): | 45 | if not self.nova.keypairs.findall(name="sshkey"): |
77 | 46 | with open(SSH_KEYNAME+'.pub') as sshkey: | 46 | with open(SSH_KEYNAME+'.pub') as sshkey: |
79 | 47 | self.key=self.nova.keypairs.create( | 47 | self.key = self.nova.keypairs.create( |
80 | 48 | name="sshkey", public_key=sshkey.read()) | 48 | name="sshkey", public_key=sshkey.read()) |
82 | 49 | self.instance=self.nova.servers.create( | 49 | self.instance = self.nova.servers.create( |
83 | 50 | name="test", image=image, flavor=inst_flavor, key_name="sshkey") | 50 | name="test", image=image, flavor=inst_flavor, key_name="sshkey") |
84 | 51 | self.ip = self._get_ip() | 51 | self.ip = self._get_ip() |
85 | 52 | 52 | ||
86 | 53 | |||
87 | 54 | def _wait_for_instance(self): | 53 | def _wait_for_instance(self): |
88 | 55 | status = self.instance.status | 54 | status = self.instance.status |
89 | 56 | #Try for up to 5 minutes to create the instance | 55 | #Try for up to 5 minutes to create the instance |
90 | @@ -63,19 +62,17 @@ | |||
91 | 63 | if status == 'BUILD': | 62 | if status == 'BUILD': |
92 | 64 | raise NovaClientException("Instance creation timed out") | 63 | raise NovaClientException("Instance creation timed out") |
93 | 65 | 64 | ||
94 | 66 | |||
95 | 67 | def _refresh_instance(self): | 65 | def _refresh_instance(self): |
97 | 68 | id=self.instance.id | 66 | id = self.instance.id |
98 | 69 | try: | 67 | try: |
99 | 70 | #You have to re-get the instance for it to update | 68 | #You have to re-get the instance for it to update |
100 | 71 | self.instance = self.nova.servers.get(id) | 69 | self.instance = self.nova.servers.get(id) |
101 | 72 | except ConnectionError: | 70 | except ConnectionError: |
102 | 73 | log.warn("Received connection error, retrying") | 71 | log.warn("Received connection error, retrying") |
103 | 74 | 72 | ||
104 | 75 | |||
105 | 76 | def _get_ip(self): | 73 | def _get_ip(self): |
106 | 77 | timeout = time.time()+300 | 74 | timeout = time.time()+300 |
108 | 78 | id=self.instance.id | 75 | id = self.instance.id |
109 | 79 | ip = None | 76 | ip = None |
110 | 80 | while not ip and time.time() < timeout: | 77 | while not ip and time.time() < timeout: |
111 | 81 | try: | 78 | try: |
112 | @@ -83,7 +80,7 @@ | |||
113 | 83 | self._refresh_instance() | 80 | self._refresh_instance() |
114 | 84 | #The value first instance in networks should contain the | 81 | #The value first instance in networks should contain the |
115 | 85 | #value we need | 82 | #value we need |
117 | 86 | ip=self.instance.networks.values()[0][0] | 83 | ip = self.instance.networks.values()[0][0] |
118 | 87 | except IndexError: | 84 | except IndexError: |
119 | 88 | log.info("Waiting for IP to become available") | 85 | log.info("Waiting for IP to become available") |
120 | 89 | time.sleep(5) | 86 | time.sleep(5) |
121 | @@ -92,36 +89,31 @@ | |||
122 | 92 | log.info("IP is %s" % ip) | 89 | log.info("IP is %s" % ip) |
123 | 93 | return ip | 90 | return ip |
124 | 94 | 91 | ||
125 | 95 | |||
126 | 96 | def runcmd(self, cmd): | 92 | def runcmd(self, cmd): |
128 | 97 | sshopts = ['-o','UserKnownHostsFile=/dev/null','-o ', | 93 | sshopts = ['-o', 'UserKnownHostsFile=/dev/null', '-o ', |
129 | 98 | 'StrictHostKeyChecking=no'] | 94 | 'StrictHostKeyChecking=no'] |
130 | 99 | cmd = ['ssh'] + ['ubuntu@'+self.ip] + sshopts + cmd.split(' ') | 95 | cmd = ['ssh'] + ['ubuntu@'+self.ip] + sshopts + cmd.split(' ') |
131 | 100 | return subprocess.check_output(cmd) | 96 | return subprocess.check_output(cmd) |
132 | 101 | 97 | ||
133 | 102 | |||
134 | 103 | def scp(self, src, dest, recurse=False): | 98 | def scp(self, src, dest, recurse=False): |
136 | 104 | sshopts = ['-o','UserKnownHostsFile=/dev/null','-o ', | 99 | sshopts = ['-o', 'UserKnownHostsFile=/dev/null', '-o ', |
137 | 105 | 'StrictHostKeyChecking=no'] | 100 | 'StrictHostKeyChecking=no'] |
138 | 106 | if recurse: | 101 | if recurse: |
139 | 107 | sshopts.append['-r'] | 102 | sshopts.append['-r'] |
142 | 108 | cmd = ['scp'] + ['ubuntu@'+self.ip] + sshopts + [src, dest] | 103 | ['scp'] + ['ubuntu@'+self.ip] + sshopts + [src, dest] |
141 | 109 | |||
143 | 110 | 104 | ||
144 | 111 | def delete(self): | 105 | def delete(self): |
145 | 112 | self.instance.delete() | 106 | self.instance.delete() |
146 | 113 | 107 | ||
147 | 114 | |||
148 | 115 | def _get_nova_creds(self, config): | 108 | def _get_nova_creds(self, config): |
149 | 116 | try: | 109 | try: |
150 | 117 | creds = {'auth_url': config['auth_url'], | 110 | creds = {'auth_url': config['auth_url'], |
155 | 118 | 'username': config['auth_user'], | 111 | 'username': config['auth_user'], |
156 | 119 | 'api_key': config['auth_password'], | 112 | 'api_key': config['auth_password'], |
157 | 120 | 'project_id': config['auth_tenant_name'], | 113 | 'project_id': config['auth_tenant_name'], |
158 | 121 | 'region_name': config['auth_region']} | 114 | 'region_name': config['auth_region']} |
159 | 122 | except KeyError: | 115 | except KeyError: |
160 | 123 | raise self.NovaClientException( | 116 | raise self.NovaClientException( |
161 | 124 | "Missing or invalid authentication info." | 117 | "Missing or invalid authentication info." |
162 | 125 | ) | 118 | ) |
163 | 126 | return creds | 119 | return creds |
164 | 127 | |||
165 | 128 | 120 | ||
166 | === modified file 'ci-utils/ci_utils/tests/test_jenkins.py' | |||
167 | --- ci-utils/ci_utils/tests/test_jenkins.py 2014-02-07 22:09:36 +0000 | |||
168 | +++ ci-utils/ci_utils/tests/test_jenkins.py 2014-02-12 21:16:08 +0000 | |||
169 | @@ -15,8 +15,6 @@ | |||
170 | 15 | 15 | ||
171 | 16 | import json | 16 | import json |
172 | 17 | import mock | 17 | import mock |
173 | 18 | import os | ||
174 | 19 | import sys | ||
175 | 20 | import unittest | 18 | import unittest |
176 | 21 | 19 | ||
177 | 22 | from ci_utils import jenkins_utils | 20 | from ci_utils import jenkins_utils |
178 | 23 | 21 | ||
179 | === modified file 'ci-utils/ci_utils/tests/test_tmpdir.py' | |||
180 | --- ci-utils/ci_utils/tests/test_tmpdir.py 2014-01-10 16:47:39 +0000 | |||
181 | +++ ci-utils/ci_utils/tests/test_tmpdir.py 2014-02-12 21:16:08 +0000 | |||
182 | @@ -22,6 +22,6 @@ | |||
183 | 22 | class TestTmpDir(unittest.TestCase): | 22 | class TestTmpDir(unittest.TestCase): |
184 | 23 | def test_tmpdir(self): | 23 | def test_tmpdir(self): |
185 | 24 | with TmpDir() as tmpdir: | 24 | with TmpDir() as tmpdir: |
187 | 25 | dir_created=tmpdir | 25 | dir_created = tmpdir |
188 | 26 | self.assertTrue(os.path.exists(dir_created)) | 26 | self.assertTrue(os.path.exists(dir_created)) |
189 | 27 | self.assertFalse(os.path.exists(dir_created)) | 27 | self.assertFalse(os.path.exists(dir_created)) |
190 | 28 | 28 | ||
191 | === modified file 'juju-deployer/test_update.py' | |||
192 | --- juju-deployer/test_update.py 2014-02-04 15:58:00 +0000 | |||
193 | +++ juju-deployer/test_update.py 2014-02-12 21:16:08 +0000 | |||
194 | @@ -132,7 +132,7 @@ | |||
195 | 132 | def test_get_branches_and_revnos(self): | 132 | def test_get_branches_and_revnos(self): |
196 | 133 | branch_url = self.get_branch_url() | 133 | branch_url = self.get_branch_url() |
197 | 134 | current = self.branch.revno() | 134 | current = self.branch.revno() |
199 | 135 | y = self.get_service_yaml(current -1) | 135 | y = self.get_service_yaml(current - 1) |
200 | 136 | path = os.path.join(self.temp_dir, 'foo.yaml') | 136 | path = os.path.join(self.temp_dir, 'foo.yaml') |
201 | 137 | with open(path, 'w') as fp: | 137 | with open(path, 'w') as fp: |
202 | 138 | fp.write(yaml.safe_dump(y)) | 138 | fp.write(yaml.safe_dump(y)) |
203 | @@ -141,7 +141,7 @@ | |||
204 | 141 | actual = update.get_branches_and_revnos( | 141 | actual = update.get_branches_and_revnos( |
205 | 142 | [path], True) | 142 | [path], True) |
206 | 143 | msg = '{} is out of date (currently {}, latest {})' | 143 | msg = '{} is out of date (currently {}, latest {})' |
208 | 144 | msg = msg.format(branch_url, current -1, current) | 144 | msg = msg.format(branch_url, current - 1, current) |
209 | 145 | warn.assert_called_with(msg) | 145 | warn.assert_called_with(msg) |
210 | 146 | self.assertEqual(actual, {branch_url: current}) | 146 | self.assertEqual(actual, {branch_url: current}) |
211 | 147 | 147 | ||
212 | 148 | 148 | ||
213 | === modified file 'juju-deployer/update.py' | |||
214 | --- juju-deployer/update.py 2014-02-04 15:58:00 +0000 | |||
215 | +++ juju-deployer/update.py 2014-02-12 21:16:08 +0000 | |||
216 | @@ -43,7 +43,6 @@ | |||
217 | 43 | plugin.load_plugins() | 43 | plugin.load_plugins() |
218 | 44 | 44 | ||
219 | 45 | 45 | ||
220 | 46 | |||
221 | 47 | class UpdateArgParser(argparse.ArgumentParser): | 46 | class UpdateArgParser(argparse.ArgumentParser): |
222 | 48 | """A parser for the uci-run-tests script.""" | 47 | """A parser for the uci-run-tests script.""" |
223 | 49 | 48 | ||
224 | @@ -140,7 +139,7 @@ | |||
225 | 140 | 139 | ||
226 | 141 | def set_branches_and_revnos(paths, branches): | 140 | def set_branches_and_revnos(paths, branches): |
227 | 142 | """Update the yaml files with the new revnos. | 141 | """Update the yaml files with the new revnos. |
229 | 143 | 142 | ||
230 | 144 | We cannot use pyyaml for this, as it doesn't preserve order or preserve | 143 | We cannot use pyyaml for this, as it doesn't preserve order or preserve |
231 | 145 | comments. | 144 | comments. |
232 | 146 | """ | 145 | """ |
233 | @@ -163,6 +162,7 @@ | |||
234 | 163 | with open(cfg, 'w') as fp: | 162 | with open(cfg, 'w') as fp: |
235 | 164 | fp.write(new_body) | 163 | fp.write(new_body) |
236 | 165 | 164 | ||
237 | 165 | |||
238 | 166 | def main(args=None): | 166 | def main(args=None): |
239 | 167 | if args is None: | 167 | if args is None: |
240 | 168 | args = sys.argv[1:] | 168 | args = sys.argv[1:] |
241 | @@ -174,7 +174,7 @@ | |||
242 | 174 | paths = list(get_deployer_configs(deployer_dir)) | 174 | paths = list(get_deployer_configs(deployer_dir)) |
243 | 175 | 175 | ||
244 | 176 | if ns.assert_pinned: | 176 | if ns.assert_pinned: |
246 | 177 | all_pinned = ensure_all_branches_are_pinned(paths) | 177 | all_pinned = ensure_all_branches_are_pinned(paths) |
247 | 178 | return not bool(all_pinned) | 178 | return not bool(all_pinned) |
248 | 179 | else: | 179 | else: |
249 | 180 | branches = get_branches_and_revnos(paths, ns.check) | 180 | branches = get_branches_and_revnos(paths, ns.check) |
250 | 181 | 181 | ||
251 | === modified file 'lander/bin/lander_archiver.py' | |||
252 | --- lander/bin/lander_archiver.py 2014-02-06 18:50:05 +0000 | |||
253 | +++ lander/bin/lander_archiver.py 2014-02-12 21:16:08 +0000 | |||
254 | @@ -18,7 +18,6 @@ | |||
255 | 18 | import logging | 18 | import logging |
256 | 19 | import os | 19 | import os |
257 | 20 | import sys | 20 | import sys |
258 | 21 | import urllib2 | ||
259 | 22 | import yaml | 21 | import yaml |
260 | 23 | 22 | ||
261 | 24 | sys.path.append(os.path.join(os.path.dirname(__file__), '../../ci-utils')) | 23 | sys.path.append(os.path.join(os.path.dirname(__file__), '../../ci-utils')) |
262 | 25 | 24 | ||
263 | === modified file 'ppa-assigner/ppa_assigner/management/commands/integration_test.py' | |||
264 | --- ppa-assigner/ppa_assigner/management/commands/integration_test.py 2013-12-23 19:46:06 +0000 | |||
265 | +++ ppa-assigner/ppa_assigner/management/commands/integration_test.py 2014-02-12 21:16:08 +0000 | |||
266 | @@ -41,9 +41,10 @@ | |||
267 | 41 | default=%(default)s'''), | 41 | default=%(default)s'''), |
268 | 42 | make_option('--pocket', dest='pocket', default='Release', | 42 | make_option('--pocket', dest='pocket', default='Release', |
269 | 43 | help='Pocket to copy package in. default=%(default)s'), | 43 | help='Pocket to copy package in. default=%(default)s'), |
273 | 44 | make_option('--archive', dest='archive', | 44 | make_option( |
274 | 45 | default='https://api.launchpad.net/1.0/ubuntu/+archive/primary', | 45 | '--archive', dest='archive', |
275 | 46 | help='Archive for source package. defafult=%(default)s'), | 46 | default='https://api.launchpad.net/1.0/ubuntu/+archive/primary', |
276 | 47 | help='Archive for source package. defafult=%(default)s'), | ||
277 | 47 | ) | 48 | ) |
278 | 48 | 49 | ||
279 | 49 | def handle(self, *args, **options): | 50 | def handle(self, *args, **options): |
280 | 50 | 51 | ||
281 | === modified file 'run-tests' | |||
282 | --- run-tests 2014-02-04 14:50:46 +0000 | |||
283 | +++ run-tests 2014-02-12 21:16:08 +0000 | |||
284 | @@ -87,8 +87,8 @@ | |||
285 | 87 | 'branch-source-builder', | 87 | 'branch-source-builder', |
286 | 88 | 'image-builder', | 88 | 'image-builder', |
287 | 89 | 'lander', | 89 | 'lander', |
290 | 90 | # 'ppa-assigner', | 90 | # 'ppa-assigner', |
291 | 91 | # 'ticket_system', | 91 | # 'ticket_system', |
292 | 92 | 'test_runner', | 92 | 'test_runner', |
293 | 93 | ] | 93 | ] |
294 | 94 | loader = loaders.Loader() | 94 | loader = loaders.Loader() |
295 | 95 | 95 | ||
296 | === modified file 'test_runner/tstrun/testbed.py' | |||
297 | --- test_runner/tstrun/testbed.py 2014-02-06 11:23:26 +0000 | |||
298 | +++ test_runner/tstrun/testbed.py 2014-02-12 21:16:08 +0000 | |||
299 | @@ -294,8 +294,6 @@ | |||
300 | 294 | # 'auth_testbed_sshkey' can be defined there if you don't use ~/.ssh/id_rsa. | 294 | # 'auth_testbed_sshkey' can be defined there if you don't use ~/.ssh/id_rsa. |
301 | 295 | 295 | ||
302 | 296 | def test_print_ip(): | 296 | def test_print_ip(): |
303 | 297 | precise_image = ('ubuntu-released/ubuntu-precise-12.04' | ||
304 | 298 | '-amd64-server-20131205-disk1.img') | ||
305 | 299 | saucy_image = ('ubuntu-released/ubuntu-saucy-13.10' | 297 | saucy_image = ('ubuntu-released/ubuntu-saucy-13.10' |
306 | 300 | '-amd64-server-20140129-disk1.img') | 298 | '-amd64-server-20140129-disk1.img') |
307 | 301 | test_bed = TestBed('vila1', 'm1.small', saucy_image, | 299 | test_bed = TestBed('vila1', 'm1.small', saucy_image, |
308 | 302 | 300 | ||
309 | === modified file 'test_runner/tstrun/tests/test_data_store.py' | |||
310 | --- test_runner/tstrun/tests/test_data_store.py 2014-02-06 11:23:26 +0000 | |||
311 | +++ test_runner/tstrun/tests/test_data_store.py 2014-02-12 21:16:08 +0000 | |||
312 | @@ -14,7 +14,6 @@ | |||
313 | 14 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
314 | 15 | 15 | ||
315 | 16 | import errno | 16 | import errno |
316 | 17 | import os | ||
317 | 18 | import unittest | 17 | import unittest |
318 | 19 | 18 | ||
319 | 20 | 19 | ||
320 | 21 | 20 | ||
321 | === modified file 'tests/data_store/test.py' | |||
322 | --- tests/data_store/test.py 2014-02-10 19:11:11 +0000 | |||
323 | +++ tests/data_store/test.py 2014-02-12 21:16:08 +0000 | |||
324 | @@ -20,7 +20,8 @@ | |||
325 | 20 | import sys | 20 | import sys |
326 | 21 | import yaml | 21 | import yaml |
327 | 22 | 22 | ||
329 | 23 | sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'ci-utils')) | 23 | sys.path.append(os.path.join( |
330 | 24 | os.path.dirname(__file__), '..', '..', 'ci-utils')) | ||
331 | 24 | 25 | ||
332 | 25 | from ci_utils import data_store | 26 | from ci_utils import data_store |
333 | 26 | 27 | ||
334 | @@ -106,15 +107,14 @@ | |||
335 | 106 | 107 | ||
336 | 107 | del self.auth_config['auth_region'] | 108 | del self.auth_config['auth_region'] |
337 | 108 | with self.assertRaises(data_store.DataStoreException): | 109 | with self.assertRaises(data_store.DataStoreException): |
339 | 109 | ds = data_store.DataStore("test2", auth_config=self.auth_config) | 110 | data_store.DataStore("test2", auth_config=self.auth_config) |
340 | 110 | 111 | ||
341 | 111 | def test_bad_region(self): | 112 | def test_bad_region(self): |
342 | 112 | """ Test that passing an invalid region fails. """ | 113 | """ Test that passing an invalid region fails. """ |
343 | 113 | 114 | ||
344 | 114 | self.auth_config['auth_region'] = 'bad_region' | 115 | self.auth_config['auth_region'] = 'bad_region' |
345 | 115 | with self.assertRaises(data_store.DataStoreException): | 116 | with self.assertRaises(data_store.DataStoreException): |
348 | 116 | ds = data_store.DataStore("test2", | 117 | data_store.DataStore("test2", auth_config=self.auth_config) |
347 | 117 | auth_config=self.auth_config) | ||
349 | 118 | 118 | ||
350 | 119 | 119 | ||
351 | 120 | if __name__ == "__main__": | 120 | if __name__ == "__main__": |
FAILED: Continuous integration, rev:235 s-jenkins. ubuntu- ci:8080/ job/uci- engine- ci/146/
http://
Executed test runs:
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/uci- engine- ci/146/ rebuild
http://