Skip to content

Commit 2621a9a

Browse files
DSantosObernatx
authored andcommitted
Disable camera smoke test
1 parent 7edcea2 commit 2621a9a

File tree

6 files changed

+19
-11
lines changed

6 files changed

+19
-11
lines changed

Examples/CppClient/main.cpp

+8-4
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ static auto &RandomChoice(const RangeT &range, RNG &&generator) {
3636
}
3737

3838
/// Save a semantic segmentation image to disk converting to CityScapes palette.
39+
/*
3940
static void SaveSemSegImageToDisk(const csd::Image &image) {
4041
using namespace carla::image;
4142
@@ -48,6 +49,7 @@ static void SaveSemSegImageToDisk(const csd::Image &image) {
4849
ColorConverter::CityScapesPalette());
4950
ImageIO::WriteView(filename, view);
5051
}
52+
*/
5153

5254
static auto ParseArguments(int argc, const char *argv[]) {
5355
EXPECT_TRUE((argc == 1u) || (argc == 3u));
@@ -67,7 +69,7 @@ int main(int argc, const char *argv[]) {
6769
std::mt19937_64 rng((std::random_device())());
6870

6971
auto client = cc::Client(host, port);
70-
client.SetTimeout(10s);
72+
client.SetTimeout(40s);
7173

7274
std::cout << "Client API version : " << client.GetClientVersion() << '\n';
7375
std::cout << "Server API version : " << client.GetServerVersion() << '\n';
@@ -112,6 +114,7 @@ int main(int argc, const char *argv[]) {
112114
transform.rotation.pitch = -15.0f;
113115
spectator->SetTransform(transform);
114116

117+
/*
115118
// Find a camera blueprint.
116119
auto camera_bp = blueprint_library->Find("sensor.camera.semantic_segmentation");
117120
EXPECT_TRUE(camera_bp != nullptr);
@@ -125,15 +128,16 @@ int main(int argc, const char *argv[]) {
125128
126129
// Register a callback to save images to disk.
127130
camera->Listen([](auto data) {
128-
auto image = boost::static_pointer_cast<csd::Image>(data);
129-
EXPECT_TRUE(image != nullptr);
130-
SaveSemSegImageToDisk(*image);
131+
auto image = boost::static_pointer_cast<csd::Image>(data);
132+
EXPECT_TRUE(image != nullptr);
133+
SaveSemSegImageToDisk(*image);
131134
});
132135
133136
std::this_thread::sleep_for(10s);
134137
135138
// Remove actors from the simulation.
136139
camera->Destroy();
140+
*/
137141
vehicle->Destroy();
138142
std::cout << "Actors destroyed." << std::endl;
139143

Jenkinsfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ pipeline
128128
unstash name: 'ubuntu_package'
129129
unstash name: 'ubuntu_examples'
130130
sh 'tar -xvzf Dist/CARLA*.tar.gz -C Dist/'
131-
sh 'DISPLAY= ./Dist/CarlaUE4.sh -RenderOffScreen --carla-rpc-port=3654 --carla-streaming-port=0 -nosound > CarlaUE4.log &'
131+
sh 'DISPLAY= ./Dist/CarlaUE4.sh -nullrhi -RenderOffScreen --carla-rpc-port=3654 --carla-streaming-port=0 -nosound > CarlaUE4.log &'
132132
sh 'make smoke_tests ARGS="--xml --python-version=3.7,2"'
133133
sh 'make run-examples ARGS="localhost 3654"'
134134
}

PythonAPI/test/smoke/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ def setUp(self):
4949

5050
def tearDown(self):
5151
self.world.apply_settings(self.settings)
52-
self.world.tick()
52+
self.world.tick(120)
5353
self.settings = None
5454
super(SyncSmokeTest, self).tearDown()

PythonAPI/test/smoke/test_sensor_tick_time.py

+3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ def test_sensor_tick_time(self):
3131
bp_lib = self.world.get_blueprint_library()
3232

3333
sensor_exception = {
34+
"sensor.camera.depth",
35+
"sensor.camera.rgb",
36+
"sensor.camera.semantic_segmentation",
3437
"sensor.camera.dvs",
3538
"sensor.other.obstacle"
3639
}

PythonAPI/test/smoke/test_sync.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def test_reloading_map(self):
3030
self.world = self.client.reload_world()
3131
self.world.apply_settings(settings)
3232

33-
def test_camera_on_synchronous_mode(self):
33+
def _test_camera_on_synchronous_mode(self):
3434
print("TestSynchronousMode.test_camera_on_synchronous_mode")
3535

3636
cam_bp = self.world.get_blueprint_library().find('sensor.camera.rgb')
@@ -75,9 +75,10 @@ def test_sensor_transform_on_synchronous_mode(self):
7575
"sensor.other.gnss",
7676
"sensor.other.radar",
7777
"sensor.other.imu",
78-
"sensor.camera.rgb",
79-
"sensor.camera.depth",
80-
"sensor.camera.semantic_segmentation"]
78+
# "sensor.camera.rgb",
79+
# "sensor.camera.depth",
80+
# "sensor.camera.semantic_segmentation"
81+
]
8182
sensor_bps = [bp_lib.find(n) for n in sensor_ids]
8283
trans = carla.Transform(carla.Location(x=1.6, z=1.7))
8384
sensors = [self.world.spawn_actor(sensor, trans, car) for sensor in sensor_bps]

PythonAPI/test/smoke_test_list.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
smoke.test_client smoke.test_sync smoke.test_sensor_determinism smoke.test_collision_sensor smoke.test_props_loading smoke.test_sensor_tick_time smoke.test_map smoke.test_snapshot smoke.test_lidar smoke.test_streamming smoke.test_spawnpoints smoke.test_blueprint smoke.test_world smoke.test_determinism
1+
smoke.test_client smoke.test_sync smoke.test_sensor_determinism smoke.test_props_loading smoke.test_sensor_tick_time smoke.test_map smoke.test_snapshot smoke.test_lidar smoke.test_streamming smoke.test_spawnpoints smoke.test_blueprint smoke.test_world smoke.test_determinism

0 commit comments

Comments
 (0)