Finalize tox config.

Shrink tox.ini to the new short version.
Fix the test cases to be able to be run in nosetets plus the
openstack.nose_plugin, which finally removes the need for
nova/testing/runner.py
Also, now we'll just output directly to stdout, which will
make nose collect the trace logging directly and either output
it at the end of the run, or inject it into the xunit output
appropriately.

Change-Id: I1456e18a11a840145492038108bdfe812c8230d1

.coveragerc

@@ -0,0 +1,6 @@
+[run]
+branch = True
+omit = /usr*,setup.py,*egg*,.venv/*,.tox/*,nova/tests/*
+
+[report]
+ignore-errors = True

.gitignore

@@ -2,6 +2,7 @@
 *.DS_Store
 local_settings.py
 ChangeLog
+MANIFEST
 CA/
 keeper
 instances
@@ -15,9 +16,13 @@ nova.egg-info
 *.sqlite
 *.log
 *.mo
+nosetests.xml
+coverage.xml
 tools/conf/nova.conf*
 cover/*
+nova/tests/cover/*
+nova/vcsversion.py
+.autogenerated
 dist/*
 .coverage
 covhtml
-nova/tests/coverage.xml

contrib/boto_v6/ec2/connection.py

@@ -6,7 +6,7 @@
 import boto
 import base64
 import boto.ec2
-from boto_v6.ec2.instance import  ReservationV6
+from boto_v6.ec2.instance import ReservationV6
 from boto.ec2.securitygroup import SecurityGroup
 
 

nova/log.py

@@ -361,7 +361,9 @@ def _setup_logging_from_flags():
         nova_root.addHandler(streamlog)
 
     elif not FLAGS.log_file:
-        streamlog = logging.StreamHandler(stream=sys.stdout)
+        # pass sys.stdout as a positional argument
+        # python2.6 calls the argument strm, in 2.7 it's stream
+        streamlog = logging.StreamHandler(sys.stdout)
         nova_root.addHandler(streamlog)
 
     if FLAGS.publish_errors:

nova/network/linux_net.py

@@ -90,7 +90,11 @@
 #             add up to 12 characters to binary_name which is used as a prefix,
 #             so we limit it to 16 characters.
 #             (max_chain_name_length - len('-POSTROUTING') == 16)
-binary_name = os.path.basename(inspect.stack()[-1][1])[:16]
+def get_binary_name():
+    """Grab the name of the binary we're running in."""
+    return os.path.basename(inspect.stack()[-1][1])[:16]
+
+binary_name = get_binary_name()
 
 
 class IptablesRule(object):