base1: Clean up pybridge special cases

As we only have the Python bridge now, we can drop the dynamic special
casese and C bridge fallbacks from the unit tests.

Drop the fencing and HTTP connection sharing tests -- we haven't missed
these features in years, so it's unlikely we'll bring them back.

However, do keep `skipWithPybridge` for now -- the D-Bus tests still
need to be adjusted or the Python bridge fixed, and that makes them easy
to grep.

Author: martinpitt

pkg/base1/test-dbus.js

@@ -1,5 +1,5 @@
 import cockpit from "cockpit";
-import QUnit, { mock_info, skipWithPybridge } from "qunit-tests";
+import QUnit, { skipWithPybridge } from "qunit-tests";
 
 import { common_dbus_tests, dbus_track_tests } from "./test-dbus-common.js";
 
@@ -547,15 +547,9 @@ QUnit.test("nonexisting address", async assert => {
         await dbus.call("/org/freedesktop/DBus", "org.freedesktop.DBus", "Hello", []);
         assert.ok(false, "should not be reached");
     } catch (ex) {
-        if (await mock_info("pybridge")) {
-            assert.equal(ex.problem, "protocol-error", "got right close code");
-            assert.equal(ex.message, "failed to connect to none bus: [Errno 2] sd_bus_start: No such file or directory",
-                         "error message");
-        } else {
-            // C bridge has a weird error code
-            assert.equal(ex.problem, "internal-error", "got right close code");
-            assert.equal(ex.message, "Could not connect: No such file or directory", "error message");
-        }
+        assert.equal(ex.problem, "protocol-error", "got right close code");
+        assert.equal(ex.message, "failed to connect to none bus: [Errno 2] sd_bus_start: No such file or directory",
+                     "error message");
     }
 });
 

pkg/base1/test-echo.js

@@ -1,5 +1,5 @@
 import cockpit from "cockpit";
-import QUnit, { mock_info } from "qunit-tests";
+import QUnit from "qunit-tests";
 
 QUnit.test("basic", function (assert) {
     const done = assert.async();
@@ -79,47 +79,4 @@ QUnit.test("binary", function (assert) {
     channel.send(buffer);
 });
 
-QUnit.test("fence", async assert => {
-    const done = assert.async();
-
-    // This is implemented in the C bridge, but not in Python.
-    if (await mock_info("pybridge")) {
-        assert.ok(true, "skipping on python bridge, not implemented");
-        done();
-        return;
-    }
-
-    assert.expect(2);
-
-    const before = cockpit.channel({ payload: "echo" });
-    before.addEventListener("message", onMessage);
-
-    const fence = cockpit.channel({ payload: "echo", group: "fence" });
-    fence.addEventListener("message", onMessage);
-
-    const after = cockpit.channel({ payload: "echo" });
-    after.addEventListener("message", onMessage);
-
-    const received = [];
-    function onMessage(ev, payload) {
-        received.push(payload);
-        if (received.length == 3) {
-            assert.deepEqual(received, ["1", "2", "3"], "got back before and fence data");
-            fence.close();
-        } else if (received.length == 5) {
-            assert.deepEqual(received, ["1", "2", "3", "4", "5"], "got back data in right order");
-            before.close();
-            after.close();
-            done();
-        }
-    }
-
-    /* We send messages in this order, but they should echoed in numeric order */
-    before.send("1");
-    after.send("4");
-    after.send("5");
-    fence.send("2");
-    fence.send("3");
-});
-
 QUnit.start();

pkg/base1/test-http.js

@@ -297,60 +297,6 @@ QUnit.test("http promise recursive", assert => {
     assert.equal(typeof promise3.input, "function", "promise3.input()");
 });
 
-QUnit.test("http keep alive", async assert => {
-    assert.expect(1);
-
-    // connection sharing is not implemented in the pybridge
-    if (await mock_info("pybridge")) {
-        assert.rejects(
-            cockpit.http({ port: test_server.port, connection: "one" }).get("/mock/connection"),
-            ex => ex.problem == "protocol-error" && ex.status == undefined,
-            "rejects connection option on python bridge");
-        return;
-    }
-
-    /*
-     * The /mock/connection handler returns an identifier that changes if
-     * a different connection is used.
-     */
-    const first = await cockpit.http({ port: test_server.port, connection: "marmalade" }).get("/mock/connection");
-    const second = await cockpit.http({ port: test_server.port, connection: "marmalade" }).get("/mock/connection");
-    assert.equal(first, second, "same connection");
-});
-
-QUnit.test("http connection different", async assert => {
-    assert.expect(1);
-
-    // connection sharing is not implemented in the pybridge
-    if (await mock_info("pybridge")) {
-        assert.ok(true);
-        return;
-    }
-
-    /*
-     * The /mock/connection handler returns an identifier that changes if
-     * a different connection is used.
-     */
-    const first = await cockpit.http({ port: test_server.port, connection: "one" }).get("/mock/connection");
-    const second = await cockpit.http({ port: test_server.port, connection: "two" }).get("/mock/connection");
-    assert.notEqual(first, second, "different connection");
-});
-
-QUnit.test("http connection without address", async assert => {
-    assert.expect(1);
-
-    // connection sharing is not implemented in the pybridge
-    if (await mock_info("pybridge")) {
-        assert.ok(true);
-        return;
-    }
-
-    // Able to reuse connection client info and not specify address again.
-    const first = await cockpit.http({ port: test_server.port, connection: "one" }).get("/mock/connection");
-    const second = await cockpit.http({ connection: "one" }).get("/mock/connection");
-    assert.equal(first, second, "same connection");
-});
-
 QUnit.test("no dns address", assert => {
     assert.expect(1);
 
@@ -406,15 +352,10 @@ QUnit.test("wrong options", async assert => {
         ex => ex.problem == "protocol-error" && ex.status == undefined,
         "rejects request with both port and unix option");
 
-    // This is disallowed in the pybridge, but allowed in the C bridge
-    if (await mock_info("pybridge")) {
-        assert.rejects(
-            cockpit.http({ unix: "/nonexisting/socket", tls: {} }).get("/"),
-            ex => ex.problem == "protocol-error" && ex.status == undefined,
-            "rejects request with both unix and tls option");
-    } else {
-        assert.ok(true, "skipping on python bridge, not implemented");
-    }
+    assert.rejects(
+        cockpit.http({ unix: "/nonexisting/socket", tls: {} }).get("/"),
+        ex => ex.problem == "protocol-error" && ex.status == undefined,
+        "rejects request with both unix and tls option");
 });
 
 QUnit.test("parallel stress test", async assert => {

pkg/base1/test-stream.js

@@ -1,5 +1,5 @@
 import cockpit from "cockpit";
-import QUnit, { mock_info } from "qunit-tests";
+import QUnit from "qunit-tests";
 
 const QS_REQUEST = "HEAD /mock/qs HTTP/1.0\nHOST: localhost\n\n";
 
@@ -12,18 +12,13 @@ QUnit.test("TCP stream port without a service", async assert => {
     const done = assert.async();
     assert.expect(2);
 
-    const is_pybridge = await mock_info("pybridge");
-
     const channel = cockpit.channel({ payload: "stream", address: "127.0.0.99", port: 2222 });
 
     channel.addEventListener("close", (ev, options) => {
         assert.equal(options.problem, "not-found", "channel should have failed");
-        if (is_pybridge)
-            assert.equal(options.message,
-                         "[Errno 111] Connect call failed ('127.0.0.99', 2222)",
-                         "detailed error message");
-        else
-            assert.equal(options.message, undefined, "C bridge does not give detailed error message");
+        assert.equal(options.message,
+                     "[Errno 111] Connect call failed ('127.0.0.99', 2222)",
+                     "detailed error message");
         done();
     });
 });

pkg/lib/qunit-tests.ts

@@ -28,19 +28,11 @@ export const mock_info = async (key: string) => {
     return (await response.json())[key];
 };
 
-// Convenience for skipping tests that the python bridge can't yet
-// handle.
-
-let is_pybridge: boolean | null = null;
+// Convenience for skipping tests that our python bridge can't yet
+// handle (the C bridge implemented these features)
 
 export const skipWithPybridge = async (name: string, callback: (assert: unknown) => void | Promise<void>) => {
-    if (is_pybridge === null)
-        is_pybridge = await mock_info("pybridge");
-
-    if (is_pybridge)
-        QUnit.skip(name, callback);
-    else
-        QUnit.test(name, callback);
+    QUnit.skip(name, callback);
 };
 
 /* Always use explicit start */

src/ws/test-server.c

@@ -121,7 +121,6 @@ mock_http_info (CockpitWebRequest *request,
                 CockpitWebResponse *response)
 {
   g_autoptr(JsonObject) info = json_object_new ();
-  json_object_set_boolean_member (info, "pybridge", strstr (bridge_argv[0], "py") != NULL);
   json_object_set_boolean_member (info, "skip_slow_tests", g_getenv ("COCKPIT_SKIP_SLOW_TESTS") != NULL);
 
   g_autoptr(GBytes) bytes = cockpit_json_write_bytes (info);