From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 26 Jun 2015 17:29:10 +0000 (+0000)
Subject: Merge "Python3: do not use __builtin__"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ca17f8485a912d0ed3d82a4d95cfe2cfce46b4f2;p=openstack-build%2Fneutron-build.git

Merge "Python3: do not use __builtin__"
---

ca17f8485a912d0ed3d82a4d95cfe2cfce46b4f2
diff --cc tox.ini
index 923af2bd6,296a0cb6e..28184b944
--- a/tox.ini
+++ b/tox.ini
@@@ -107,11 -98,13 +107,13 @@@ commands = python -m testtools.run 
      neutron.tests.unit.services.metering.drivers.test_iptables \
      neutron.tests.unit.services.l3_router.test_l3_apic \
      neutron.tests.unit.plugins.sriovnicagent.test_sriov_nic_agent \
+     neutron.tests.unit.plugins.sriovnicagent.test_eswitch_manager \
+     neutron.tests.unit.plugins.sriovnicagent.common.test_config \
      neutron.tests.unit.plugins.sriovnicagent.test_pci_lib \
 -    neutron.tests.unit.plugins.openvswitch.agent.ovs_test_base \
 -    neutron.tests.unit.plugins.openvswitch.agent.openflow.ovs_ofctl.test_br_phys \
 -    neutron.tests.unit.plugins.openvswitch.agent.openflow.ovs_ofctl.test_br_int \
 -    neutron.tests.unit.plugins.openvswitch.agent.openflow.ovs_ofctl.test_br_tun \
 +    neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent.ovs_test_base \
 +    neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent.openflow.ovs_ofctl.test_br_phys \
 +    neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent.openflow.ovs_ofctl.test_br_int \
 +    neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent.openflow.ovs_ofctl.test_br_tun \
      neutron.tests.unit.plugins.brocade.test_brocade_db \
      neutron.tests.unit.plugins.brocade.test_brocade_vlan \
      neutron.tests.unit.plugins.oneconvergence.test_nvsd_agent \
@@@ -122,9 -115,10 +124,10 @@@
      neutron.tests.unit.plugins.ml2.test_driver_context \
      neutron.tests.unit.plugins.ml2.test_rpc \
      neutron.tests.unit.plugins.ml2.drivers.mlnx.test_mech_mlnx \
 -    neutron.tests.unit.plugins.ml2.drivers.test_mech_openvswitch \
 -    neutron.tests.unit.plugins.ml2.drivers.test_mech_linuxbridge \
 +    neutron.tests.unit.plugins.ml2.drivers.openvswitch.mech_driver.test_mech_openvswitch \
 +    neutron.tests.unit.plugins.ml2.drivers.linuxbridge.mech_driver.test_mech_linuxbridge \
      neutron.tests.unit.plugins.ml2.drivers.base_type_tunnel \
+     neutron.tests.unit.plugins.ml2.drivers.opendaylight.test_driver \
      neutron.tests.unit.plugins.ml2.drivers.ext_test \
      neutron.tests.unit.plugins.ml2.drivers.mech_sriov.test_mech_sriov_nic_switch \
      neutron.tests.unit.plugins.ml2.drivers.mech_fake_agent \