1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131
|
From: =?utf-8?q?Jeremy_B=C3=ADcha?= <jeremy.bicha@canonical.com>
Date: Thu, 15 Aug 2024 15:59:50 -0400
Subject: exclude web-ide
to match debian/copyright Files-Excluded
---
src/cli/meson.build | 5 ++---
src/cli/tracker-main.c | 2 --
src/meson.build | 2 +-
tests/functional-tests/test_cli.py | 7 +++++++
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/cli/meson.build b/src/cli/meson.build
index 1ec353a..31ee97f 100644
--- a/src/cli/meson.build
+++ b/src/cli/meson.build
@@ -15,11 +15,10 @@ main_command_sources = [
'tracker-introspect.c',
'tracker-main.c',
'tracker-query.c',
- 'tracker-webide.c',
sparql_gresource,
]
-executable(main_command_name, main_command_sources, web_ide_gresources,
+executable(main_command_name, main_command_sources,
c_args: tracker_c_args + [
'-DCLI_METADATA_DIR="@0@"'.format(command_metadata_dir),
'-DMANDIR="@0@"'.format(join_paths(get_option('prefix'), get_option('datadir'), 'man')),
@@ -30,7 +29,7 @@ executable(main_command_name, main_command_sources, web_ide_gresources,
],
install: true,
install_rpath: tracker_internal_libs_dir,
- dependencies: [tracker_common_dep, tracker_sparql_dep, web_ide_dep, gio_unix, avahi_glib, avahi_client],
+ dependencies: [tracker_common_dep, tracker_sparql_dep, gio_unix, avahi_glib, avahi_client],
include_directories: [commoninc, configinc, srcinc],
)
diff --git a/src/cli/tracker-main.c b/src/cli/tracker-main.c
index e5bd249..3681526 100644
--- a/src/cli/tracker-main.c
+++ b/src/cli/tracker-main.c
@@ -34,7 +34,6 @@
#include "tracker-import.h"
#include "tracker-introspect.h"
#include "tracker-query.h"
-#include "tracker-webide.h"
const char usage_string[] =
"tinysparql [--version] [--help]\n"
@@ -72,7 +71,6 @@ static struct cmd_struct commands[] = {
{ "import", tracker_import, N_("Import data into a TinySPARQL database") },
{ "introspect", tracker_introspect, N_("Introspect a SPARQL endpoint") },
{ "query", tracker_query, N_("Query and update the index using SPARQL") },
- { "webide", tracker_webide, N_("Create a Web IDE to query local databases") },
};
static inline void
diff --git a/src/meson.build b/src/meson.build
index 28bd055..71443ad 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -8,7 +8,7 @@ subdir('http')
subdir('ontologies')
# Web IDE
-subdir('web-ide')
+# subdir('web-ide')
# SPARQL library
subdir('libtinysparql')
diff --git a/tests/functional-tests/test_cli.py b/tests/functional-tests/test_cli.py
index 68ddeab..0715649 100644
--- a/tests/functional-tests/test_cli.py
+++ b/tests/functional-tests/test_cli.py
@@ -846,6 +846,7 @@ class TestCli(fixtures.TrackerCommandLineTestCase):
finally:
self.assertIn("--list can only be used with --session or --system", str(ex), "Output not found")
+ @unittest.skip
def test_webide(self):
"""Call webide command"""
with self.tmpdir() as tmpdir:
@@ -868,6 +869,7 @@ class TestCli(fixtures.TrackerCommandLineTestCase):
self.assertEqual(response.reason, "OK")
self.assertIn("<title>TinySPARQL web-IDE</title>", str(response.read(1000)), "HTML title not found")
+ @unittest.skip
def test_webide_404(self):
"""Call webide command"""
with self.tmpdir() as tmpdir:
@@ -888,6 +890,7 @@ class TestCli(fixtures.TrackerCommandLineTestCase):
response = conn.getresponse()
self.assertEqual(response.status, 404)
+ @unittest.skip
def test_webide_404_2(self):
"""Call webide command"""
with self.tmpdir() as tmpdir:
@@ -908,6 +911,7 @@ class TestCli(fixtures.TrackerCommandLineTestCase):
response = conn.getresponse()
self.assertEqual(response.status, 404)
+ @unittest.skip
def test_webide_non_GET(self):
"""Call webide command"""
with self.tmpdir() as tmpdir:
@@ -928,6 +932,7 @@ class TestCli(fixtures.TrackerCommandLineTestCase):
response = conn.getresponse()
self.assertEqual(response.status, 405)
+ @unittest.skip
def test_webide_same_http_port(self):
"""Call 2 web IDEs on the same HTTP port."""
with self.tmpdir() as tmpdir:
@@ -950,6 +955,7 @@ class TestCli(fixtures.TrackerCommandLineTestCase):
finally:
self.assertIn("Error:", str(ex), "Output not found")
+ @unittest.skip
def test_webide_noargs(self):
"""Call webide command with no arguments"""
with self.tmpdir() as tmpdir:
@@ -961,6 +967,7 @@ class TestCli(fixtures.TrackerCommandLineTestCase):
finally:
self.assertIn("Usage:", str(ex), "Output not found")
+ @unittest.skip
def test_webide_wrongarg(self):
"""Call webide command with wrong arguments"""
with self.tmpdir() as tmpdir:
|