test: drop this directory

The remaining contents of the test/ directory are:

  - 2 python example programs that aren't as good as the ones in examples/

  - a test of the deprecated libnm_glib API which isn't as good as the one
    in libnm-glib/

  - A DHCP-related test program that hasn't been relevant since 2005

Let's just kill it all

8 files changed, 0 insertions, 508 deletions

diff --git a/.gitignore b/.gitignore
index 18fb67d45d..8706c98d4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -164,9 +164,6 @@ valgrind-*.log
 /src/supplicant-manager/tests/test-supplicant-config
 /src/dhcp-manager/nm-dhcp-helper
 /system-settings/src
-/test/libnm-glib-test
-/test/libnm_glib_test
-/test/nmtestdevices
 /libnm-util/nm-version.h
 /libnm-util/nm-setting-docs.xml
 /libnm-util/test-crypto
diff --git a/Makefile.am b/Makefile.am
index ea0bab0f9f..54992d42bf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,6 @@ SUBDIRS = \
 	tools \
 	policy \
 	data \
-	test \
 	po \
 	docs \
 	man \
diff --git a/configure.ac b/configure.ac
index 2185be5961..6d1aeb9f30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -843,7 +843,6 @@ clients/Makefile
 clients/cli/Makefile
 clients/tui/Makefile
 clients/tui/newt/Makefile
-test/Makefile
 initscript/RedHat/NetworkManager
 initscript/Debian/NetworkManager
 initscript/Slackware/rc.networkmanager
diff --git a/test/Makefile.am b/test/Makefile.am
deleted file mode 100644
index a03c15fa77..0000000000
--- a/test/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-AM_CPPFLAGS = \
-	-I${top_srcdir} \
-	-I${top_srcdir}/libnm-util \
-	-I${top_builddir}/libnm-util \
-	-I${top_srcdir}/libnm-glib \
-	-I${top_srcdir}/include \
-	$(DBUS_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
-	-DBINDIR=\"$(bindir)\" \
-	-DDATADIR=\"$(datadir)\" \
-	-DNMLOCALEDIR=\"$(datadir)/locale\"
-
-noinst_PROGRAMS = libnm-glib-test
-
-libnm_glib_test_SOURCES = libnm-glib-test.c
-libnm_glib_test_CFLAGS = \
-	-Wno-deprecated-declarations \
-	-Wno-deprecated
-libnm_glib_test_LDADD = \
-	$(top_builddir)/libnm-glib/libnm-glib.la \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(DBUS_LIBS) \
-	$(GLIB_LIBS)
-
diff --git a/test/add-connection.py b/test/add-connection.py
deleted file mode 100755
index 4458824417..0000000000
--- a/test/add-connection.py
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env python
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Copyright (C) 2010 Red Hat, Inc.
-#
-
-import dbus
-import sys
-
-s_wired = dbus.Dictionary({'duplex': 'full'})
-s_con = dbus.Dictionary({
-            'type': '802-3-ethernet',
-            'uuid': '7371bb78-c1f7-42a3-a9db-5b9566e8ca07',
-            'id': sys.argv[1]})
-
-if len(sys.argv) > 2:
-    s_con['permissions'] = ["user:%s:" % sys.argv[2]]
-
-addr1 = dbus.Array([dbus.UInt32(50462986L), dbus.UInt32(8L), dbus.UInt32(16908554L)], signature=dbus.Signature('u'))
-s_ip4 = dbus.Dictionary({
-            'addresses': dbus.Array([addr1], signature=dbus.Signature('au')),
-            'method': 'manual'})
-
-s_ip6 = dbus.Dictionary({'method': 'ignore'})
-
-con = dbus.Dictionary({
-    '802-3-ethernet': s_wired,
-    'connection': s_con,
-    'ipv4': s_ip4,
-    'ipv6': s_ip6})
-
-
-bus = dbus.SystemBus()
-
-proxy = bus.get_object("org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager/Settings")
-settings = dbus.Interface(proxy, "org.freedesktop.NetworkManager.Settings")
-
-new_con_path = settings.AddConnection(con)
-
-con_proxy = bus.get_object("org.freedesktop.NetworkManager", new_con_path)
-con = dbus.Interface(con_proxy, "org.freedesktop.NetworkManager.Settings.Connection")
-
-print "New connection object path: %s" % new_con_path
-print con.GetSettings()
-
-
diff --git a/test/libnm-glib-test.c b/test/libnm-glib-test.c
deleted file mode 100644
index 9ad1dc0a7a..0000000000
--- a/test/libnm-glib-test.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* libnm_glib_test - test app for libnm_glib
- *
- * Dan Williams <dcbw@redhat.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * (C) Copyright 2005 Red Hat, Inc.
- */
-
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-
-#include "libnm_glib.h"
-
-
-static void status_printer (libnm_glib_ctx *ctx, gpointer user_data)
-{
-	libnm_glib_state	state;
-
-	g_return_if_fail (ctx != NULL);
-
-	state = libnm_glib_get_network_state (ctx);
-	switch (state)
-	{
-		case LIBNM_NO_DBUS:
-			fprintf (stderr, "Status: No DBUS\n");
-			break;
-		case LIBNM_NO_NETWORKMANAGER:
-			fprintf (stderr, "Status: No NetworkManager\n");
-			break;
-		case LIBNM_NO_NETWORK_CONNECTION:
-			fprintf (stderr, "Status: No Connection\n");
-			break;
-		case LIBNM_ACTIVE_NETWORK_CONNECTION:
-			fprintf (stderr, "Status: Active Connection\n");
-			break;
-		case LIBNM_INVALID_CONTEXT:
-			fprintf (stderr, "Status: Error\n");
-			break;
-		default:
-			fprintf (stderr, "Status: unknown\n");
-			break;
-	}
-}
-
-static GMainLoop *loop = NULL;
-
-static void
-signal_handler (int signo)
-{
-	if (signo == SIGINT || signo == SIGTERM) {
-		g_message ("Caught signal %d, shutting down...", signo);
-		g_main_loop_quit (loop);
-	}
-}
-
-static void
-setup_signals (void)
-{
-	struct sigaction action;
-	sigset_t mask;
-
-	sigemptyset (&mask);
-	action.sa_handler = signal_handler;
-	action.sa_mask = mask;
-	action.sa_flags = 0;
-	sigaction (SIGTERM,  &action, NULL);
-	sigaction (SIGINT,  &action, NULL);
-}
-
-int main( int argc, char *argv[] )
-{
-	libnm_glib_ctx *ctx;
-	guint id;
-
-	ctx = libnm_glib_init ();
-	if (!ctx)
-	{
-		fprintf (stderr, "Could not initialize libnm.\n");
-		exit (1);
-	}
-
-	id = libnm_glib_register_callback (ctx, status_printer, ctx, NULL);
-	fprintf (stderr, "Registered Callback with ID %d\n", id);
-	libnm_glib_unregister_callback (ctx, id);
-	fprintf (stderr, "Unregistered Callback with ID %d\n", id);
-
-	id = libnm_glib_register_callback (ctx, status_printer, ctx, NULL);
-	fprintf (stderr, "Registered Callback with ID %d\n", id);
-
-	loop = g_main_loop_new (NULL, FALSE);
-	setup_signals ();
-	g_main_loop_run (loop);
-
-	libnm_glib_shutdown (ctx);
-
-	exit (0);
-}
diff --git a/test/nm-dhcp-opt-test.c b/test/nm-dhcp-opt-test.c
deleted file mode 100644
index 9fe2e699f5..0000000000
--- a/test/nm-dhcp-opt-test.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/* nm-dhcp-opt-test - test app for NetworkManager's DHCP Options interface
- *
- * Dan Williams <dcbw@redhat.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * (C) Copyright 2005 Red Hat, Inc.
- */
-
-#include <glib.h>
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include "NetworkManager.h"
-
-/* Return codes for functions that use dbus */
-enum
-{
-	RETURN_SUCCESS = 1,
-	RETURN_FAILURE = 0,
-	RETURN_NO_NM = -1
-};
-
-
-#define	DBUS_NO_SERVICE_ERROR			"org.freedesktop.DBus.Error.ServiceDoesNotExist"
-#define	NM_DHCP_OPT_NOT_FOUND_ERROR		"org.freedesktop.NetworkManager.OptionNotFound"
-
-static char *dbus_type_to_string (int type)
-{
-	switch (type)
-	{
-		case DBUS_TYPE_UINT32:
-			return "uint32";
-
-		case DBUS_TYPE_BOOLEAN:
-			return "boolean";
-
-		case DBUS_TYPE_BYTE:
-			return "byte";
-
-		case DBUS_TYPE_STRING:
-			return "string";
-	}
-	g_assert_not_reached ();
-	return NULL;
-}
-
-
-/*
- * call_nm_method
- *
- * Do a method call on NetworkManager.
- *
- * Returns:	RETURN_SUCCESS on success
- *			RETURN_FAILURE on failure
- *			RETURN_NO_NM if NetworkManager service no longer exists
- */
-static int call_nm_method (DBusConnection *con, const char *method, int opt, gboolean is_array, int arg_type, void **arg, int *item_count)
-{
-	DBusMessage	*message;
-	DBusMessage	*reply;
-	DBusError		 error;
-	dbus_bool_t	 ret = TRUE;
-	DBusMessageIter iter;
-
-	g_return_val_if_fail (con != NULL, RETURN_FAILURE);
-	g_return_val_if_fail (method != NULL, RETURN_FAILURE);
-	g_return_val_if_fail (arg != NULL, RETURN_FAILURE);
-
-	if (is_array)
-	{
-		g_return_val_if_fail (item_count != NULL, RETURN_FAILURE);
-		*item_count = 0;
-	}
-
-	if (!(message = dbus_message_new_method_call (NM_DBUS_SERVICE, NM_DBUS_PATH_DHCP, NM_DBUS_INTERFACE_DHCP, method)))
-	{
-		fprintf (stderr, "call_nm_method(): Couldn't allocate the dbus message\n");
-		return (RETURN_FAILURE);
-	}
-	dbus_message_append_args (message, DBUS_TYPE_UINT32, &opt, DBUS_TYPE_INVALID);
-
-	dbus_error_init (&error);
-	reply = dbus_connection_send_with_reply_and_block (con, message, -1, &error);
-	dbus_message_unref (message);
-	if (dbus_error_is_set (&error))
-	{
-		int	ret = RETURN_FAILURE;
-
-		if (!strcmp (error.name, DBUS_NO_SERVICE_ERROR))
-			ret = RETURN_NO_NM;
-
-		if (ret != RETURN_SUCCESS && (strcmp (error.name, NM_DHCP_OPT_NOT_FOUND_ERROR) != 0))
-			fprintf (stderr, "call_nm_method(): %s raised:\n %s\n\n", error.name, error.message);
-
-		dbus_error_free (&error);
-		return (ret);
-	}
-
-	if (reply == NULL)
-	{
-		fprintf (stderr, "call_nm_method(): dbus reply message was NULL\n" );
-		return (RETURN_FAILURE);
-	}
-
-	if (is_array)
-		ret = dbus_message_get_args (reply, NULL, DBUS_TYPE_ARRAY, arg_type, arg, item_count, DBUS_TYPE_INVALID);
-	else
-		ret = dbus_message_get_args (reply, NULL, arg_type, arg, DBUS_TYPE_INVALID);
-
-/*
-  We simply don't unref the message, so that the values returned stay
-  valid in the caller of this function.
-	dbus_message_unref (reply);
-*/
-	if (!ret)
-	{
-		fprintf (stderr, "call_nm_method(): error while getting args.\n");
-		return (RETURN_FAILURE);
-	}
-
-	return (RETURN_SUCCESS);
-}
-
-void print_array (DBusConnection *connection, int opt)
-{
-	int num_items;
-	unsigned int	*uint32 = NULL;
-	int			*int32 = NULL;
-	gboolean		*bool = NULL;
-	unsigned char	*byte = NULL;
-	char			**string = NULL;
-	void			*item = NULL;
-	char			*method = NULL;
-	int			 ret;
-	const char	*name = NULL;
-	int			 opt_type = -1;
-	unsigned int foo;
-	char buf[INET_ADDRSTRLEN+1];
-
-	memset (&buf, '\0', sizeof (buf));
-
-	ret = call_nm_method (connection, "getName", opt, FALSE, DBUS_TYPE_STRING, (void *)(&name), NULL);
-	if (ret != RETURN_SUCCESS)
-		return;
-
-	ret = call_nm_method (connection, "getElementType", opt, FALSE, DBUS_TYPE_UINT32, (void *)(&opt_type), NULL);
-	if (ret != RETURN_SUCCESS)
-		return;
-
-	switch (opt_type)
-	{
-		case DBUS_TYPE_UINT32:
-			item = &uint32;
-			method = "getInteger";
-			break;
-
-		case DBUS_TYPE_BOOLEAN:
-			item = &bool;
-			method = "getBoolean";
-			break;
-
-		case DBUS_TYPE_BYTE:
-			item = &byte;
-			method = "getByte";
-			break;
-
-		case DBUS_TYPE_STRING:
-			item = &string;
-			method = "getString";
-			break;
-
-		default:
-			fprintf (stderr, "%d: Type %c\n", opt, opt_type);
-			g_assert_not_reached ();
-			break;
-	}
-
-	ret = call_nm_method (connection, method, opt, TRUE, opt_type, item, &num_items);
-	if ((ret == RETURN_SUCCESS) && (num_items > 0))
-	{
-		int i;
-		fprintf (stderr, "%d ('%s'): (%d %s of type %s)  ", opt, name, num_items, num_items > 1 ? "elements" : "element", dbus_type_to_string (opt_type));
-		for (i = 0; i < num_items; i++)
-		{
-			guint32	in;
-			gboolean	last = (i == num_items - 1) ? TRUE : FALSE;
-
-			switch (opt_type)
-			{
-				case DBUS_TYPE_BYTE:
-					fprintf (stderr, "%d%s", byte[i], last ? "" : ", ");
-					break;
-				case DBUS_TYPE_BOOLEAN:
-					fprintf (stderr, "%d%s", bool[i], last ? "" : ", ");
-					break;
-				case DBUS_TYPE_UINT32:
-					in = uint32[i];
-					if (!inet_ntop (AF_INET, &in, buf, INET_ADDRSTRLEN))
-						nm_warning ("%s: error converting IP4 address 0x%X",
-						            __func__, ntohl (in));
-					else
-						fprintf (stderr, "%u (%s)%s", uint32[i], buf, last ? "" : ", ");
-					break;
-				case DBUS_TYPE_STRING:
-					fprintf (stderr, "'%s'%s", string[i], last ? "" : ", ");
-					break;
-
-				default:
-					g_assert_not_reached ();
-					break;
-			}
-		}
-		fprintf (stderr, "\n");
-	}
-	else
-		fprintf (stderr, "%d ('%s'): could not get option value\n", opt, name);
-}
-
-
-void print_each_dhcp_option (DBusConnection *connection)
-{
-	DBusMessage	*message;
-	DBusMessage	*reply;
-	DBusMessageIter iter;
-	DBusError		 error;
-	int			 i;
-	int			 opt_type;
-	int			 ret;
-
-	g_return_if_fail (connection != NULL);
-
-	/* Loop through all available DHCP options and print each one. */
-	for (i = 1; i < 62; i++)
-		print_array (connection, i);
-}
-
-
-int main (int argc, char **argv)
-{
-	DBusConnection *connection;
-	DBusError		 error;
-
-#if !GLIB_CHECK_VERSION (2, 35, 0)
-	g_type_init ();
-#endif
-
-	dbus_error_init (&error);
-	connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
-	if (connection == NULL)
-	{
-		fprintf (stderr, "Error connecting to system bus: %s\n", error.message);
-		dbus_error_free (&error);
-		return 1;
-	}
-
-	print_each_dhcp_option (connection);
-
-	exit (0);
-}
diff --git a/test/set-hostname.py b/test/set-hostname.py
deleted file mode 100755
index 283db367b7..0000000000
--- a/test/set-hostname.py
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env python
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Copyright (C) 2010 Red Hat, Inc.
-#
-
-import dbus
-import sys
-
-bus = dbus.SystemBus()
-proxy = bus.get_object("org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager/Settings")
-settings = dbus.Interface(proxy, "org.freedesktop.NetworkManager.Settings")
-settings.SaveHostname(sys.argv[1])
-