From 41c204c6b9c28779c7a7afbb1ba17be5d100dc7d Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 18 Sep 2015 22:15:09 +0200 Subject: fork remote-login-service as remote-logon-service --- tests/Makefile.am | 2 +- tests/dbus-interface.c | 66 ++++++++++++++++++++++----------------------- tests/null-config.conf | 2 +- tests/slmock | 12 ++++----- tests/slmock-config.conf.in | 2 +- tests/uccs-config.conf | 2 +- 6 files changed, 43 insertions(+), 43 deletions(-) (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index bc52633..9a34654 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -60,7 +60,7 @@ slmock-config.conf: slmock-config.conf.in dbus_interface_SOURCES = \ dbus-interface.c dbus_interface_CFLAGS = \ - -DREMOTE_LOGIN_SERVICE="\"$(abs_top_builddir)/src/remote-login-service\"" \ + -DREMOTE_LOGON_SERVICE="\"$(abs_top_builddir)/src/remote-logon-service\"" \ -DUCCS_CONFIG_FILE="\"$(abs_srcdir)/uccs-config.conf\"" \ -DSLMOCK_CONFIG_FILE="\"$(abs_builddir)/slmock-config.conf\"" \ -DNULL_CONFIG_FILE="\"$(abs_srcdir)/null-config.conf\"" \ diff --git a/tests/dbus-interface.c b/tests/dbus-interface.c index 2427b34..e67b60c 100644 --- a/tests/dbus-interface.c +++ b/tests/dbus-interface.c @@ -150,15 +150,15 @@ slmock_check_login(GDBusConnection * session, slmock_table_t * slmockdata, gbool { if (clear_cache) { gchar *username_sha = g_compute_checksum_for_string (G_CHECKSUM_SHA256, slmockdata->username, -1); - gchar *file_path = g_build_path ("/", g_get_user_cache_dir(), "remote-login-service", "cache", username_sha, NULL); + gchar *file_path = g_build_path ("/", g_get_user_cache_dir(), "remote-logon-service", "cache", username_sha, NULL); unlink (file_path); g_free (username_sha); g_free (file_path); } GVariant * retval = g_dbus_connection_call_sync(session, - "com.canonical.RemoteLogin", - "/com/canonical/RemoteLogin", - "com.canonical.RemoteLogin", + "org.ArcticaProject.RemoteLogon", + "/org/ArcticaProject/RemoteLogon", + "org.ArcticaProject.RemoteLogon", "GetServersForLogin", g_variant_new("(sssb)", "https://slmock.com/", @@ -203,13 +203,13 @@ test_getservers_slmock (gconstpointer data) DbusTestService * service = dbus_test_service_new(NULL); /* RLS */ - DbusTestProcess * rls = dbus_test_process_new(REMOTE_LOGIN_SERVICE); + DbusTestProcess * rls = dbus_test_process_new(REMOTE_LOGON_SERVICE); dbus_test_process_append_param(rls, "--config-file=" SLMOCK_CONFIG_FILE); dbus_test_service_add_task(service, DBUS_TEST_TASK(rls)); /* Dummy */ DbusTestTask * dummy = dbus_test_task_new(); - dbus_test_task_set_wait_for(dummy, "com.canonical.RemoteLogin"); + dbus_test_task_set_wait_for(dummy, "org.ArcticaProject.RemoteLogon"); dbus_test_service_add_task(service, dummy); /* Get RLS up and running and us on that bus */ @@ -233,13 +233,13 @@ test_getservers_slmock_none (void) DbusTestService * service = dbus_test_service_new(NULL); /* RLS */ - DbusTestProcess * rls = dbus_test_process_new(REMOTE_LOGIN_SERVICE); + DbusTestProcess * rls = dbus_test_process_new(REMOTE_LOGON_SERVICE); dbus_test_process_append_param(rls, "--config-file=" SLMOCK_CONFIG_FILE); dbus_test_service_add_task(service, DBUS_TEST_TASK(rls)); /* Dummy */ DbusTestTask * dummy = dbus_test_task_new(); - dbus_test_task_set_wait_for(dummy, "com.canonical.RemoteLogin"); + dbus_test_task_set_wait_for(dummy, "org.ArcticaProject.RemoteLogon"); dbus_test_service_add_task(service, dummy); /* Get RLS up and running and us on that bus */ @@ -249,9 +249,9 @@ test_getservers_slmock_none (void) g_dbus_connection_set_exit_on_close(session, FALSE); GVariant * retval = g_dbus_connection_call_sync(session, - "com.canonical.RemoteLogin", - "/com/canonical/RemoteLogin", - "com.canonical.RemoteLogin", + "org.ArcticaProject.RemoteLogon", + "/org/ArcticaProject/RemoteLogon", + "org.ArcticaProject.RemoteLogon", "GetServersForLogin", g_variant_new("(sssb)", "https://slmock.com/", @@ -289,13 +289,13 @@ test_getservers_slmock_two (void) DbusTestService * service = dbus_test_service_new(NULL); /* RLS */ - DbusTestProcess * rls = dbus_test_process_new(REMOTE_LOGIN_SERVICE); + DbusTestProcess * rls = dbus_test_process_new(REMOTE_LOGON_SERVICE); dbus_test_process_append_param(rls, "--config-file=" SLMOCK_CONFIG_FILE); dbus_test_service_add_task(service, DBUS_TEST_TASK(rls)); /* Dummy */ DbusTestTask * dummy = dbus_test_task_new(); - dbus_test_task_set_wait_for(dummy, "com.canonical.RemoteLogin"); + dbus_test_task_set_wait_for(dummy, "org.ArcticaProject.RemoteLogon"); dbus_test_service_add_task(service, dummy); /* Get RLS up and running and us on that bus */ @@ -320,13 +320,13 @@ test_getservers_none (void) DbusTestService * service = dbus_test_service_new(NULL); /* RLS */ - DbusTestProcess * rls = dbus_test_process_new(REMOTE_LOGIN_SERVICE); + DbusTestProcess * rls = dbus_test_process_new(REMOTE_LOGON_SERVICE); dbus_test_process_append_param(rls, "--config-file=" NULL_CONFIG_FILE); dbus_test_service_add_task(service, DBUS_TEST_TASK(rls)); /* Dummy */ DbusTestTask * dummy = dbus_test_task_new(); - dbus_test_task_set_wait_for(dummy, "com.canonical.RemoteLogin"); + dbus_test_task_set_wait_for(dummy, "org.ArcticaProject.RemoteLogon"); dbus_test_service_add_task(service, dummy); /* Get RLS up and running and us on that bus */ @@ -336,9 +336,9 @@ test_getservers_none (void) g_dbus_connection_set_exit_on_close(session, FALSE); GVariant * retval = g_dbus_connection_call_sync(session, - "com.canonical.RemoteLogin", - "/com/canonical/RemoteLogin", - "com.canonical.RemoteLogin", + "org.ArcticaProject.RemoteLogon", + "/org/ArcticaProject/RemoteLogon", + "org.ArcticaProject.RemoteLogon", "GetServers", NULL, /* params */ G_VARIANT_TYPE("(a(sssba(sbva{sv})a(si)))"), /* ret type */ @@ -370,13 +370,13 @@ test_getservers_uccs (void) DbusTestService * service = dbus_test_service_new(NULL); /* RLS */ - DbusTestProcess * rls = dbus_test_process_new(REMOTE_LOGIN_SERVICE); + DbusTestProcess * rls = dbus_test_process_new(REMOTE_LOGON_SERVICE); dbus_test_process_append_param(rls, "--config-file=" UCCS_CONFIG_FILE); dbus_test_service_add_task(service, DBUS_TEST_TASK(rls)); /* Dummy */ DbusTestTask * dummy = dbus_test_task_new(); - dbus_test_task_set_wait_for(dummy, "com.canonical.RemoteLogin"); + dbus_test_task_set_wait_for(dummy, "org.ArcticaProject.RemoteLogon"); dbus_test_service_add_task(service, dummy); /* Get RLS up and running and us on that bus */ @@ -386,9 +386,9 @@ test_getservers_uccs (void) g_dbus_connection_set_exit_on_close(session, FALSE); GVariant * retval = g_dbus_connection_call_sync(session, - "com.canonical.RemoteLogin", - "/com/canonical/RemoteLogin", - "com.canonical.RemoteLogin", + "org.ArcticaProject.RemoteLogon", + "/org/ArcticaProject/RemoteLogon", + "org.ArcticaProject.RemoteLogon", "GetServers", NULL, /* params */ G_VARIANT_TYPE("(a(sssba(sbva{sv})a(si)))"), /* ret type */ @@ -444,13 +444,13 @@ test_getdomains_basic (void) DbusTestService * service = dbus_test_service_new(NULL); /* RLS */ - DbusTestProcess * rls = dbus_test_process_new(REMOTE_LOGIN_SERVICE); + DbusTestProcess * rls = dbus_test_process_new(REMOTE_LOGON_SERVICE); dbus_test_process_append_param(rls, "--config-file=" SLMOCK_CONFIG_FILE); dbus_test_service_add_task(service, DBUS_TEST_TASK(rls)); /* Dummy */ DbusTestTask * dummy = dbus_test_task_new(); - dbus_test_task_set_wait_for(dummy, "com.canonical.RemoteLogin"); + dbus_test_task_set_wait_for(dummy, "org.ArcticaProject.RemoteLogon"); dbus_test_service_add_task(service, dummy); /* Get RLS up and running and us on that bus */ @@ -461,9 +461,9 @@ test_getdomains_basic (void) GError * error = NULL; GVariant * retval = g_dbus_connection_call_sync(session, - "com.canonical.RemoteLogin", - "/com/canonical/RemoteLogin", - "com.canonical.RemoteLogin", + "org.ArcticaProject.RemoteLogon", + "/org/ArcticaProject/RemoteLogon", + "org.ArcticaProject.RemoteLogon", "GetCachedDomainsForServer", g_variant_new("(s)", "https://slmock.com/"), /* params */ G_VARIANT_TYPE("(as)"), /* ret type */ @@ -501,13 +501,13 @@ test_setlastused_basic (void) DbusTestService * service = dbus_test_service_new(NULL); /* RLS */ - DbusTestProcess * rls = dbus_test_process_new(REMOTE_LOGIN_SERVICE); + DbusTestProcess * rls = dbus_test_process_new(REMOTE_LOGON_SERVICE); dbus_test_process_append_param(rls, "--config-file=" SLMOCK_CONFIG_FILE); dbus_test_service_add_task(service, DBUS_TEST_TASK(rls)); /* Dummy */ DbusTestTask * dummy = dbus_test_task_new(); - dbus_test_task_set_wait_for(dummy, "com.canonical.RemoteLogin"); + dbus_test_task_set_wait_for(dummy, "org.ArcticaProject.RemoteLogon"); dbus_test_service_add_task(service, dummy); /* Get RLS up and running and us on that bus */ @@ -520,9 +520,9 @@ test_setlastused_basic (void) GError * error = NULL; GVariant * retval = g_dbus_connection_call_sync(session, - "com.canonical.RemoteLogin", - "/com/canonical/RemoteLogin", - "com.canonical.RemoteLogin", + "org.ArcticaProject.RemoteLogon", + "/org/ArcticaProject/RemoteLogon", + "org.ArcticaProject.RemoteLogon", "SetLastUsedServer", g_variant_new("(ss)", "Landscape", freerdp_server_table[1].uri), /* params */ NULL, /* ret type */ diff --git a/tests/null-config.conf b/tests/null-config.conf index 18184d0..f00a4f8 100644 --- a/tests/null-config.conf +++ b/tests/null-config.conf @@ -1,2 +1,2 @@ -[Remote Login Service] +[Remote Logon Service] DummyValue=This is intentionally left blank diff --git a/tests/slmock b/tests/slmock index b3b5019..1007328 100755 --- a/tests/slmock +++ b/tests/slmock @@ -65,7 +65,7 @@ def convert_to_builtin_type(obj): return d def freerdp(email): - ms = ManagementServer("http://tc.canonical.com", "Landscape") + ms = ManagementServer("http://tc.arctica-project.org", "Landscape") ts1 = TerminalServer("23.21.151.133", "FreeRDP US", "freerdp", False, "Administrator") ts2 = TerminalServer("46.137.222.181", "FreeRDP Asia", "freerdp", False, @@ -99,7 +99,7 @@ def error(email): print_error("Server did not respond") def citrix(email): - ms = ManagementServer("http://tc.canonical.com", "Landscape") + ms = ManagementServer("http://tc.arctica-project.org", "Landscape") ts1 = TerminalServer("107.21.17.35", "Citrix USA", "ICA", True, "useradmin1") ts2 = TerminalServer("107.21.17.35", "Citrix 2", "ICA", True, @@ -119,7 +119,7 @@ def citrix(email): print(ms.toJson()) def vmware(email): - ms = ManagementServer("http://tc.canonical.com", "Landscape") + ms = ManagementServer("http://tc.arctica-project.org", "Landscape") ts = TerminalServer("https://10.193.37.140", "VMWare-View Lexington", "vmware", True, "Administrator") ts.add_domain("VMWARE") @@ -127,7 +127,7 @@ def vmware(email): print(ms.toJson()) def defaults(email): - ms = ManagementServer("http://tc.canonical.com", "Landscape") + ms = ManagementServer("http://tc.arctica-project.org", "Landscape") ts1 = TerminalServer("https://10.10.10.10", "AAA", "vmware") ts2 = TerminalServer("https://10.10.10.10", "ZZZ", "vmware") ts3 = TerminalServer("https://10.10.10.10", "MMM-Default", "vmware", True) @@ -143,7 +143,7 @@ def defaults(email): # a choice of random problems in the json that the parser should catch def missing_fields(email): val = random.randint(1,4) - ms = ManagementServer("http://tc.canonical.com", "Landscape") + ms = ManagementServer("http://tc.arctica-project.org", "Landscape") ts3 = TerminalServer("https://10.10.10.10", "TS1-Default", "vmware", True) ts3.add_domain("VMWARE") ms.set_default(ts3.Name) @@ -169,7 +169,7 @@ def missing_fields(email): print(ms.toJson()) def big(email): - ms = ManagementServer("http://tc.canonical.com", "Landscape") + ms = ManagementServer("http://tc.arctica-project.org", "Landscape") ts1 = TerminalServer("107.21.17.35", "XenServer", "ICA") ts2 = TerminalServer("http://1.2.3.4", "Citrix2", "ICA", True, diff --git a/tests/slmock-config.conf.in b/tests/slmock-config.conf.in index ca285a9..153ab2e 100644 --- a/tests/slmock-config.conf.in +++ b/tests/slmock-config.conf.in @@ -1,4 +1,4 @@ -[Remote Login Service] +[Remote Logon Service] Servers=SLMock Server [Server SLMock Server] diff --git a/tests/uccs-config.conf b/tests/uccs-config.conf index ea1a82c..55a6573 100644 --- a/tests/uccs-config.conf +++ b/tests/uccs-config.conf @@ -1,4 +1,4 @@ -[Remote Login Service] +[Remote Logon Service] Servers=Test Server [Server Test Server] -- cgit v1.2.3