From 3b225abb79dcd40a8934f8d9b59fabcd5944f1e8 Mon Sep 17 00:00:00 2001
From: nsubiron <nsubiron@cvc.uab.es>
Date: Fri, 15 Sep 2017 15:45:05 +0200
Subject: [PATCH] Some improvements to the test suite

---
 Util/PythonClient/lib/carla_util.py |  2 +-
 Util/PythonClient/test/Basic.py     | 15 +++++++++++----
 Util/PythonClient/test_suite.py     |  5 +++--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Util/PythonClient/lib/carla_util.py b/Util/PythonClient/lib/carla_util.py
index c27a01e25..d2176b8a1 100644
--- a/Util/PythonClient/lib/carla_util.py
+++ b/Util/PythonClient/lib/carla_util.py
@@ -125,7 +125,7 @@ class TestCarlaClientBase(object):
         if autopilot is None:
             autopilot = random.choice([True, False])
 
-        reverse = random.choice([True, False])
+        reverse = (random.random() < 0.2)
 
         logging.info('running episode with %d iterations', iterations)
 
diff --git a/Util/PythonClient/test/Basic.py b/Util/PythonClient/test/Basic.py
index 3c8a8a2e4..bd461e252 100644
--- a/Util/PythonClient/test/Basic.py
+++ b/Util/PythonClient/test/Basic.py
@@ -10,15 +10,15 @@ class UseCase(test.CarlaServerTest):
         with make_client(TestCarlaClientBase, self.args) as client:
             for x in xrange(0, 5):
                 client.start_episode()
-                client.loop_on_agent_client(iterations=100)
+                client.loop_on_agent_client(iterations=200)
 
 
 class SynchronousMode(test.CarlaServerTest):
     def run(self):
         with make_client(TestCarlaClientBase, self.args) as client:
-            for x in xrange(0, 5):
+            for x in xrange(0, 3):
                 client.start_episode(SynchronousMode=True)
-                client.loop_on_agent_client(iterations=100)
+                client.loop_on_agent_client(iterations=200)
 
 
 class GetAgentsInfo(test.CarlaServerTest):
@@ -30,4 +30,11 @@ class GetAgentsInfo(test.CarlaServerTest):
                     SendNonPlayerAgentsInfo=True,
                     NumberOfVehicles=60,
                     NumberOfPedestrians=90)
-                client.loop_on_agent_client(iterations=50)
+                client.loop_on_agent_client(iterations=100)
+
+
+class LongEpisode(test.CarlaServerTest):
+    def run(self):
+        with make_client(TestCarlaClientBase, self.args) as client:
+            client.start_episode()
+            client.loop_on_agent_client(iterations=2000)
diff --git a/Util/PythonClient/test_suite.py b/Util/PythonClient/test_suite.py
index db6071bc0..b54e084be 100755
--- a/Util/PythonClient/test_suite.py
+++ b/Util/PythonClient/test_suite.py
@@ -7,13 +7,13 @@
 
 
 import argparse
-import datetime
-import time
 import glob
 import imp
 import inspect
 import logging
 import os
+import random
+import time
 
 
 from lib.carla_util import TestCarlaClientBase
@@ -108,6 +108,7 @@ def run_test(test, args):
 
 def do_the_tests(args):
     tests = [t for t in iterate_tests()]
+    random.shuffle(tests)
     succeeded = []
     failed = []
     log_test(SEP0, 'Running %d tests.', len(tests))