Fix return code for pretty_tox_serial.sh
This commit properly returns the return code from the testr run.
Change-Id: Ifa0b39786814e5a40d1b97b52df809db65f8c211
diff --git a/tempest/scenario/test_network_basic_ops.py b/tempest/scenario/test_network_basic_ops.py
index 390e004..5311eae 100644
--- a/tempest/scenario/test_network_basic_ops.py
+++ b/tempest/scenario/test_network_basic_ops.py
@@ -16,8 +16,11 @@
# License for the specific language governing permissions and limitations
# under the License.
+import testtools
+
from tempest.api.network import common as net_common
from tempest.common.utils.data_utils import rand_name
+from tempest import config
from tempest.scenario import manager
from tempest.test import attr
@@ -88,6 +91,8 @@
"""
+ CONF = config.TempestConfig()
+
@classmethod
def check_preconditions(cls):
super(TestNetworkBasicOps, cls).check_preconditions()
@@ -242,6 +247,8 @@
self.floating_ips[server].append(floating_ip)
@attr(type='smoke')
+ @testtools.skipIf(CONF.service_available.neutron,
+ "Skipped unti bug #1210664 is resolved")
def test_008_check_public_network_connectivity(self):
if not self.floating_ips:
raise self.skipTest('No floating ips have been allocated.')
diff --git a/tools/pretty_tox_serial.sh b/tools/pretty_tox_serial.sh
index dd7b682..45f05bd 100755
--- a/tools/pretty_tox_serial.sh
+++ b/tools/pretty_tox_serial.sh
@@ -6,4 +6,6 @@
testr init
fi
testr run --subunit $TESTRARGS | subunit2pyunit
+retval=$?
testr slowest
+exit $retval