Merge lp:~zulcss/neutron/quantum-fix-pep8 into lp:~openstack-ubuntu-testing/neutron/grizzly

[Chuck Short]

fix pep8 tests.

[Yolanda Robla (yolanda.robla)]

Looks good to me

review: Approve

[James Page (james-page)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-01 14:15:07 +0000
+++ debian/changelog	2013-03-01 14:56:33 +0000
@@ -6,6 +6,7 @@
   * debian/control: Add python-testtools and python-fixtures a build-dep.
   * debian/control: Drop python-gflags no longer needed.
   * debian/control: Drop python-unittest2 no longer needed.
+  * debian/patches/fix-pep8-tests.patch: Fix pep8 tests.
 
   [ James Page ]
   * d/watch: Update uversionmangle to deal with upstream versioning

=== added file 'debian/patches/fix-pep8-tests.patch'
--- debian/patches/fix-pep8-tests.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-pep8-tests.patch	2013-03-01 14:56:33 +0000
@@ -0,0 +1,58 @@
+From 0d71ce29f825453761fd52dffb7370fa8fbacb42 Mon Sep 17 00:00:00 2001
+From: Chuck Short <[e-mail]>
+Date: Fri, 1 Mar 2013 08:21:31 -0600
+Subject: [PATCH] Pin pep8 to 1.3.3
+
+Apart of making pep8 version standard across all openstack
+projects.
+
+Change-Id: Iefc923123243df161ed72888c1651a622afbda04
+Signed-off-by: Chuck Short <[e-mail]>
+---
+ quantum/scheduler/dhcp_agent_scheduler.py | 2 +-
+ quantum/scheduler/l3_agent_scheduler.py   | 2 +-
+ tools/test-requires                       | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/quantum/scheduler/dhcp_agent_scheduler.py b/quantum/scheduler/dhcp_agent_scheduler.py
+index 6292988..e3810ce 100644
+--- a/quantum/scheduler/dhcp_agent_scheduler.py
++++ b/quantum/scheduler/dhcp_agent_scheduler.py
+@@ -81,7 +81,7 @@ class ChanceScheduler(object):
+             query = query.filter(agents_db.Agent.agent_type ==
+                                  constants.AGENT_TYPE_DHCP,
+                                  agents_db.Agent.host == host,
+-                                 agents_db.Agent.admin_state_up == True)
++                                 agents_db.Agent.admin_state_up is True)
+             try:
+                 dhcp_agent = query.one()
+             except (exc.MultipleResultsFound, exc.NoResultFound):
+diff --git a/quantum/scheduler/l3_agent_scheduler.py b/quantum/scheduler/l3_agent_scheduler.py
+index 0d3b1ef..6e99346 100644
+--- a/quantum/scheduler/l3_agent_scheduler.py
++++ b/quantum/scheduler/l3_agent_scheduler.py
+@@ -48,7 +48,7 @@ class ChanceScheduler(object):
+             query = query.filter(agents_db.Agent.agent_type ==
+                                  constants.AGENT_TYPE_L3,
+                                  agents_db.Agent.host == host,
+-                                 agents_db.Agent.admin_state_up == True)
++                                 agents_db.Agent.admin_state_up is True)
+             try:
+                 l3_agent = query.one()
+             except (exc.MultipleResultsFound, exc.NoResultFound):
+diff --git a/tools/test-requires b/tools/test-requires
+index d86688e..8e93e94 100644
+--- a/tools/test-requires
++++ b/tools/test-requires
+@@ -9,7 +9,7 @@ nose
+ nosehtmloutput
+ nosexcover
+ openstack.nose_plugin
+-pep8
++pep8==1.3.3
+ sphinx>=1.1.2
+ testtools>=0.9.27
+ webtest==1.3.3
+-- 
+1.8.1.2
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-02-27 15:02:09 +0000
+++ debian/patches/series	2013-03-01 14:56:33 +0000
@@ -1,2 +1,3 @@
 fix-quantum-configuration.patch
 fix-ubuntu-tests.patch
+fix-pep8-tests.patch