aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hua <william.hua@canonical.com>2013-06-24 17:16:17 -0400
committerWilliam Hua <william.hua@canonical.com>2013-06-24 17:16:17 -0400
commit900fadf5e6e12f21d3dedf4b0bd0636cbfca6313 (patch)
treed636118db8112d410197cc13381b266e5ddc60a0
parent0a4f042f3cbed0359c46c3da702821fd6244be2b (diff)
downloadayatana-indicator-keyboard-900fadf5e6e12f21d3dedf4b0bd0636cbfca6313.tar.gz
ayatana-indicator-keyboard-900fadf5e6e12f21d3dedf4b0bd0636cbfca6313.tar.bz2
ayatana-indicator-keyboard-900fadf5e6e12f21d3dedf4b0bd0636cbfca6313.zip
Remove autopilot support.
-rw-r--r--configure.ac5
-rw-r--r--debian/changelog6
-rw-r--r--debian/control12
-rw-r--r--debian/indicator-keyboard-autopilot.install1
-rw-r--r--debian/indicator-keyboard.install3
-rw-r--r--tests/Makefile.am1
-rw-r--r--tests/autopilot/Makefile.am5
-rw-r--r--tests/autopilot/__init__.py6
-rwxr-xr-xtests/autopilot/test.sh6
-rw-r--r--tests/autopilot/tests/Makefile.am1
-rw-r--r--tests/autopilot/tests/__init__.py0
-rw-r--r--tests/autopilot/tests/test_indicator_keyboard.py55
12 files changed, 7 insertions, 94 deletions
diff --git a/configure.ac b/configure.ac
index 1d0159ba..dd582f47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,8 +33,6 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [The prefix for our
AM_GLIB_GNU_GETTEXT
IT_PROG_INTLTOOL
-AM_PATH_PYTHON
-
PKG_CHECK_MODULES([GEE], [gee-1.0])
AC_SUBST([GEE_CFLAGS])
AC_SUBST([GEE_LIBS])
@@ -75,7 +73,6 @@ AC_CONFIG_FILES([Makefile
data/Makefile
lib/Makefile
po/Makefile.in
- tests/Makefile
- tests/autopilot/Makefile])
+ tests/Makefile])
AC_OUTPUT
diff --git a/debian/changelog b/debian/changelog
index 7aeab3cb..56eea585 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+indicator-keyboard (0.0.0-0ubuntu16) saucy; urgency=low
+
+ * Remove autopilot support.
+
+ -- William Hua <william.hua@canonical.com> Mon, 24 Jun 2013 17:13:03 -0400
+
indicator-keyboard (0.0.0-0ubuntu15) saucy; urgency=low
* Experimental non-null support.
diff --git a/debian/control b/debian/control
index 3f35ffa8..bcfab405 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,6 @@ Build-Depends: debhelper (>= 9.0.0),
libgnomekbd-dev,
libibus-1.0-dev (>= 1.5.0),
libbamf3-dev,
- python-support,
quilt
Standards-Version: 3.9.4
Homepage: https://code.launchpad.net/indicator-keyboard
@@ -31,14 +30,3 @@ Depends: ${shlibs:Depends},
${misc:Depends}
Description: Keyboard indicator
This package contains the keyboard indicator.
-
-Package: indicator-keyboard-autopilot
-Architecture: all
-Depends: ${misc:Depends},
- ${python:Depends},
- indicator-keyboard (>= ${source:Version}),
- libautopilot-gtk,
- python-autopilot,
- python-pyatspi
-Description: Keyboard indicator autopilot tests
- This package provides autopilot integration tests for indicator-keyboard.
diff --git a/debian/indicator-keyboard-autopilot.install b/debian/indicator-keyboard-autopilot.install
deleted file mode 100644
index 48b4ad56..00000000
--- a/debian/indicator-keyboard-autopilot.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python*/dist-packages/indicator_keyboard/*
diff --git a/debian/indicator-keyboard.install b/debian/indicator-keyboard.install
deleted file mode 100644
index 65e98809..00000000
--- a/debian/indicator-keyboard.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/indicator-keyboard-service
-usr/share/dbus-1/services/indicator-keyboard.service
-usr/share/unity/indicators/com.canonical.indicator.keyboard
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ac047e60..e69de29b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1 +0,0 @@
-SUBDIRS = autopilot
diff --git a/tests/autopilot/Makefile.am b/tests/autopilot/Makefile.am
deleted file mode 100644
index 2af361a7..00000000
--- a/tests/autopilot/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-autopilotdir = $(pythondir)/indicator_keyboard
-autopilot_DATA = __init__.py
-
-autopilottestsdir = $(autopilotdir)/tests
-autopilottests_DATA = tests/__init__.py tests/test_indicator_keyboard.py
diff --git a/tests/autopilot/__init__.py b/tests/autopilot/__init__.py
deleted file mode 100644
index c9bdd5c3..00000000
--- a/tests/autopilot/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
-#
-# This file is part of indicator-keyboard.
-
-"""indicator-keyboard autopilot tests - top level package."""
diff --git a/tests/autopilot/test.sh b/tests/autopilot/test.sh
deleted file mode 100755
index 7c3a0ad4..00000000
--- a/tests/autopilot/test.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-for name in `autopilot list tests | head -n -3 | tail -n +3`
-do
- autopilot run $name || exit 1
-done
diff --git a/tests/autopilot/tests/Makefile.am b/tests/autopilot/tests/Makefile.am
deleted file mode 100644
index 06deff91..00000000
--- a/tests/autopilot/tests/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-check_PYTHON = __init__.py test_indicator_keyboard.py
diff --git a/tests/autopilot/tests/__init__.py b/tests/autopilot/tests/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/tests/autopilot/tests/__init__.py
+++ /dev/null
diff --git a/tests/autopilot/tests/test_indicator_keyboard.py b/tests/autopilot/tests/test_indicator_keyboard.py
deleted file mode 100644
index 4327d26d..00000000
--- a/tests/autopilot/tests/test_indicator_keyboard.py
+++ /dev/null
@@ -1,55 +0,0 @@
-import autopilot.introspection.gtk
-import os
-import pyatspi.registry
-import pyatspi.utils
-import time
-import unity.tests
-
-def print_accessible(root, level=0):
- print level * ' ', root
-
- for node in root:
- print_accessible(node, level + 1)
-
-def get_accessible_with_name_and_role(root, name, role):
- is_accessible = lambda a: a.name == name and a.get_role_name() == role
- return pyatspi.utils.findDescendant(root, is_accessible, True);
-
-def get_panel_accessible(root):
- return get_accessible_with_name_and_role(root, 'unity-panel-service', 'application')
-
-def get_app_menu_accessible(root):
- is_app_menu = lambda a: len(a) > 0 and a[0].name == 'File' and a[0].get_role_name() == 'label'
- return pyatspi.utils.findDescendant(root, is_app_menu, True)
-
-def get_label_accessible_with_name(root, name):
- return get_accessible_with_name_and_role(root, name, 'label')
-
-def get_submenu_accessible(root):
- return root[0]
-
-def get_menu_item_accessible_with_name(root, name):
- is_menu_item = lambda a: a.name == name and a.get_role_name() in ('menu item', 'check menu item', 'radio menu item')
- return pyatspi.utils.findDescendant(root, is_menu_item, True);
-
-def get_accessible_index(root, node):
- for i in xrange(len(root)):
- if root[i] == node:
- return i
-
- return -1
-
-class IndicatorKeyboardTestCase(unity.tests.UnityTestCase):
-
- def setUp(self):
- super(IndicatorKeyboardTestCase, self).setUp()
-
- registry = pyatspi.registry.Registry()
- self.desktop = registry.getDesktop(0)
-
- # This is needed on systems other than the EN locale
- os.putenv("LC_ALL", "C")
- self.addCleanup(os.unsetenv, "LC_ALL")
-
- def test_character_map(self):
- print_accessible(self.desktop)