commit b8ff8a7fc7e7cda468735c50652a4beba5331616
author Jeremy Stanley <fungi@yuggoth.org> Tue Sep 25 16:10:02 2012 +0000
committer Jenkins <jenkins@review.openstack.org> Wed Sep 26 14:22:03 2012 +0000
tree 3f971d4d0d81d8b774580336814e1fb27253ab9e
parent afd39bb3cd03517363cd08a41804911392e4d749

Revert "Fix pep8 E127 violations"

This reverts commit afd39bb3cd03517363cd08a41804911392e4d749

This change should be rebased against the dev branch instead and
submitted there. Once the production CI freeze ends immediately
following the OpenStack Folsom release, dev changes will be merged back
into master.

Change-Id: Iabc1a0b287f0a433ca297a0d5cd1e21dd670e1d3
Reviewed-on: https://review.openstack.org/13638
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins

tests/test_scheduler.py

diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py
index fd103c8..cacf4a9 100644
--- a/tests/test_scheduler.py
+++ b/tests/test_scheduler.py
@@ -362,17 +362,14 @@
 
 class FakeJenkinsEvent(object):
     def __init__(self, name, number, parameters, phase, status=None):
-        data = {
-            'build': {
-                'full_url': 'https://server/job/%s/%s/' % (name, number),
-                'number': number,
-                'parameters': parameters,
-                'phase': phase,
-                'url': 'job/%s/%s/' % (name, number),
-            },
-            'name': name,
-            'url': 'job/%s/' % name,
-        }
+        data = {'build':
+                     {'full_url': 'https://server/job/%s/%s/' % (name, number),
+                      'number': number,
+                      'parameters': parameters,
+                      'phase': phase,
+                      'url': 'job/%s/%s/' % (name, number)},
+                     'name': name,
+                     'url': 'job/%s/' % name}
         if status:
             data['build']['status'] = status
         self.body = json.dumps(data)
@@ -813,7 +810,7 @@
     def test_independent_queues(self):
         "Test that changes end up in the right queues"
         self.fake_jenkins.hold_jobs_in_build = True
-        A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
+        A = self.fake_gerrit.addFakeChange('org/project',  'master', 'A')
         B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B')
         C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C')
         A.addApproval('CRVW', 2)
@@ -1120,18 +1117,13 @@
 
     def test_post(self):
         "Test that post jobs run"
-        e = {
-            "type": "ref-updated",
-            "submitter": {
-                "name": "User Name",
-            },
-            "refUpdate": {
-                "oldRev": "90f173846e3af9154517b88543ffbd1691f31366",
-                "newRev": "d479a0bfcb34da57a31adb2a595c0cf687812543",
-                "refName": "master",
-                "project": "org/project",
-            }
-        }
+        e = {"type": "ref-updated",
+             "submitter": {"name": "User Name"},
+             "refUpdate": {"oldRev":
+                               "90f173846e3af9154517b88543ffbd1691f31366",
+                           "newRev":
+                               "d479a0bfcb34da57a31adb2a595c0cf687812543",
+                           "refName": "master", "project": "org/project"}}
         self.fake_gerrit.addEvent(e)
         self.waitUntilSettled()