Revert "Fix test failures on non gnome-terminal in GNOME"

This reverts commit 740e375.
flatpak · Mar 14, 2024 · 10e6b2e · 10e6b2e
1 parent dcb493f
commit 10e6b2e
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 20 deletions.
diff --git a/tests/camera.c b/tests/camera.c
@@ -14,7 +14,6 @@ static int got_info;
 
 extern XdpDbusImplPermissionStore *permission_store;
 extern XdpDbusImplLockdown *lockdown;
-extern gchar *appid;
 
 static void
 set_camera_permissions (const char *permission)
@@ -27,7 +26,7 @@ set_camera_permissions (const char *permission)
                                                            "devices",
                                                            TRUE,
                                                            "camera",
-                                                           appid,
+                                                           "",
                                                            permissions,
                                                            NULL,
                                                            &error);

diff --git a/tests/inhibit.c b/tests/inhibit.c
@@ -8,7 +8,6 @@
 extern char outdir[];
 
 extern XdpDbusImplPermissionStore *permission_store;
-extern gchar *appid;
 
 static void
 set_inhibit_permissions (const char **permissions)
@@ -19,7 +18,7 @@ set_inhibit_permissions (const char **permissions)
                                                            "inhibit",
                                                            TRUE,
                                                            "inhibit",
-                                                           appid,
+                                                           "",
                                                            permissions,
                                                            NULL,
                                                            &error);

diff --git a/tests/limited-portals.c b/tests/limited-portals.c
@@ -52,7 +52,6 @@ static GDBusConnection *session_bus;
 static GList *test_procs = NULL;
 XdpDbusImplPermissionStore *permission_store;
 XdpDbusImplLockdown *lockdown;
-gchar *appid;
 
 int
 xdup (int oldfd)
@@ -138,7 +137,6 @@ global_setup (void)
   g_autofree gchar *argv0 = NULL;
   g_autoptr(GSubprocessLauncher) launcher = NULL;
   g_autoptr(GSubprocess) subprocess = NULL;
-  g_autoptr(XdpAppInfo) appinfo = NULL;
   guint name_timeout;
   const char *argv[4];
   GQuark portal_errors G_GNUC_UNUSED;
@@ -320,10 +318,6 @@ global_setup (void)
                                                     &error);
   g_assert_no_error (error);
 
-  appinfo = xdp_get_app_info_from_pid (getpid (), &error);
-  g_assert_no_error (error);
-  appid = g_strdup (xdp_app_info_get_id (appinfo));
-
   /* make sure errors are registered */
   portal_errors = XDG_DESKTOP_PORTAL_ERROR;
 }
@@ -380,7 +374,6 @@ global_teardown (void)
 
   g_object_unref (lockdown);
   g_object_unref (permission_store);
-  g_free (appid);
 
   g_object_unref (session_bus);
 

diff --git a/tests/test-portals.c b/tests/test-portals.c
@@ -51,7 +51,6 @@ static GDBusConnection *session_bus;
 static GList *test_procs = NULL;
 XdpDbusImplPermissionStore *permission_store;
 XdpDbusImplLockdown *lockdown;
-gchar *appid;
 
 int
 xdup (int oldfd)
@@ -137,7 +136,6 @@ global_setup (void)
   g_autofree gchar *argv0 = NULL;
   g_autoptr(GSubprocessLauncher) launcher = NULL;
   g_autoptr(GSubprocess) subprocess = NULL;
-  g_autoptr(XdpAppInfo) appinfo = NULL;
   guint name_timeout;
   const char *argv[4];
   GQuark portal_errors G_GNUC_UNUSED;
@@ -333,10 +331,6 @@ global_setup (void)
                                                     &error);
   g_assert_no_error (error);
 
-  appinfo = xdp_get_app_info_from_pid (getpid (), &error);
-  g_assert_no_error (error);
-  appid = g_strdup (xdp_app_info_get_id (appinfo));
-
   /* make sure errors are registered */
   portal_errors = XDG_DESKTOP_PORTAL_ERROR;
 }
@@ -393,7 +387,6 @@ global_teardown (void)
 
   g_object_unref (lockdown);
   g_object_unref (permission_store);
-  g_free (appid);
 
   g_object_unref (session_bus);
 

diff --git a/tests/wallpaper.c b/tests/wallpaper.c
@@ -10,7 +10,6 @@ extern char outdir[];
 static int got_info = 0;
 
 extern XdpDbusImplPermissionStore *permission_store;
-extern gchar *appid;
 
 static void
 set_wallpaper_permissions (const char *permission)
@@ -23,7 +22,7 @@ set_wallpaper_permissions (const char *permission)
                                                            "wallpaper",
                                                            TRUE,
                                                            "wallpaper",
-                                                           appid,
+                                                           "",
                                                            permissions,
                                                            NULL,
                                                            &error);