summaryrefslogtreecommitdiff
path: root/tests/twisted
diff options
context:
space:
mode:
Diffstat (limited to 'tests/twisted')
-rw-r--r--tests/twisted/config.py.in1
-rw-r--r--tests/twisted/meson.build93
-rw-r--r--tests/twisted/messages/invalid-utf8.py2
-rw-r--r--tests/twisted/tools/idletest.cert26
-rw-r--r--tests/twisted/tools/idletest.key32
-rw-r--r--tests/twisted/tools/meson.build22
6 files changed, 160 insertions, 16 deletions
diff --git a/tests/twisted/config.py.in b/tests/twisted/config.py.in
new file mode 100644
index 0000000..d0228f1
--- /dev/null
+++ b/tests/twisted/config.py.in
@@ -0,0 +1 @@
+PACKAGE_STRING = "@PACKAGE_STRING@"
diff --git a/tests/twisted/meson.build b/tests/twisted/meson.build
new file mode 100644
index 0000000..7e39d4b
--- /dev/null
+++ b/tests/twisted/meson.build
@@ -0,0 +1,93 @@
+twisted_tests = [
+ 'cm/protocol.py',
+ 'connect/connect-close-ssl.py',
+ 'connect/connect-success.py',
+ 'connect/connect-success-ssl.py',
+ 'connect/connect-reject-ssl.py',
+ 'connect/connect-fail.py',
+ 'connect/connect-fail-ssl.py',
+ 'connect/disconnect-before-socket-connected.py',
+ 'connect/disconnect-during-cert-verification.py',
+ 'connect/ping.py',
+ 'connect/server-quit-ignore.py',
+ 'connect/server-quit-noclose.py',
+ 'connect/socket-closed-after-handshake.py',
+ 'connect/socket-closed-during-handshake.py',
+ 'connect/invalid-nick.py',
+ 'contacts.py',
+ 'channels/join-muc-channel.py',
+ 'channels/join-muc-channel-bouncer.py',
+ 'channels/requests-create.py',
+ 'channels/requests-muc.py',
+ 'channels/muc-channel-topic.py',
+ 'channels/muc-destroy.py',
+ 'channels/room-list-channel.py',
+ 'channels/room-list-multiple.py',
+ 'irc-command.py',
+ 'messages/accept-invalid-nicks.py',
+ 'messages/contactinfo-request.py',
+ 'messages/invalid-utf8.py',
+ 'messages/messages-iface.py',
+ 'messages/message-order.py',
+ 'messages/leading-space.py',
+ 'messages/long-message-split.py',
+ 'messages/room-contact-mixup.py',
+ 'messages/room-config.py',
+]
+
+twisted_conf = configuration_data()
+twisted_conf.set_quoted('PACKAGE_STRING', package_string)
+
+configure_file(
+ input: 'config.py.in',
+ output: '@BASENAME@',
+ configuration: twisted_conf,
+)
+
+if get_option('twisted_sleep') == '0'
+ idle_test_sleep = ''
+else
+ idle_test_sleep = '--sleep=@0@'.format(get_option('twisted_sleep'))
+endif
+
+# idle-twisted-tests.list
+test_list = custom_target('idle-twisted-tests.list',
+ output: 'idle-twisted-tests.list',
+ command: ['echo', '\n'.join(twisted_tests)],
+ capture: true,
+)
+
+# We don't really use idletestsdir yet - we only support uninstalled testing
+# so far - but I'm substituting it to keep the script more similar to Gabble's.
+# ${pkglibexecdir}/tests is what GNOME's InstalledTests goal recommends.
+
+abs_top_srcdir = meson.source_root()
+abs_top_builddir = meson.build_root()
+
+run_test_conf = configuration_data()
+run_test_conf.set('idletestsdir', join_paths(pkglibexecdir, 'tests'))
+run_test_conf.set('TEST_PYTHON', test_python)
+
+run_test = configure_file(
+ input: 'run-test.sh.in',
+ output: '@BASENAME@',
+ configuration: run_test_conf,
+)
+
+test(
+ 'check',
+ run_test,
+ args: twisted_tests,
+ env: [
+ 'IDLE_TEST_UNINSTALLED=1',
+ 'IDLE_ABS_TOP_SRCDIR=@0@'.format(abs_top_srcdir),
+ 'IDLE_ABS_TOP_BUILDDIR=@0@'.format(abs_top_builddir),
+ 'IDLE_TEST_SLEEP=@0@'.format(idle_test_sleep),
+ ],
+ depends: [
+ test_list,
+ ],
+ suite: 'twisted',
+)
+
+subdir('tools')
diff --git a/tests/twisted/messages/invalid-utf8.py b/tests/twisted/messages/invalid-utf8.py
index a48c2f4..725e3bd 100644
--- a/tests/twisted/messages/invalid-utf8.py
+++ b/tests/twisted/messages/invalid-utf8.py
@@ -33,7 +33,7 @@ def test_with_message(q, stream, parts):
# Idle's default character set is UTF-8. We send it a message which is
# basically UTF-8, except that one of its code points is invalid.
- stream.sendMessage('PRIVMSG', stream.nick, ':%s' % invalid_utf8,
+ stream.sendMessage('PRIVMSG', bytes(stream.nick), ':%s' % invalid_utf8,
prefix='remoteuser')
# Idle should signal that *something* was received. If it hasn't validated
diff --git a/tests/twisted/tools/idletest.cert b/tests/twisted/tools/idletest.cert
index 655abc2..7ea6bcc 100644
--- a/tests/twisted/tools/idletest.cert
+++ b/tests/twisted/tools/idletest.cert
@@ -1,10 +1,20 @@
-----BEGIN CERTIFICATE-----
-MIIBTzCB+gIBATANBgkqhkiG9w0BAQQFADAzMRIwEAYDVQQKEwl0ZWxlcGF0aHkx
-HTAbBgNVBAsTFHRlbGVwYXRoeSBkZXZlbG9wZXJzMB4XDTA5MDExNDE3NDc0N1oX
-DTA5MDExNDE3NDg0N1owMzESMBAGA1UEChMJdGVsZXBhdGh5MR0wGwYDVQQLExR0
-ZWxlcGF0aHkgZGV2ZWxvcGVyczBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC9z/pi
-zEMeL+bO3giJVGHGrOHLE7AfDorArwmA0u8Cgu06+J+SW+NJnkj8At4bioxREge6
-yeD6+cHCC9kzXrmXAgMBAAEwDQYJKoZIhvcNAQEEBQADQQBf1qg0gzSztx5pqqM8
-3wI5cEc7k13EzU6X2SkSCSxlMc4pF0hPdr0LuZJpeKBohIgKQ59+3Ny0LuUMEKYW
-ikGr
+MIIDUDCCAjigAwIBAgIBATANBgkqhkiG9w0BAQsFADAzMRIwEAYDVQQKEwl0ZWxl
+cGF0aHkxHTAbBgNVBAsTFHRlbGVwYXRoeSBkZXZlbG9wZXJzMB4XDTE3MTEwNTAw
+NTEwMFoXDTE4MTEwNTAwNTEwMFowMzESMBAGA1UEChMJdGVsZXBhdGh5MR0wGwYD
+VQQLExR0ZWxlcGF0aHkgZGV2ZWxvcGVyczCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAL3wfZoTzmJqQyjw0tToAflpdmQMTNpzgXvH+uiuu4rWk7oGJsBN
+HZfe4gkoYNLL8PwOGEQcIUN4Y0JU/mc9mSe44Vi0G0t/uJ/gI+CNtHzHjwtwCnYP
+XsbCE69CsarvDVbsQHS6kWfgCYxMA0l+cydUfxuyIoFWjeM4hZs0JwdBGBTAtZkj
+3xo+7Ee3xNBaaOtmoJO/QduAVA0UgiWU69m7Q+5aIuIl9PGOSL4MHqNXq/nwX5Ky
+aFBpXdzmrVn8BophkBgOawp0e+Rhk5fCelyy54lIfpUxeOTP6EtAgsZYbZBPjsuz
+8ewJbdnzcOCwTJpKQv9aHhkTKcK2PkN6tJMCAwEAAaNvMG0wDAYDVR0TAQH/BAIw
+ADAdBgNVHQ4EFgQUuG8blqmQ1SEj/x5OhBc58XFv6vcwCwYDVR0PBAQDAgXgMBEG
+CWCGSAGG+EIBAQQEAwIGQDAeBglghkgBhvhCAQ0EERYPeGNhIGNlcnRpZmljYXRl
+MA0GCSqGSIb3DQEBCwUAA4IBAQBJCT/EPWqv/wUDn7jK4nRXXXwtIL7eYYTAvcJh
+gxtrkkNB1LAp6mnb1WOw+Wbdpf2IgTqfAvpzCRL+kCM80Pqh365JlA5JflzhWxsJ
+xtJQfNfiZhgXKN1rm5lT+U/WgGR6A1serbxUiRN2O6wB8nxtoc7sBJh18pcrwpam
+vOGAolbePV8HPfyBRkCnSw1X6BdifEtxlRCfVWELSI6xQHX8OPTU+uGcvte5uAEi
+7CRRJHlUoojyLOxlJ6IeXh7MjrDIi6tHDqVR9MlRRN3oXhvsN/TtsZUuuC7s280W
+oapk/x7WNDSQsdsi0bmTLrJoZgHzaPRJPCwBFzbj/T1kCC0B
-----END CERTIFICATE-----
diff --git a/tests/twisted/tools/idletest.key b/tests/twisted/tools/idletest.key
index 3a80dab..d579266 100644
--- a/tests/twisted/tools/idletest.key
+++ b/tests/twisted/tools/idletest.key
@@ -1,9 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/tests/twisted/tools/meson.build b/tests/twisted/tools/meson.build
new file mode 100644
index 0000000..c3d28b6
--- /dev/null
+++ b/tests/twisted/tools/meson.build
@@ -0,0 +1,22 @@
+ewl_conf = configuration_data()
+ewl_conf.set('abs_top_builddir', abs_top_builddir)
+ewl_conf.set('abs_top_srcdir', abs_top_srcdir)
+
+configure_file(
+ input: 'exec-with-log.sh.in',
+ output: '@BASENAME@',
+ configuration: ewl_conf,
+)
+
+configure_file(
+ input: 'tmp-session-bus.conf.in',
+ output: '@BASENAME@',
+ configuration: ewl_conf,
+)
+
+# D-Bus service file for testing
+configure_file(
+ input: 'idle.service.in',
+ output: 'org.freedesktop.Telepathy.ConnectionManager.idle.service',
+ configuration: ewl_conf,
+)