Changes in uspace/lib/ddev/test/ddev.c [b252e87:4c6fd56] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/ddev/test/ddev.c
rb252e87 r4c6fd56 1 1 /* 2 * Copyright (c) 20 19Jiri Svoboda2 * Copyright (c) 2023 Jiri Svoboda 3 3 * All rights reserved. 4 4 * … … 78 78 ddev_t *ddev = NULL; 79 79 test_response_t resp; 80 81 async_set_fallback_port_handler(test_ddev_conn, &resp); 82 83 // FIXME This causes this test to be non-reentrant! 84 rc = loc_server_register(test_ddev_server); 85 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 86 87 rc = loc_service_register(test_ddev_svc, &sid); 88 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 89 90 rc = ddev_open(test_ddev_svc, &ddev); 91 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 92 PCUT_ASSERT_NOT_NULL(ddev); 93 94 ddev_close(ddev); 95 rc = loc_service_unregister(sid); 96 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 80 loc_srv_t *srv; 81 82 async_set_fallback_port_handler(test_ddev_conn, &resp); 83 84 // FIXME This causes this test to be non-reentrant! 85 rc = loc_server_register(test_ddev_server, &srv); 86 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 87 88 rc = loc_service_register(srv, test_ddev_svc, &sid); 89 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 90 91 rc = ddev_open(test_ddev_svc, &ddev); 92 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 93 PCUT_ASSERT_NOT_NULL(ddev); 94 95 ddev_close(ddev); 96 rc = loc_service_unregister(srv, sid); 97 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 98 loc_server_unregister(srv); 97 99 } 98 100 … … 105 107 test_response_t resp; 106 108 gfx_context_t *gc; 107 108 async_set_fallback_port_handler(test_ddev_conn, &resp); 109 110 // FIXME This causes this test to be non-reentrant! 111 rc = loc_server_register(test_ddev_server); 112 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 113 114 rc = loc_service_register(test_ddev_svc, &sid); 109 loc_srv_t *srv; 110 111 async_set_fallback_port_handler(test_ddev_conn, &resp); 112 113 // FIXME This causes this test to be non-reentrant! 114 rc = loc_server_register(test_ddev_server, &srv); 115 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 116 117 rc = loc_service_register(srv, test_ddev_svc, &sid); 115 118 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 116 119 … … 122 125 resp.rc = ENOMEM; 123 126 rc = ddev_get_gc(ddev, &gc); 124 /* async_connect_me_to() does not return specific error */ 125 PCUT_ASSERT_ERRNO_VAL(EIO, rc); 127 PCUT_ASSERT_ERRNO_VAL(ENOMEM, rc); 126 128 PCUT_ASSERT_NULL(gc); 127 129 128 130 ddev_close(ddev); 129 rc = loc_service_unregister(sid); 130 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 131 rc = loc_service_unregister(srv, sid); 132 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 133 loc_server_unregister(srv); 131 134 } 132 135 … … 140 143 gfx_context_t *gc; 141 144 gfx_color_t *color; 142 143 async_set_fallback_port_handler(test_ddev_conn, &resp); 144 145 // FIXME This causes this test to be non-reentrant! 146 rc = loc_server_register(test_ddev_server); 147 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 148 149 rc = loc_service_register(test_ddev_svc, &sid); 145 loc_srv_t *srv; 146 147 async_set_fallback_port_handler(test_ddev_conn, &resp); 148 149 // FIXME This causes this test to be non-reentrant! 150 rc = loc_server_register(test_ddev_server, &srv); 151 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 152 153 rc = loc_service_register(srv, test_ddev_svc, &sid); 150 154 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 151 155 … … 171 175 172 176 ddev_close(ddev); 173 rc = loc_service_unregister(sid); 174 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 177 rc = loc_service_unregister(srv, sid); 178 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 179 loc_server_unregister(srv); 175 180 } 176 181 … … 183 188 test_response_t resp; 184 189 ddev_info_t info; 185 186 async_set_fallback_port_handler(test_ddev_conn, &resp); 187 188 // FIXME This causes this test to be non-reentrant! 189 rc = loc_server_register(test_ddev_server); 190 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 191 192 rc = loc_service_register(test_ddev_svc, &sid); 190 loc_srv_t *srv; 191 192 async_set_fallback_port_handler(test_ddev_conn, &resp); 193 194 // FIXME This causes this test to be non-reentrant! 195 rc = loc_server_register(test_ddev_server, &srv); 196 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 197 198 rc = loc_service_register(srv, test_ddev_svc, &sid); 193 199 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 194 200 … … 202 208 203 209 ddev_close(ddev); 204 rc = loc_service_unregister(sid); 205 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 210 rc = loc_service_unregister(srv, sid); 211 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 212 loc_server_unregister(srv); 206 213 } 207 214 … … 214 221 test_response_t resp; 215 222 ddev_info_t info; 216 217 async_set_fallback_port_handler(test_ddev_conn, &resp); 218 219 // FIXME This causes this test to be non-reentrant! 220 rc = loc_server_register(test_ddev_server); 221 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 222 223 rc = loc_service_register(test_ddev_svc, &sid); 223 loc_srv_t *srv; 224 225 async_set_fallback_port_handler(test_ddev_conn, &resp); 226 227 // FIXME This causes this test to be non-reentrant! 228 rc = loc_server_register(test_ddev_server, &srv); 229 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 230 231 rc = loc_service_register(srv, test_ddev_svc, &sid); 224 232 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 225 233 … … 245 253 246 254 ddev_close(ddev); 247 rc = loc_service_unregister(sid); 248 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 255 rc = loc_service_unregister(srv, sid); 256 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 257 loc_server_unregister(srv); 249 258 } 250 259
Note:
See TracChangeset
for help on using the changeset viewer.