From 7b2bf92cdc00e346a2b10b19d86b440778b11e09 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Fri, 30 Jun 2017 12:03:31 +0100
Subject: [PATCH] Revert "test/uid-permissions: Assert that AddContainerServer
 is privileged"

I'm about to make that not be true.

This reverts commit 80c7e13cb500c7ffea1b6adff6664c3e36c496f3.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 test/uid-permissions.c | 76 --------------------------------------------------
 1 file changed, 76 deletions(-)

diff --git a/test/uid-permissions.c b/test/uid-permissions.c
index 6cb07353..19a9aa46 100644
--- a/test/uid-permissions.c
+++ b/test/uid-permissions.c
@@ -206,73 +206,6 @@ test_monitor (Fixture *f,
 }
 
 static void
-test_containers (Fixture *f,
-                 gconstpointer context)
-{
-#ifdef DBUS_ENABLE_CONTAINERS
-  const Config *config = context;
-#endif
-  DBusMessage *m;
-  DBusPendingCall *pc;
-
-  if (f->skip)
-    return;
-
-  /* We cheat and pass the wrong arguments, because passing an a{sv} with
-   * the libdbus API is really long-winded. The bus driver code checks
-   * for privileged or unprivileged access before it checks the arguments
-   * anyway. */
-  m = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
-      DBUS_PATH_DBUS, DBUS_INTERFACE_CONTAINERS1, "AddContainerServer");
-
-  if (m == NULL)
-    g_error ("OOM");
-
-  if (!dbus_connection_send_with_reply (f->conn, m, &pc,
-                                        DBUS_TIMEOUT_USE_DEFAULT) ||
-      pc == NULL)
-    g_error ("OOM");
-
-  dbus_message_unref (m);
-  m = NULL;
-
-  if (dbus_pending_call_get_completed (pc))
-    test_pending_call_store_reply (pc, &m);
-  else if (!dbus_pending_call_set_notify (pc, test_pending_call_store_reply,
-                                          &m, NULL))
-    g_error ("OOM");
-
-  while (m == NULL)
-    test_main_context_iterate (f->ctx, TRUE);
-
-#ifdef DBUS_ENABLE_CONTAINERS
-  if (config->expect_success)
-    {
-      /* It would have succeeded if we'd passed the right arguments! */
-      g_assert_cmpint (dbus_message_get_type (m), ==, DBUS_MESSAGE_TYPE_ERROR);
-      g_assert_cmpstr (dbus_message_get_error_name (m), ==,
-          DBUS_ERROR_INVALID_ARGS);
-      g_assert_cmpstr (dbus_message_get_signature (m), ==, "s");
-    }
-  else
-    {
-      /* It fails, yielding an error message with one string argument */
-      g_assert_cmpint (dbus_message_get_type (m), ==, DBUS_MESSAGE_TYPE_ERROR);
-      g_assert_cmpstr (dbus_message_get_error_name (m), ==,
-          DBUS_ERROR_ACCESS_DENIED);
-      g_assert_cmpstr (dbus_message_get_signature (m), ==, "s");
-    }
-#else
-  g_assert_cmpint (dbus_message_get_type (m), ==, DBUS_MESSAGE_TYPE_ERROR);
-  g_assert_cmpstr (dbus_message_get_error_name (m), ==,
-      DBUS_ERROR_UNKNOWN_INTERFACE);
-  g_assert_cmpstr (dbus_message_get_signature (m), ==, "s");
-#endif
-
-  dbus_message_unref (m);
-}
-
-static void
 teardown (Fixture *f,
     gconstpointer context G_GNUC_UNUSED)
 {
@@ -337,14 +270,5 @@ main (int argc,
   g_test_add ("/uid-permissions/monitor/other", Fixture, &other_fail_config,
       setup, test_monitor, teardown);
 
-  /* AddContainerServer has the same behaviour */
-  g_test_add ("/uid-permissions/containers/root", Fixture, &root_ok_config,
-      setup, test_containers, teardown);
-  g_test_add ("/uid-permissions/containers/messagebus", Fixture,
-      &messagebus_ok_config,
-      setup, test_containers, teardown);
-  g_test_add ("/uid-permissions/containers/other", Fixture, &other_fail_config,
-      setup, test_containers, teardown);
-
   return g_test_run ();
 }
-- 
2.13.2