flake8 clean checkpoint

This commit takes what was in tree so far and makes it pass the tox
pep8 job.

subunit2sql/db/api.py

@@ -124,14 +124,14 @@ def get_all_test_runs():
 
 def get_test_by_id(id, session=None):
     session = session or get_session()
-    test = db.utils.models_query(models.Test, session).filter_by(
+    test = db_utils.models_query(models.Test, session).filter_by(
         id=id).first()
     return test
 
 
 def get_test_by_test_id(test_id, session=None):
     session = session or get_session()
-    test = db.utils.models_query(models.Test, session).filter_by(
+    test = db_utils.models_query(models.Test, session).filter_by(
         test_id=test_id).first()
     return test
 

subunit2sql/migrations/versions/1f92cfe8a6d3_create_runs_table.py

@@ -1,3 +1,18 @@
+# Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 """create runs table
 
 Revision ID: 1f92cfe8a6d3

subunit2sql/migrations/versions/3db7b49816d5_create_test_runs_table.py

@@ -1,3 +1,18 @@
+# Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 """create test_runs table
 
 Revision ID: 3db7b49816d5

subunit2sql/migrations/versions/5ef013efbc2_create_tests_tables.py

@@ -1,3 +1,18 @@
+# Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 """create tests tables
 
 Revision ID: 5ef013efbc2

subunit2sql/shell.py

@@ -48,11 +48,12 @@ def parse_args(argv, default_config_files=None):
     cfg.CONF(argv[1:], project='subunit2sql',
              default_config_files=default_config_files)
 
+
 def process_results(results):
     session = api.get_session()
     db_run = api.create_run()
     for test in results:
-        db_test =  api.get_test_by_test_id(test, session)
+        db_test = api.get_test_by_test_id(test, session)
         if not db_test:
             db_test = api.create_test(test)
         api.create_test_run(db_test.id, db_run.id, test['status'],
@@ -62,9 +63,9 @@ def process_results(results):
 def main():
     parse_args(sys.argv)
     if CONF.subunit_files:
-        streams = [ subunit.ReadSubunit(s) for s in CONF.subunit_files ]
+        streams = [subunit.ReadSubunit(s) for s in CONF.subunit_files]
     else:
-        steams = [ subunit.ReadSubunit(sys.stdin) ]
+        streams = [subunit.ReadSubunit(sys.stdin)]
     for stream in streams:
         process_results(stream.get_results())
 

subunit2sql/subunit.py

@@ -12,6 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+import functools
+
 import subunit
 import testtools
 
@@ -21,11 +23,12 @@ class ReadSubunit(object):
     def __init__(self, stream_file):
         self.stream = subunit.ByteStreamToStreamResult(stream_file)
         summary = testtools.StreamSummary()
-        outcomes = testtools.StreamToDict(functools.partial(parse_outcome))
+        outcomes = testtools.StreamToDict(functools.partial(
+            self.parse_outcome))
         self.result = testtools.CopyStreamResult([outcomes, summary])
         self.results = {}
 
-    def get_results():
+    def get_results(self):
         try:
             self.stream.run(self.result)
         finally:
@@ -37,20 +40,16 @@ class ReadSubunit(object):
         # TODO(sdague): ask lifeless why on this?
         if status == 'exists':
             return
-    
+        name = self.cleanup_test_name(test['id'])
-        worker = find_worker(test)
-        name = cleanup_test_name(test['id']) 
-    
         # don't count the end of the return code as a fail
         if name == 'process-returncode':
             return
-    
         self.result[name] = {
             'status': status,
             'start_time': test['timestamps'][0],
             'end_time': test['timestamps'][1],
         }
-        stream.flush()
+        self.stream.flush()
 
     def cleanup_test_name(name, strip_tags=True, strip_scenarios=False):
         """Clean up the test name for display.

subunit2sql/tests/base.py

@@ -1,13 +0,0 @@
-# Copyright 2014 Hewlett-Packard Development Company, L.P.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.

subunit2sql/tests/subunit.py

@@ -1,15 +0,0 @@
-# Copyright 2014 Hewlett-Packard Development Company, L.P.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-