Changes in uspace/lib/system/test/system.c [f35749e:a72f3b8] in mainline

File:

• uspace/lib/system/test/system.c (modified) (9 diffs)

uspace/lib/system/test/system.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -46 +46 @@
 void test_system_conn(ipc_call_t *, void *);
 
-static errno_t test_poweroff(void *);
-static errno_t test_restart(void *);
+static errno_t test_shutdown(void *);
 
 static void test_sys_shutdown_complete(void *);
@@ -53 +52 @@
 
 static system_ops_t test_system_srv_ops = {
-        .poweroff = test_poweroff,
-        .restart = test_restart
+        .shutdown = test_shutdown
 };
 
@@ -68 +66 @@
         errno_t rc;
 
-        bool poweroff_called;
-        bool restart_called;
+        bool shutdown_called;
         bool shutdown_complete_called;
         bool shutdown_failed_called;
@@ -106 +103 @@
 }
 
-/** system_poweroff() with server returning error response works */
-PCUT_TEST(poweroff_failure)
+/** system_shutdown() with server returning error response works */
+PCUT_TEST(shutdown_failure)
 {
         errno_t rc;
@@ -129 +126 @@
 
         resp.rc = ENOMEM;
-        resp.poweroff_called = false;
-
-        rc = system_poweroff(system);
-        PCUT_ASSERT_TRUE(resp.poweroff_called);
+        resp.shutdown_called = false;
+
+        rc = system_shutdown(system);
+        PCUT_ASSERT_TRUE(resp.shutdown_called);
         PCUT_ASSERT_ERRNO_VAL(resp.rc, rc);
 
@@ -141 +138 @@
 }
 
-/** system_poweroff() with server returning success response works */
-PCUT_TEST(poweroff_success)
+/** system_shutdown() with server returning success response works */
+PCUT_TEST(shutdown_success)
 {
         errno_t rc;
@@ -164 +161 @@
 
         resp.rc = EOK;
-        resp.poweroff_called = false;
-
-        rc = system_poweroff(system);
-        PCUT_ASSERT_TRUE(resp.poweroff_called);
-        PCUT_ASSERT_ERRNO_VAL(resp.rc, rc);
-
-        system_close(system);
-        rc = loc_service_unregister(srv, sid);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-        loc_server_unregister(srv);
-}
-
-/** system_restart() with server returning error response works */
-PCUT_TEST(restart_failure)
-{
-        errno_t rc;
-        service_id_t sid;
-        system_t *system = NULL;
-        test_response_t resp;
-        loc_srv_t *srv;
-
-        async_set_fallback_port_handler(test_system_conn, &resp);
-
-        // FIXME This causes this test to be non-reentrant!
-        rc = loc_server_register(test_system_server, &srv);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = loc_service_register(srv, test_system_svc, &sid);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = system_open(test_system_svc, NULL, NULL, &system);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-        PCUT_ASSERT_NOT_NULL(system);
-
-        resp.rc = ENOMEM;
-        resp.restart_called = false;
-
-        rc = system_restart(system);
-        PCUT_ASSERT_TRUE(resp.restart_called);
-        PCUT_ASSERT_ERRNO_VAL(resp.rc, rc);
-
-        system_close(system);
-        rc = loc_service_unregister(srv, sid);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-        loc_server_unregister(srv);
-}
-
-/** system_restart() with server returning success response works */
-PCUT_TEST(restart_success)
-{
-        errno_t rc;
-        service_id_t sid;
-        system_t *system = NULL;
-        test_response_t resp;
-        loc_srv_t *srv;
-
-        async_set_fallback_port_handler(test_system_conn, &resp);
-
-        // FIXME This causes this test to be non-reentrant!
-        rc = loc_server_register(test_system_server, &srv);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = loc_service_register(srv, test_system_svc, &sid);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = system_open(test_system_svc, NULL, NULL, &system);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-        PCUT_ASSERT_NOT_NULL(system);
-
-        resp.rc = EOK;
-        resp.restart_called = false;
-
-        rc = system_restart(system);
-        PCUT_ASSERT_TRUE(resp.restart_called);
+        resp.shutdown_called = false;
+
+        rc = system_shutdown(system);
+        PCUT_ASSERT_TRUE(resp.shutdown_called);
         PCUT_ASSERT_ERRNO_VAL(resp.rc, rc);
 
@@ -352 +279 @@
 }
 
-/** Test system poweroff.
+/** Test system shutdown.
  *
  * @param arg Argument (test_response_t *)
  */
-static errno_t test_poweroff(void *arg)
+static errno_t test_shutdown(void *arg)
 {
         test_response_t *resp = (test_response_t *)arg;
 
-        resp->poweroff_called = true;
-        return resp->rc;
-}
-
-/** Test system restart.
- *
- * @param arg Argument (test_response_t *)
- */
-static errno_t test_restart(void *arg)
-{
-        test_response_t *resp = (test_response_t *)arg;
-
-        resp->restart_called = true;
+        resp->shutdown_called = true;
         return resp->rc;
 }