mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-08-02 15:33:39 +02:00
py: Reformat all Python files consistently
This commit is the unmodified results of running ``` black $(git ls-files '*.py') ``` with black version 19.10b0. See #2046. Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall
@@ -32,7 +32,7 @@ import unittest
|
||||
import taptestrunner
|
||||
|
||||
|
||||
Result = collections.namedtuple('Result', ('info', 'out', 'err', 'subs'))
|
||||
Result = collections.namedtuple("Result", ("info", "out", "err", "subs"))
|
||||
|
||||
|
||||
class TestCodegen(unittest.TestCase):
|
||||
@@ -47,22 +47,27 @@ class TestCodegen(unittest.TestCase):
|
||||
parsing and generation code of gdbus-codegen into separate unit tests, and
|
||||
just test command line behaviour in this integration test.
|
||||
"""
|
||||
|
||||
# Track the cwd, we want to back out to that to clean up our tempdir
|
||||
cwd = ''
|
||||
cwd = ""
|
||||
|
||||
def setUp(self):
|
||||
self.timeout_seconds = 10 # seconds per test
|
||||
self.tmpdir = tempfile.TemporaryDirectory()
|
||||
self.cwd = os.getcwd()
|
||||
os.chdir(self.tmpdir.name)
|
||||
print('tmpdir:', self.tmpdir.name)
|
||||
if 'G_TEST_BUILDDIR' in os.environ:
|
||||
self.__codegen = \
|
||||
os.path.join(os.environ['G_TEST_BUILDDIR'], '..',
|
||||
'gdbus-2.0', 'codegen', 'gdbus-codegen')
|
||||
print("tmpdir:", self.tmpdir.name)
|
||||
if "G_TEST_BUILDDIR" in os.environ:
|
||||
self.__codegen = os.path.join(
|
||||
os.environ["G_TEST_BUILDDIR"],
|
||||
"..",
|
||||
"gdbus-2.0",
|
||||
"codegen",
|
||||
"gdbus-codegen",
|
||||
)
|
||||
else:
|
||||
self.__codegen = shutil.which('gdbus-codegen')
|
||||
print('codegen:', self.__codegen)
|
||||
self.__codegen = shutil.which("gdbus-codegen")
|
||||
print("codegen:", self.__codegen)
|
||||
|
||||
def tearDown(self):
|
||||
os.chdir(self.cwd)
|
||||
@@ -73,201 +78,200 @@ class TestCodegen(unittest.TestCase):
|
||||
|
||||
# shebang lines are not supported on native
|
||||
# Windows consoles
|
||||
if os.name == 'nt':
|
||||
if os.name == "nt":
|
||||
argv.insert(0, sys.executable)
|
||||
|
||||
argv.extend(args)
|
||||
print('Running:', argv)
|
||||
print("Running:", argv)
|
||||
|
||||
env = os.environ.copy()
|
||||
env['LC_ALL'] = 'C.UTF-8'
|
||||
print('Environment:', env)
|
||||
env["LC_ALL"] = "C.UTF-8"
|
||||
print("Environment:", env)
|
||||
|
||||
# We want to ensure consistent line endings...
|
||||
info = subprocess.run(argv, timeout=self.timeout_seconds,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
env=env,
|
||||
universal_newlines=True)
|
||||
info = subprocess.run(
|
||||
argv,
|
||||
timeout=self.timeout_seconds,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
env=env,
|
||||
universal_newlines=True,
|
||||
)
|
||||
info.check_returncode()
|
||||
out = info.stdout.strip()
|
||||
err = info.stderr.strip()
|
||||
|
||||
# Known substitutions for standard boilerplate
|
||||
subs = {
|
||||
'standard_top_comment':
|
||||
'/*\n'
|
||||
' * This file is generated by gdbus-codegen, do not modify it.\n'
|
||||
' *\n'
|
||||
' * The license of this code is the same as for the D-Bus interface description\n'
|
||||
' * it was derived from. Note that it links to GLib, so must comply with the\n'
|
||||
' * LGPL linking clauses.\n'
|
||||
' */',
|
||||
'standard_config_h_include':
|
||||
'#ifdef HAVE_CONFIG_H\n'
|
||||
'# include "config.h"\n'
|
||||
'#endif',
|
||||
'standard_header_includes':
|
||||
'#include <string.h>\n'
|
||||
'#ifdef G_OS_UNIX\n'
|
||||
'# include <gio/gunixfdlist.h>\n'
|
||||
'#endif',
|
||||
'standard_typedefs_and_helpers':
|
||||
'typedef struct\n'
|
||||
'{\n'
|
||||
' GDBusArgInfo parent_struct;\n'
|
||||
' gboolean use_gvariant;\n'
|
||||
'} _ExtendedGDBusArgInfo;\n'
|
||||
'\n'
|
||||
'typedef struct\n'
|
||||
'{\n'
|
||||
' GDBusMethodInfo parent_struct;\n'
|
||||
' const gchar *signal_name;\n'
|
||||
' gboolean pass_fdlist;\n'
|
||||
'} _ExtendedGDBusMethodInfo;\n'
|
||||
'\n'
|
||||
'typedef struct\n'
|
||||
'{\n'
|
||||
' GDBusSignalInfo parent_struct;\n'
|
||||
' const gchar *signal_name;\n'
|
||||
'} _ExtendedGDBusSignalInfo;\n'
|
||||
'\n'
|
||||
'typedef struct\n'
|
||||
'{\n'
|
||||
' GDBusPropertyInfo parent_struct;\n'
|
||||
' const gchar *hyphen_name;\n'
|
||||
' guint use_gvariant : 1;\n'
|
||||
' guint emits_changed_signal : 1;\n'
|
||||
'} _ExtendedGDBusPropertyInfo;\n'
|
||||
'\n'
|
||||
'typedef struct\n'
|
||||
'{\n'
|
||||
' GDBusInterfaceInfo parent_struct;\n'
|
||||
' const gchar *hyphen_name;\n'
|
||||
'} _ExtendedGDBusInterfaceInfo;\n'
|
||||
'\n'
|
||||
'typedef struct\n'
|
||||
'{\n'
|
||||
' const _ExtendedGDBusPropertyInfo *info;\n'
|
||||
' guint prop_id;\n'
|
||||
' GValue orig_value; /* the value before the change */\n'
|
||||
'} ChangedProperty;\n'
|
||||
'\n'
|
||||
'static void\n'
|
||||
'_changed_property_free (ChangedProperty *data)\n'
|
||||
'{\n'
|
||||
' g_value_unset (&data->orig_value);\n'
|
||||
' g_free (data);\n'
|
||||
'}\n'
|
||||
'\n'
|
||||
'static gboolean\n'
|
||||
'_g_strv_equal0 (gchar **a, gchar **b)\n'
|
||||
'{\n'
|
||||
' gboolean ret = FALSE;\n'
|
||||
' guint n;\n'
|
||||
' if (a == NULL && b == NULL)\n'
|
||||
' {\n'
|
||||
' ret = TRUE;\n'
|
||||
' goto out;\n'
|
||||
' }\n'
|
||||
' if (a == NULL || b == NULL)\n'
|
||||
' goto out;\n'
|
||||
' if (g_strv_length (a) != g_strv_length (b))\n'
|
||||
' goto out;\n'
|
||||
' for (n = 0; a[n] != NULL; n++)\n'
|
||||
' if (g_strcmp0 (a[n], b[n]) != 0)\n'
|
||||
' goto out;\n'
|
||||
' ret = TRUE;\n'
|
||||
'out:\n'
|
||||
' return ret;\n'
|
||||
'}\n'
|
||||
'\n'
|
||||
'static gboolean\n'
|
||||
'_g_variant_equal0 (GVariant *a, GVariant *b)\n'
|
||||
'{\n'
|
||||
' gboolean ret = FALSE;\n'
|
||||
' if (a == NULL && b == NULL)\n'
|
||||
' {\n'
|
||||
' ret = TRUE;\n'
|
||||
' goto out;\n'
|
||||
' }\n'
|
||||
' if (a == NULL || b == NULL)\n'
|
||||
' goto out;\n'
|
||||
' ret = g_variant_equal (a, b);\n'
|
||||
'out:\n'
|
||||
' return ret;\n'
|
||||
'}\n'
|
||||
'\n'
|
||||
'G_GNUC_UNUSED static gboolean\n'
|
||||
'_g_value_equal (const GValue *a, const GValue *b)\n'
|
||||
'{\n'
|
||||
' gboolean ret = FALSE;\n'
|
||||
' g_assert (G_VALUE_TYPE (a) == G_VALUE_TYPE (b));\n'
|
||||
' switch (G_VALUE_TYPE (a))\n'
|
||||
' {\n'
|
||||
' case G_TYPE_BOOLEAN:\n'
|
||||
' ret = (g_value_get_boolean (a) == g_value_get_boolean (b));\n'
|
||||
' break;\n'
|
||||
' case G_TYPE_UCHAR:\n'
|
||||
' ret = (g_value_get_uchar (a) == g_value_get_uchar (b));\n'
|
||||
' break;\n'
|
||||
' case G_TYPE_INT:\n'
|
||||
' ret = (g_value_get_int (a) == g_value_get_int (b));\n'
|
||||
' break;\n'
|
||||
' case G_TYPE_UINT:\n'
|
||||
' ret = (g_value_get_uint (a) == g_value_get_uint (b));\n'
|
||||
' break;\n'
|
||||
' case G_TYPE_INT64:\n'
|
||||
' ret = (g_value_get_int64 (a) == g_value_get_int64 (b));\n'
|
||||
' break;\n'
|
||||
' case G_TYPE_UINT64:\n'
|
||||
' ret = (g_value_get_uint64 (a) == g_value_get_uint64 (b));\n'
|
||||
' break;\n'
|
||||
' case G_TYPE_DOUBLE:\n'
|
||||
' {\n'
|
||||
' /* Avoid -Wfloat-equal warnings by doing a direct bit compare */\n'
|
||||
' gdouble da = g_value_get_double (a);\n'
|
||||
' gdouble db = g_value_get_double (b);\n'
|
||||
' ret = memcmp (&da, &db, sizeof (gdouble)) == 0;\n'
|
||||
' }\n'
|
||||
' break;\n'
|
||||
' case G_TYPE_STRING:\n'
|
||||
' ret = (g_strcmp0 (g_value_get_string (a), g_value_get_string (b)) == 0);\n'
|
||||
' break;\n'
|
||||
' case G_TYPE_VARIANT:\n'
|
||||
' ret = _g_variant_equal0 (g_value_get_variant (a), g_value_get_variant (b));\n'
|
||||
' break;\n'
|
||||
' default:\n'
|
||||
' if (G_VALUE_TYPE (a) == G_TYPE_STRV)\n'
|
||||
' ret = _g_strv_equal0 (g_value_get_boxed (a), g_value_get_boxed (b));\n'
|
||||
' else\n'
|
||||
' g_critical ("_g_value_equal() does not handle type %s", g_type_name (G_VALUE_TYPE (a)));\n'
|
||||
' break;\n'
|
||||
' }\n'
|
||||
' return ret;\n'
|
||||
'}',
|
||||
"standard_top_comment": "/*\n"
|
||||
" * This file is generated by gdbus-codegen, do not modify it.\n"
|
||||
" *\n"
|
||||
" * The license of this code is the same as for the D-Bus interface description\n"
|
||||
" * it was derived from. Note that it links to GLib, so must comply with the\n"
|
||||
" * LGPL linking clauses.\n"
|
||||
" */",
|
||||
"standard_config_h_include": "#ifdef HAVE_CONFIG_H\n"
|
||||
'# include "config.h"\n'
|
||||
"#endif",
|
||||
"standard_header_includes": "#include <string.h>\n"
|
||||
"#ifdef G_OS_UNIX\n"
|
||||
"# include <gio/gunixfdlist.h>\n"
|
||||
"#endif",
|
||||
"standard_typedefs_and_helpers": "typedef struct\n"
|
||||
"{\n"
|
||||
" GDBusArgInfo parent_struct;\n"
|
||||
" gboolean use_gvariant;\n"
|
||||
"} _ExtendedGDBusArgInfo;\n"
|
||||
"\n"
|
||||
"typedef struct\n"
|
||||
"{\n"
|
||||
" GDBusMethodInfo parent_struct;\n"
|
||||
" const gchar *signal_name;\n"
|
||||
" gboolean pass_fdlist;\n"
|
||||
"} _ExtendedGDBusMethodInfo;\n"
|
||||
"\n"
|
||||
"typedef struct\n"
|
||||
"{\n"
|
||||
" GDBusSignalInfo parent_struct;\n"
|
||||
" const gchar *signal_name;\n"
|
||||
"} _ExtendedGDBusSignalInfo;\n"
|
||||
"\n"
|
||||
"typedef struct\n"
|
||||
"{\n"
|
||||
" GDBusPropertyInfo parent_struct;\n"
|
||||
" const gchar *hyphen_name;\n"
|
||||
" guint use_gvariant : 1;\n"
|
||||
" guint emits_changed_signal : 1;\n"
|
||||
"} _ExtendedGDBusPropertyInfo;\n"
|
||||
"\n"
|
||||
"typedef struct\n"
|
||||
"{\n"
|
||||
" GDBusInterfaceInfo parent_struct;\n"
|
||||
" const gchar *hyphen_name;\n"
|
||||
"} _ExtendedGDBusInterfaceInfo;\n"
|
||||
"\n"
|
||||
"typedef struct\n"
|
||||
"{\n"
|
||||
" const _ExtendedGDBusPropertyInfo *info;\n"
|
||||
" guint prop_id;\n"
|
||||
" GValue orig_value; /* the value before the change */\n"
|
||||
"} ChangedProperty;\n"
|
||||
"\n"
|
||||
"static void\n"
|
||||
"_changed_property_free (ChangedProperty *data)\n"
|
||||
"{\n"
|
||||
" g_value_unset (&data->orig_value);\n"
|
||||
" g_free (data);\n"
|
||||
"}\n"
|
||||
"\n"
|
||||
"static gboolean\n"
|
||||
"_g_strv_equal0 (gchar **a, gchar **b)\n"
|
||||
"{\n"
|
||||
" gboolean ret = FALSE;\n"
|
||||
" guint n;\n"
|
||||
" if (a == NULL && b == NULL)\n"
|
||||
" {\n"
|
||||
" ret = TRUE;\n"
|
||||
" goto out;\n"
|
||||
" }\n"
|
||||
" if (a == NULL || b == NULL)\n"
|
||||
" goto out;\n"
|
||||
" if (g_strv_length (a) != g_strv_length (b))\n"
|
||||
" goto out;\n"
|
||||
" for (n = 0; a[n] != NULL; n++)\n"
|
||||
" if (g_strcmp0 (a[n], b[n]) != 0)\n"
|
||||
" goto out;\n"
|
||||
" ret = TRUE;\n"
|
||||
"out:\n"
|
||||
" return ret;\n"
|
||||
"}\n"
|
||||
"\n"
|
||||
"static gboolean\n"
|
||||
"_g_variant_equal0 (GVariant *a, GVariant *b)\n"
|
||||
"{\n"
|
||||
" gboolean ret = FALSE;\n"
|
||||
" if (a == NULL && b == NULL)\n"
|
||||
" {\n"
|
||||
" ret = TRUE;\n"
|
||||
" goto out;\n"
|
||||
" }\n"
|
||||
" if (a == NULL || b == NULL)\n"
|
||||
" goto out;\n"
|
||||
" ret = g_variant_equal (a, b);\n"
|
||||
"out:\n"
|
||||
" return ret;\n"
|
||||
"}\n"
|
||||
"\n"
|
||||
"G_GNUC_UNUSED static gboolean\n"
|
||||
"_g_value_equal (const GValue *a, const GValue *b)\n"
|
||||
"{\n"
|
||||
" gboolean ret = FALSE;\n"
|
||||
" g_assert (G_VALUE_TYPE (a) == G_VALUE_TYPE (b));\n"
|
||||
" switch (G_VALUE_TYPE (a))\n"
|
||||
" {\n"
|
||||
" case G_TYPE_BOOLEAN:\n"
|
||||
" ret = (g_value_get_boolean (a) == g_value_get_boolean (b));\n"
|
||||
" break;\n"
|
||||
" case G_TYPE_UCHAR:\n"
|
||||
" ret = (g_value_get_uchar (a) == g_value_get_uchar (b));\n"
|
||||
" break;\n"
|
||||
" case G_TYPE_INT:\n"
|
||||
" ret = (g_value_get_int (a) == g_value_get_int (b));\n"
|
||||
" break;\n"
|
||||
" case G_TYPE_UINT:\n"
|
||||
" ret = (g_value_get_uint (a) == g_value_get_uint (b));\n"
|
||||
" break;\n"
|
||||
" case G_TYPE_INT64:\n"
|
||||
" ret = (g_value_get_int64 (a) == g_value_get_int64 (b));\n"
|
||||
" break;\n"
|
||||
" case G_TYPE_UINT64:\n"
|
||||
" ret = (g_value_get_uint64 (a) == g_value_get_uint64 (b));\n"
|
||||
" break;\n"
|
||||
" case G_TYPE_DOUBLE:\n"
|
||||
" {\n"
|
||||
" /* Avoid -Wfloat-equal warnings by doing a direct bit compare */\n"
|
||||
" gdouble da = g_value_get_double (a);\n"
|
||||
" gdouble db = g_value_get_double (b);\n"
|
||||
" ret = memcmp (&da, &db, sizeof (gdouble)) == 0;\n"
|
||||
" }\n"
|
||||
" break;\n"
|
||||
" case G_TYPE_STRING:\n"
|
||||
" ret = (g_strcmp0 (g_value_get_string (a), g_value_get_string (b)) == 0);\n"
|
||||
" break;\n"
|
||||
" case G_TYPE_VARIANT:\n"
|
||||
" ret = _g_variant_equal0 (g_value_get_variant (a), g_value_get_variant (b));\n"
|
||||
" break;\n"
|
||||
" default:\n"
|
||||
" if (G_VALUE_TYPE (a) == G_TYPE_STRV)\n"
|
||||
" ret = _g_strv_equal0 (g_value_get_boxed (a), g_value_get_boxed (b));\n"
|
||||
" else\n"
|
||||
' g_critical ("_g_value_equal() does not handle type %s", g_type_name (G_VALUE_TYPE (a)));\n'
|
||||
" break;\n"
|
||||
" }\n"
|
||||
" return ret;\n"
|
||||
"}",
|
||||
}
|
||||
|
||||
result = Result(info, out, err, subs)
|
||||
|
||||
print('Output:', result.out)
|
||||
print("Output:", result.out)
|
||||
return result
|
||||
|
||||
def runCodegenWithInterface(self, interface_contents, *args):
|
||||
with tempfile.NamedTemporaryFile(dir=self.tmpdir.name,
|
||||
suffix='.xml',
|
||||
delete=False) as interface_file:
|
||||
with tempfile.NamedTemporaryFile(
|
||||
dir=self.tmpdir.name, suffix=".xml", delete=False
|
||||
) as interface_file:
|
||||
# Write out the interface.
|
||||
interface_file.write(interface_contents.encode('utf-8'))
|
||||
print(interface_file.name + ':', interface_contents)
|
||||
interface_file.write(interface_contents.encode("utf-8"))
|
||||
print(interface_file.name + ":", interface_contents)
|
||||
interface_file.flush()
|
||||
|
||||
return self.runCodegen(interface_file.name, *args)
|
||||
|
||||
def test_help(self):
|
||||
"""Test the --help argument."""
|
||||
result = self.runCodegen('--help')
|
||||
self.assertIn('usage: gdbus-codegen', result.out)
|
||||
result = self.runCodegen("--help")
|
||||
self.assertIn("usage: gdbus-codegen", result.out)
|
||||
|
||||
def test_no_args(self):
|
||||
"""Test running with no arguments at all."""
|
||||
@@ -276,11 +280,10 @@ class TestCodegen(unittest.TestCase):
|
||||
|
||||
def test_empty_interface_header(self):
|
||||
"""Test generating a header with an empty interface file."""
|
||||
result = self.runCodegenWithInterface('',
|
||||
'--output', '/dev/stdout',
|
||||
'--header')
|
||||
self.assertEqual('', result.err)
|
||||
self.assertEqual('''{standard_top_comment}
|
||||
result = self.runCodegenWithInterface("", "--output", "/dev/stdout", "--header")
|
||||
self.assertEqual("", result.err)
|
||||
self.assertEqual(
|
||||
"""{standard_top_comment}
|
||||
|
||||
#ifndef __STDOUT__
|
||||
#define __STDOUT__
|
||||
@@ -292,16 +295,18 @@ G_BEGIN_DECLS
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __STDOUT__ */'''.format(**result.subs),
|
||||
result.out.strip())
|
||||
#endif /* __STDOUT__ */""".format(
|
||||
**result.subs
|
||||
),
|
||||
result.out.strip(),
|
||||
)
|
||||
|
||||
def test_empty_interface_body(self):
|
||||
"""Test generating a body with an empty interface file."""
|
||||
result = self.runCodegenWithInterface('',
|
||||
'--output', '/dev/stdout',
|
||||
'--body')
|
||||
self.assertEqual('', result.err)
|
||||
self.assertEqual('''{standard_top_comment}
|
||||
result = self.runCodegenWithInterface("", "--output", "/dev/stdout", "--body")
|
||||
self.assertEqual("", result.err)
|
||||
self.assertEqual(
|
||||
"""{standard_top_comment}
|
||||
|
||||
{standard_config_h_include}
|
||||
|
||||
@@ -309,12 +314,15 @@ G_END_DECLS
|
||||
|
||||
{standard_header_includes}
|
||||
|
||||
{standard_typedefs_and_helpers}'''.format(**result.subs),
|
||||
result.out.strip())
|
||||
{standard_typedefs_and_helpers}""".format(
|
||||
**result.subs
|
||||
),
|
||||
result.out.strip(),
|
||||
)
|
||||
|
||||
def test_reproducible(self):
|
||||
"""Test builds are reproducible regardless of file ordering."""
|
||||
xml_contents1 = '''
|
||||
xml_contents1 = """
|
||||
<node>
|
||||
<interface name="com.acme.Coyote">
|
||||
<method name="Run"/>
|
||||
@@ -324,40 +332,49 @@ G_END_DECLS
|
||||
<property name="Mood" type="s" access="read"/>
|
||||
</interface>
|
||||
</node>
|
||||
'''
|
||||
"""
|
||||
|
||||
xml_contents2 = '''
|
||||
xml_contents2 = """
|
||||
<node>
|
||||
<interface name="org.project.Bar.Frobnicator">
|
||||
<method name="RandomMethod"/>
|
||||
</interface>
|
||||
</node>
|
||||
'''
|
||||
"""
|
||||
|
||||
with tempfile.NamedTemporaryFile(dir=self.tmpdir.name,
|
||||
suffix='1.xml', delete=False) as xml_file1, \
|
||||
tempfile.NamedTemporaryFile(dir=self.tmpdir.name,
|
||||
suffix='2.xml', delete=False) as xml_file2:
|
||||
with tempfile.NamedTemporaryFile(
|
||||
dir=self.tmpdir.name, suffix="1.xml", delete=False
|
||||
) as xml_file1, tempfile.NamedTemporaryFile(
|
||||
dir=self.tmpdir.name, suffix="2.xml", delete=False
|
||||
) as xml_file2:
|
||||
# Write out the interfaces.
|
||||
xml_file1.write(xml_contents1.encode('utf-8'))
|
||||
xml_file2.write(xml_contents2.encode('utf-8'))
|
||||
xml_file1.write(xml_contents1.encode("utf-8"))
|
||||
xml_file2.write(xml_contents2.encode("utf-8"))
|
||||
|
||||
xml_file1.flush()
|
||||
xml_file2.flush()
|
||||
|
||||
# Repeat this for headers and bodies.
|
||||
for header_or_body in ['--header', '--body']:
|
||||
for header_or_body in ["--header", "--body"]:
|
||||
# Run gdbus-codegen with the interfaces in one order, and then
|
||||
# again in another order.
|
||||
result1 = self.runCodegen(xml_file1.name, xml_file2.name,
|
||||
'--output', '/dev/stdout',
|
||||
header_or_body)
|
||||
self.assertEqual('', result1.err)
|
||||
result1 = self.runCodegen(
|
||||
xml_file1.name,
|
||||
xml_file2.name,
|
||||
"--output",
|
||||
"/dev/stdout",
|
||||
header_or_body,
|
||||
)
|
||||
self.assertEqual("", result1.err)
|
||||
|
||||
result2 = self.runCodegen(xml_file2.name, xml_file1.name,
|
||||
'--output', '/dev/stdout',
|
||||
header_or_body)
|
||||
self.assertEqual('', result2.err)
|
||||
result2 = self.runCodegen(
|
||||
xml_file2.name,
|
||||
xml_file1.name,
|
||||
"--output",
|
||||
"/dev/stdout",
|
||||
header_or_body,
|
||||
)
|
||||
self.assertEqual("", result2.err)
|
||||
|
||||
# The output should be the same.
|
||||
self.assertEqual(result1.out, result2.out)
|
||||
@@ -365,94 +382,108 @@ G_END_DECLS
|
||||
def test_glib_min_required_invalid(self):
|
||||
"""Test running with an invalid --glib-min-required."""
|
||||
with self.assertRaises(subprocess.CalledProcessError):
|
||||
self.runCodegenWithInterface('',
|
||||
'--output', '/dev/stdout',
|
||||
'--body',
|
||||
'--glib-min-required', 'hello mum')
|
||||
self.runCodegenWithInterface(
|
||||
"",
|
||||
"--output",
|
||||
"/dev/stdout",
|
||||
"--body",
|
||||
"--glib-min-required",
|
||||
"hello mum",
|
||||
)
|
||||
|
||||
def test_glib_min_required_too_low(self):
|
||||
"""Test running with a --glib-min-required which is too low (and hence
|
||||
probably a typo)."""
|
||||
with self.assertRaises(subprocess.CalledProcessError):
|
||||
self.runCodegenWithInterface('',
|
||||
'--output', '/dev/stdout',
|
||||
'--body',
|
||||
'--glib-min-required', '2.6')
|
||||
self.runCodegenWithInterface(
|
||||
"", "--output", "/dev/stdout", "--body", "--glib-min-required", "2.6"
|
||||
)
|
||||
|
||||
def test_glib_min_required_major_only(self):
|
||||
"""Test running with a --glib-min-required which contains only a major version."""
|
||||
result = self.runCodegenWithInterface('',
|
||||
'--output', '/dev/stdout',
|
||||
'--header',
|
||||
'--glib-min-required', '3',
|
||||
'--glib-max-allowed', '3.2')
|
||||
self.assertEqual('', result.err)
|
||||
self.assertNotEqual('', result.out.strip())
|
||||
result = self.runCodegenWithInterface(
|
||||
"",
|
||||
"--output",
|
||||
"/dev/stdout",
|
||||
"--header",
|
||||
"--glib-min-required",
|
||||
"3",
|
||||
"--glib-max-allowed",
|
||||
"3.2",
|
||||
)
|
||||
self.assertEqual("", result.err)
|
||||
self.assertNotEqual("", result.out.strip())
|
||||
|
||||
def test_glib_min_required_with_micro(self):
|
||||
"""Test running with a --glib-min-required which contains a micro version."""
|
||||
result = self.runCodegenWithInterface('',
|
||||
'--output', '/dev/stdout',
|
||||
'--header',
|
||||
'--glib-min-required', '2.46.2')
|
||||
self.assertEqual('', result.err)
|
||||
self.assertNotEqual('', result.out.strip())
|
||||
result = self.runCodegenWithInterface(
|
||||
"", "--output", "/dev/stdout", "--header", "--glib-min-required", "2.46.2"
|
||||
)
|
||||
self.assertEqual("", result.err)
|
||||
self.assertNotEqual("", result.out.strip())
|
||||
|
||||
def test_glib_max_allowed_too_low(self):
|
||||
"""Test running with a --glib-max-allowed which is too low (and hence
|
||||
probably a typo)."""
|
||||
with self.assertRaises(subprocess.CalledProcessError):
|
||||
self.runCodegenWithInterface('',
|
||||
'--output', '/dev/stdout',
|
||||
'--body',
|
||||
'--glib-max-allowed', '2.6')
|
||||
self.runCodegenWithInterface(
|
||||
"", "--output", "/dev/stdout", "--body", "--glib-max-allowed", "2.6"
|
||||
)
|
||||
|
||||
def test_glib_max_allowed_major_only(self):
|
||||
"""Test running with a --glib-max-allowed which contains only a major version."""
|
||||
result = self.runCodegenWithInterface('',
|
||||
'--output', '/dev/stdout',
|
||||
'--header',
|
||||
'--glib-max-allowed', '3')
|
||||
self.assertEqual('', result.err)
|
||||
self.assertNotEqual('', result.out.strip())
|
||||
result = self.runCodegenWithInterface(
|
||||
"", "--output", "/dev/stdout", "--header", "--glib-max-allowed", "3"
|
||||
)
|
||||
self.assertEqual("", result.err)
|
||||
self.assertNotEqual("", result.out.strip())
|
||||
|
||||
def test_glib_max_allowed_with_micro(self):
|
||||
"""Test running with a --glib-max-allowed which contains a micro version."""
|
||||
result = self.runCodegenWithInterface('',
|
||||
'--output', '/dev/stdout',
|
||||
'--header',
|
||||
'--glib-max-allowed', '2.46.2')
|
||||
self.assertEqual('', result.err)
|
||||
self.assertNotEqual('', result.out.strip())
|
||||
result = self.runCodegenWithInterface(
|
||||
"", "--output", "/dev/stdout", "--header", "--glib-max-allowed", "2.46.2"
|
||||
)
|
||||
self.assertEqual("", result.err)
|
||||
self.assertNotEqual("", result.out.strip())
|
||||
|
||||
def test_glib_max_allowed_unstable(self):
|
||||
"""Test running with a --glib-max-allowed which is unstable. It should
|
||||
be rounded up to the next stable version number, and hence should not
|
||||
end up less than --glib-min-required."""
|
||||
result = self.runCodegenWithInterface('',
|
||||
'--output', '/dev/stdout',
|
||||
'--header',
|
||||
'--glib-max-allowed', '2.63',
|
||||
'--glib-min-required', '2.64')
|
||||
self.assertEqual('', result.err)
|
||||
self.assertNotEqual('', result.out.strip())
|
||||
result = self.runCodegenWithInterface(
|
||||
"",
|
||||
"--output",
|
||||
"/dev/stdout",
|
||||
"--header",
|
||||
"--glib-max-allowed",
|
||||
"2.63",
|
||||
"--glib-min-required",
|
||||
"2.64",
|
||||
)
|
||||
self.assertEqual("", result.err)
|
||||
self.assertNotEqual("", result.out.strip())
|
||||
|
||||
def test_glib_max_allowed_less_than_min_required(self):
|
||||
"""Test running with a --glib-max-allowed which is less than
|
||||
--glib-min-required."""
|
||||
with self.assertRaises(subprocess.CalledProcessError):
|
||||
self.runCodegenWithInterface('',
|
||||
'--output', '/dev/stdout',
|
||||
'--body',
|
||||
'--glib-max-allowed', '2.62',
|
||||
'--glib-min-required', '2.64')
|
||||
self.runCodegenWithInterface(
|
||||
"",
|
||||
"--output",
|
||||
"/dev/stdout",
|
||||
"--body",
|
||||
"--glib-max-allowed",
|
||||
"2.62",
|
||||
"--glib-min-required",
|
||||
"2.64",
|
||||
)
|
||||
|
||||
def test_unix_fd_types_and_annotations(self):
|
||||
"""Test an interface with `h` arguments, no annotation, and GLib < 2.64.
|
||||
|
||||
See issue #1726.
|
||||
"""
|
||||
interface_xml = '''
|
||||
interface_xml = """
|
||||
<node>
|
||||
<interface name="FDPassing">
|
||||
<method name="HelloFD">
|
||||
@@ -470,71 +501,87 @@ G_END_DECLS
|
||||
<arg name="files" type="a{sh}" direction="in"/>
|
||||
</method>
|
||||
</interface>
|
||||
</node>'''
|
||||
</node>"""
|
||||
|
||||
# Try without specifying --glib-min-required.
|
||||
result = self.runCodegenWithInterface(interface_xml,
|
||||
'--output', '/dev/stdout',
|
||||
'--header')
|
||||
self.assertEqual('', result.err)
|
||||
self.assertEqual(result.out.strip().count('GUnixFDList'), 6)
|
||||
result = self.runCodegenWithInterface(
|
||||
interface_xml, "--output", "/dev/stdout", "--header"
|
||||
)
|
||||
self.assertEqual("", result.err)
|
||||
self.assertEqual(result.out.strip().count("GUnixFDList"), 6)
|
||||
|
||||
# Specify an old --glib-min-required.
|
||||
result = self.runCodegenWithInterface(interface_xml,
|
||||
'--output', '/dev/stdout',
|
||||
'--header',
|
||||
'--glib-min-required', '2.32')
|
||||
self.assertEqual('', result.err)
|
||||
self.assertEqual(result.out.strip().count('GUnixFDList'), 6)
|
||||
result = self.runCodegenWithInterface(
|
||||
interface_xml,
|
||||
"--output",
|
||||
"/dev/stdout",
|
||||
"--header",
|
||||
"--glib-min-required",
|
||||
"2.32",
|
||||
)
|
||||
self.assertEqual("", result.err)
|
||||
self.assertEqual(result.out.strip().count("GUnixFDList"), 6)
|
||||
|
||||
# Specify a --glib-min-required ≥ 2.64. There should be more
|
||||
# mentions of `GUnixFDList` now, since the annotation is not needed to
|
||||
# trigger its use.
|
||||
result = self.runCodegenWithInterface(interface_xml,
|
||||
'--output', '/dev/stdout',
|
||||
'--header',
|
||||
'--glib-min-required', '2.64')
|
||||
self.assertEqual('', result.err)
|
||||
self.assertEqual(result.out.strip().count('GUnixFDList'), 18)
|
||||
result = self.runCodegenWithInterface(
|
||||
interface_xml,
|
||||
"--output",
|
||||
"/dev/stdout",
|
||||
"--header",
|
||||
"--glib-min-required",
|
||||
"2.64",
|
||||
)
|
||||
self.assertEqual("", result.err)
|
||||
self.assertEqual(result.out.strip().count("GUnixFDList"), 18)
|
||||
|
||||
def test_call_flags_and_timeout_method_args(self):
|
||||
"""Test that generated method call functions have @call_flags and
|
||||
@timeout_msec args if and only if GLib >= 2.64.
|
||||
"""
|
||||
interface_xml = '''
|
||||
interface_xml = """
|
||||
<node>
|
||||
<interface name="org.project.UsefulInterface">
|
||||
<method name="UsefulMethod"/>
|
||||
</interface>
|
||||
</node>'''
|
||||
</node>"""
|
||||
|
||||
# Try without specifying --glib-min-required.
|
||||
result = self.runCodegenWithInterface(interface_xml,
|
||||
'--output', '/dev/stdout',
|
||||
'--header')
|
||||
self.assertEqual('', result.err)
|
||||
self.assertEqual(result.out.strip().count('GDBusCallFlags call_flags,'), 0)
|
||||
self.assertEqual(result.out.strip().count('gint timeout_msec,'), 0)
|
||||
result = self.runCodegenWithInterface(
|
||||
interface_xml, "--output", "/dev/stdout", "--header"
|
||||
)
|
||||
self.assertEqual("", result.err)
|
||||
self.assertEqual(result.out.strip().count("GDBusCallFlags call_flags,"), 0)
|
||||
self.assertEqual(result.out.strip().count("gint timeout_msec,"), 0)
|
||||
|
||||
# Specify an old --glib-min-required.
|
||||
result = self.runCodegenWithInterface(interface_xml,
|
||||
'--output', '/dev/stdout',
|
||||
'--header',
|
||||
'--glib-min-required', '2.32')
|
||||
self.assertEqual('', result.err)
|
||||
self.assertEqual(result.out.strip().count('GDBusCallFlags call_flags,'), 0)
|
||||
self.assertEqual(result.out.strip().count('gint timeout_msec,'), 0)
|
||||
result = self.runCodegenWithInterface(
|
||||
interface_xml,
|
||||
"--output",
|
||||
"/dev/stdout",
|
||||
"--header",
|
||||
"--glib-min-required",
|
||||
"2.32",
|
||||
)
|
||||
self.assertEqual("", result.err)
|
||||
self.assertEqual(result.out.strip().count("GDBusCallFlags call_flags,"), 0)
|
||||
self.assertEqual(result.out.strip().count("gint timeout_msec,"), 0)
|
||||
|
||||
# Specify a --glib-min-required ≥ 2.64. The two arguments should be
|
||||
# present for both the async and sync method call functions.
|
||||
result = self.runCodegenWithInterface(interface_xml,
|
||||
'--output', '/dev/stdout',
|
||||
'--header',
|
||||
'--glib-min-required', '2.64')
|
||||
self.assertEqual('', result.err)
|
||||
self.assertEqual(result.out.strip().count('GDBusCallFlags call_flags,'), 2)
|
||||
self.assertEqual(result.out.strip().count('gint timeout_msec,'), 2)
|
||||
result = self.runCodegenWithInterface(
|
||||
interface_xml,
|
||||
"--output",
|
||||
"/dev/stdout",
|
||||
"--header",
|
||||
"--glib-min-required",
|
||||
"2.64",
|
||||
)
|
||||
self.assertEqual("", result.err)
|
||||
self.assertEqual(result.out.strip().count("GDBusCallFlags call_flags,"), 2)
|
||||
self.assertEqual(result.out.strip().count("gint timeout_msec,"), 2)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
if __name__ == "__main__":
|
||||
unittest.main(testRunner=taptestrunner.TAPTestRunner())
|
||||
|
||||
@@ -13,9 +13,9 @@ import string
|
||||
import sys
|
||||
|
||||
if len(sys.argv) != 2:
|
||||
raise SystemExit('Usage: %s <output-file>' % sys.argv[0])
|
||||
raise SystemExit("Usage: %s <output-file>" % sys.argv[0])
|
||||
|
||||
with open(sys.argv[1], 'w', newline='\n') as f:
|
||||
with open(sys.argv[1], "w", newline="\n") as f:
|
||||
for count in range(12):
|
||||
for c in string.ascii_lowercase:
|
||||
f.write("%s\n" % (c * 100))
|
||||
|
||||
@@ -5,7 +5,7 @@ import sys
|
||||
import re
|
||||
import os
|
||||
|
||||
debug = os.getenv('GIO_GENTYPEFUNCS_DEBUG') is not None
|
||||
debug = os.getenv("GIO_GENTYPEFUNCS_DEBUG") is not None
|
||||
|
||||
out_file = sys.argv[1]
|
||||
in_files = sys.argv[2:]
|
||||
@@ -13,32 +13,37 @@ in_files = sys.argv[2:]
|
||||
funcs = []
|
||||
|
||||
|
||||
if debug: print ('Output file: ', out_file)
|
||||
if debug:
|
||||
print("Output file: ", out_file)
|
||||
|
||||
if debug: print (len(in_files), 'input files')
|
||||
if debug:
|
||||
print(len(in_files), "input files")
|
||||
|
||||
for filename in in_files:
|
||||
if debug: print ('Input file: ', filename)
|
||||
with open(filename, 'rb') as f:
|
||||
for line in f:
|
||||
line = line.rstrip(b'\n').rstrip(b'\r')
|
||||
# print line
|
||||
match = re.search(b'\bg_[a-zA-Z0-9_]*_get_type\b', line)
|
||||
if match:
|
||||
func = match.group(0)
|
||||
if not func in funcs:
|
||||
funcs.append(func)
|
||||
if debug: print ('Found ', func)
|
||||
if debug:
|
||||
print("Input file: ", filename)
|
||||
with open(filename, "rb") as f:
|
||||
for line in f:
|
||||
line = line.rstrip(b"\n").rstrip(b"\r")
|
||||
# print line
|
||||
match = re.search(b"\bg_[a-zA-Z0-9_]*_get_type\b", line)
|
||||
if match:
|
||||
func = match.group(0)
|
||||
if not func in funcs:
|
||||
funcs.append(func)
|
||||
if debug:
|
||||
print("Found ", func)
|
||||
|
||||
file_output = 'G_GNUC_BEGIN_IGNORE_DEPRECATIONS\n'
|
||||
file_output = "G_GNUC_BEGIN_IGNORE_DEPRECATIONS\n"
|
||||
|
||||
funcs = sorted(funcs)
|
||||
|
||||
for f in funcs:
|
||||
if f not in ['g_io_extension_get_type', 'g_settings_backend_get_type']:
|
||||
file_output += '*tp++ = {0} ();\n'.format(f)
|
||||
if f not in ["g_io_extension_get_type", "g_settings_backend_get_type"]:
|
||||
file_output += "*tp++ = {0} ();\n".format(f)
|
||||
|
||||
if debug: print (len(funcs), 'functions')
|
||||
if debug:
|
||||
print(len(funcs), "functions")
|
||||
|
||||
ofile = open(out_file, "w")
|
||||
ofile.write(file_output)
|
||||
|
||||
@@ -23,29 +23,33 @@ import sys
|
||||
import tempfile
|
||||
import subprocess
|
||||
|
||||
if not 'GLIB_TEST_COMPILATION' in os.environ:
|
||||
print('''Test disabled because GLIB_TEST_COMPILATION is not set in the env.
|
||||
if not "GLIB_TEST_COMPILATION" in os.environ:
|
||||
print(
|
||||
"""Test disabled because GLIB_TEST_COMPILATION is not set in the env.
|
||||
If you wish to run this test, set GLIB_TEST_COMPILATION=1 in the env,
|
||||
and make sure you have glib build dependencies installed, including
|
||||
meson.''')
|
||||
sys.exit(77)
|
||||
meson."""
|
||||
)
|
||||
sys.exit(77)
|
||||
|
||||
if len(sys.argv) != 2:
|
||||
print('Usage: {} <gio-2.0.pc dir>'.format(os.path.basename(sys.argv[0])))
|
||||
sys.exit(1)
|
||||
print("Usage: {} <gio-2.0.pc dir>".format(os.path.basename(sys.argv[0])))
|
||||
sys.exit(1)
|
||||
|
||||
test_dir = os.path.dirname(sys.argv[0])
|
||||
|
||||
with tempfile.TemporaryDirectory() as builddir:
|
||||
env = os.environ.copy()
|
||||
env['PKG_CONFIG_PATH'] = sys.argv[1]
|
||||
sourcedir = os.path.join(test_dir, 'static-link')
|
||||
env = os.environ.copy()
|
||||
env["PKG_CONFIG_PATH"] = sys.argv[1]
|
||||
sourcedir = os.path.join(test_dir, "static-link")
|
||||
|
||||
# Ensure we can static link and run a test app
|
||||
subprocess.check_call(['meson', sourcedir, builddir], env=env)
|
||||
subprocess.check_call(['ninja', '-C', builddir, 'test'], env=env)
|
||||
# FIXME: This probably only works on Linux
|
||||
out = subprocess.check_output(['ldd', os.path.join(builddir, 'test-static-link')], env=env).decode()
|
||||
if 'libgio' in out:
|
||||
print('test-static-link is dynamically linked on libgio')
|
||||
exit(1)
|
||||
# Ensure we can static link and run a test app
|
||||
subprocess.check_call(["meson", sourcedir, builddir], env=env)
|
||||
subprocess.check_call(["ninja", "-C", builddir, "test"], env=env)
|
||||
# FIXME: This probably only works on Linux
|
||||
out = subprocess.check_output(
|
||||
["ldd", os.path.join(builddir, "test-static-link")], env=env
|
||||
).decode()
|
||||
if "libgio" in out:
|
||||
print("test-static-link is dynamically linked on libgio")
|
||||
exit(1)
|
||||
|
||||
@@ -31,146 +31,155 @@ import base64
|
||||
from io import StringIO
|
||||
|
||||
# Log modes
|
||||
class LogMode(object) :
|
||||
LogToError, LogToDiagnostics, LogToYAML, LogToAttachment = range(4)
|
||||
class LogMode(object):
|
||||
LogToError, LogToDiagnostics, LogToYAML, LogToAttachment = range(4)
|
||||
|
||||
|
||||
class TAPTestResult(unittest.TestResult):
|
||||
def __init__(self, output_stream, error_stream, message_log, test_output_log):
|
||||
super(TAPTestResult, self).__init__(self, output_stream)
|
||||
self.output_stream = output_stream
|
||||
self.error_stream = error_stream
|
||||
self.orig_stdout = None
|
||||
self.orig_stderr = None
|
||||
self.message = None
|
||||
self.test_output = None
|
||||
self.message_log = message_log
|
||||
self.test_output_log = test_output_log
|
||||
self.output_stream.write("TAP version 13\n")
|
||||
self._set_streams()
|
||||
def __init__(self, output_stream, error_stream, message_log, test_output_log):
|
||||
super(TAPTestResult, self).__init__(self, output_stream)
|
||||
self.output_stream = output_stream
|
||||
self.error_stream = error_stream
|
||||
self.orig_stdout = None
|
||||
self.orig_stderr = None
|
||||
self.message = None
|
||||
self.test_output = None
|
||||
self.message_log = message_log
|
||||
self.test_output_log = test_output_log
|
||||
self.output_stream.write("TAP version 13\n")
|
||||
self._set_streams()
|
||||
|
||||
def printErrors(self):
|
||||
self.print_raw("1..%d\n" % self.testsRun)
|
||||
self._reset_streams()
|
||||
def printErrors(self):
|
||||
self.print_raw("1..%d\n" % self.testsRun)
|
||||
self._reset_streams()
|
||||
|
||||
def _set_streams(self):
|
||||
self.orig_stdout = sys.stdout
|
||||
self.orig_stderr = sys.stderr
|
||||
if self.message_log == LogMode.LogToError:
|
||||
self.message = self.error_stream
|
||||
else:
|
||||
self.message = StringIO()
|
||||
if self.test_output_log == LogMode.LogToError:
|
||||
self.test_output = self.error_stream
|
||||
else:
|
||||
self.test_output = StringIO()
|
||||
def _set_streams(self):
|
||||
self.orig_stdout = sys.stdout
|
||||
self.orig_stderr = sys.stderr
|
||||
if self.message_log == LogMode.LogToError:
|
||||
self.message = self.error_stream
|
||||
else:
|
||||
self.message = StringIO()
|
||||
if self.test_output_log == LogMode.LogToError:
|
||||
self.test_output = self.error_stream
|
||||
else:
|
||||
self.test_output = StringIO()
|
||||
|
||||
if self.message_log == self.test_output_log:
|
||||
self.test_output = self.message
|
||||
sys.stdout = sys.stderr = self.test_output
|
||||
if self.message_log == self.test_output_log:
|
||||
self.test_output = self.message
|
||||
sys.stdout = sys.stderr = self.test_output
|
||||
|
||||
def _reset_streams(self):
|
||||
sys.stdout = self.orig_stdout
|
||||
sys.stderr = self.orig_stderr
|
||||
def _reset_streams(self):
|
||||
sys.stdout = self.orig_stdout
|
||||
sys.stderr = self.orig_stderr
|
||||
|
||||
def print_raw(self, text):
|
||||
self.output_stream.write(text)
|
||||
self.output_stream.flush()
|
||||
|
||||
def print_raw(self, text):
|
||||
self.output_stream.write(text)
|
||||
self.output_stream.flush()
|
||||
def print_result(self, result, test, directive=None):
|
||||
self.output_stream.write("%s %d %s" % (result, self.testsRun, test.id()))
|
||||
if directive:
|
||||
self.output_stream.write(" # " + directive)
|
||||
self.output_stream.write("\n")
|
||||
self.output_stream.flush()
|
||||
|
||||
def print_result(self, result, test, directive = None):
|
||||
self.output_stream.write("%s %d %s" % (result, self.testsRun, test.id()))
|
||||
if directive:
|
||||
self.output_stream.write(" # " + directive)
|
||||
self.output_stream.write("\n")
|
||||
self.output_stream.flush()
|
||||
def ok(self, test, directive=None):
|
||||
self.print_result("ok", test, directive)
|
||||
|
||||
def ok(self, test, directive = None):
|
||||
self.print_result("ok", test, directive)
|
||||
def not_ok(self, test):
|
||||
self.print_result("not ok", test)
|
||||
|
||||
def not_ok(self, test):
|
||||
self.print_result("not ok", test)
|
||||
def startTest(self, test):
|
||||
super(TAPTestResult, self).startTest(test)
|
||||
|
||||
def startTest(self, test):
|
||||
super(TAPTestResult, self).startTest(test)
|
||||
def stopTest(self, test):
|
||||
super(TAPTestResult, self).stopTest(test)
|
||||
if self.message_log == self.test_output_log:
|
||||
logs = [(self.message_log, self.message, "output")]
|
||||
else:
|
||||
logs = [
|
||||
(self.test_output_log, self.test_output, "test_output"),
|
||||
(self.message_log, self.message, "message"),
|
||||
]
|
||||
for log_mode, log, log_name in logs:
|
||||
if log_mode != LogMode.LogToError:
|
||||
output = log.getvalue()
|
||||
if len(output):
|
||||
if log_mode == LogMode.LogToYAML:
|
||||
self.print_raw(" ---\n")
|
||||
self.print_raw(" " + log_name + ": |\n")
|
||||
self.print_raw(
|
||||
" " + output.rstrip().replace("\n", "\n ") + "\n"
|
||||
)
|
||||
self.print_raw(" ...\n")
|
||||
elif log_mode == LogMode.LogToAttachment:
|
||||
self.print_raw(" ---\n")
|
||||
self.print_raw(" " + log_name + ":\n")
|
||||
self.print_raw(" File-Name: " + log_name + ".txt\n")
|
||||
self.print_raw(" File-Type: text/plain\n")
|
||||
self.print_raw(
|
||||
" File-Content: " + base64.b64encode(output) + "\n"
|
||||
)
|
||||
self.print_raw(" ...\n")
|
||||
else:
|
||||
self.print_raw(
|
||||
"# " + output.rstrip().replace("\n", "\n# ") + "\n"
|
||||
)
|
||||
# Truncate doesn't change the current stream position.
|
||||
# Seek to the beginning to avoid extensions on subsequent writes.
|
||||
log.seek(0)
|
||||
log.truncate(0)
|
||||
|
||||
def stopTest(self, test):
|
||||
super(TAPTestResult, self).stopTest(test)
|
||||
if self.message_log == self.test_output_log:
|
||||
logs = [(self.message_log, self.message, "output")]
|
||||
else:
|
||||
logs = [
|
||||
(self.test_output_log, self.test_output, "test_output"),
|
||||
(self.message_log, self.message, "message")
|
||||
]
|
||||
for log_mode, log, log_name in logs:
|
||||
if log_mode != LogMode.LogToError:
|
||||
output = log.getvalue()
|
||||
if len(output):
|
||||
if log_mode == LogMode.LogToYAML:
|
||||
self.print_raw(" ---\n")
|
||||
self.print_raw(" " + log_name + ": |\n")
|
||||
self.print_raw(" " + output.rstrip().replace("\n", "\n ") + "\n")
|
||||
self.print_raw(" ...\n")
|
||||
elif log_mode == LogMode.LogToAttachment:
|
||||
self.print_raw(" ---\n")
|
||||
self.print_raw(" " + log_name + ":\n")
|
||||
self.print_raw(" File-Name: " + log_name + ".txt\n")
|
||||
self.print_raw(" File-Type: text/plain\n")
|
||||
self.print_raw(" File-Content: " + base64.b64encode(output) + "\n")
|
||||
self.print_raw(" ...\n")
|
||||
else:
|
||||
self.print_raw("# " + output.rstrip().replace("\n", "\n# ") + "\n")
|
||||
# Truncate doesn't change the current stream position.
|
||||
# Seek to the beginning to avoid extensions on subsequent writes.
|
||||
log.seek(0)
|
||||
log.truncate(0)
|
||||
def addSuccess(self, test):
|
||||
super(TAPTestResult, self).addSuccess(test)
|
||||
self.ok(test)
|
||||
|
||||
def addSuccess(self, test):
|
||||
super(TAPTestResult, self).addSuccess(test)
|
||||
self.ok(test)
|
||||
def addError(self, test, err):
|
||||
super(TAPTestResult, self).addError(test, err)
|
||||
self.message.write(self.errors[-1][1] + "\n")
|
||||
self.not_ok(test)
|
||||
|
||||
def addError(self, test, err):
|
||||
super(TAPTestResult, self).addError(test, err)
|
||||
self.message.write(self.errors[-1][1] + "\n")
|
||||
self.not_ok(test)
|
||||
def addFailure(self, test, err):
|
||||
super(TAPTestResult, self).addFailure(test, err)
|
||||
self.message.write(self.failures[-1][1] + "\n")
|
||||
self.not_ok(test)
|
||||
|
||||
def addFailure(self, test, err):
|
||||
super(TAPTestResult, self).addFailure(test, err)
|
||||
self.message.write(self.failures[-1][1] + "\n")
|
||||
self.not_ok(test)
|
||||
def addSkip(self, test, reason):
|
||||
super(TAPTestResult, self).addSkip(test, reason)
|
||||
self.ok(test, "SKIP " + reason)
|
||||
|
||||
def addSkip(self, test, reason):
|
||||
super(TAPTestResult, self).addSkip(test, reason)
|
||||
self.ok(test, "SKIP " + reason)
|
||||
def addExpectedFailure(self, test, err):
|
||||
super(TAPTestResult, self).addExpectedFailure(test, err)
|
||||
self.ok(test)
|
||||
|
||||
def addExpectedFailure(self, test, err):
|
||||
super(TAPTestResult, self).addExpectedFailure(test, err)
|
||||
self.ok(test)
|
||||
|
||||
def addUnexpectedSuccess(self, test):
|
||||
super(TAPTestResult, self).addUnexpectedSuccess(test)
|
||||
self.message.write("Unexpected success" + "\n")
|
||||
self.not_ok(test)
|
||||
def addUnexpectedSuccess(self, test):
|
||||
super(TAPTestResult, self).addUnexpectedSuccess(test)
|
||||
self.message.write("Unexpected success" + "\n")
|
||||
self.not_ok(test)
|
||||
|
||||
|
||||
class TAPTestRunner(object):
|
||||
def __init__(self,
|
||||
message_log = LogMode.LogToYAML,
|
||||
test_output_log = LogMode.LogToDiagnostics,
|
||||
output_stream = sys.stdout, error_stream = sys.stderr):
|
||||
self.output_stream = output_stream
|
||||
self.error_stream = error_stream
|
||||
self.message_log = message_log
|
||||
self.test_output_log = test_output_log
|
||||
def __init__(
|
||||
self,
|
||||
message_log=LogMode.LogToYAML,
|
||||
test_output_log=LogMode.LogToDiagnostics,
|
||||
output_stream=sys.stdout,
|
||||
error_stream=sys.stderr,
|
||||
):
|
||||
self.output_stream = output_stream
|
||||
self.error_stream = error_stream
|
||||
self.message_log = message_log
|
||||
self.test_output_log = test_output_log
|
||||
|
||||
def run(self, test):
|
||||
result = TAPTestResult(
|
||||
self.output_stream,
|
||||
self.error_stream,
|
||||
self.message_log,
|
||||
self.test_output_log)
|
||||
test(result)
|
||||
result.printErrors()
|
||||
def run(self, test):
|
||||
result = TAPTestResult(
|
||||
self.output_stream,
|
||||
self.error_stream,
|
||||
self.message_log,
|
||||
self.test_output_log,
|
||||
)
|
||||
test(result)
|
||||
result.printErrors()
|
||||
|
||||
return result
|
||||
return result
|
||||
|
||||
Reference in New Issue
Block a user