diff --git a/packit.yaml b/packit.yaml index c95b93350aa..6e53a3277c4 100644 --- a/packit.yaml +++ b/packit.yaml @@ -23,40 +23,6 @@ srpm_build_deps: # use the nicely formatted release NEWS from our upstream release, instead of git shortlog copy_upstream_release_description: true jobs: - - job: tests - identifier: self - trigger: pull_request - targets: - - fedora-40 - - fedora-41 - - fedora-latest-stable-aarch64 - - fedora-rawhide - - centos-stream-9-x86_64 - - centos-stream-9-aarch64 - - centos-stream-10 - - # current Fedora runs reverse dependency testing against https://copr.fedorainfracloud.org/coprs/g/cockpit/main-builds/ - - job: tests - identifier: revdeps - trigger: pull_request - targets: - - fedora-latest-stable - tf_extra_params: - environments: - - artifacts: - - type: repository-file - id: https://copr.fedorainfracloud.org/coprs/g/cockpit/main-builds/repo/fedora-$releasever/group_cockpit-main-builds-fedora-$releasever.repo - tmt: - context: - revdeps: "yes" - - # run build/unit tests on some interesting architectures - - job: copr_build - trigger: pull_request - targets: - # big-endian - - fedora-development-s390x - # for cross-project testing - job: copr_build trigger: commit diff --git a/src/session/session-utils.c b/src/session/session-utils.c index 2617c0ab46d..c51f2f3f91f 100644 --- a/src/session/session-utils.c +++ b/src/session/session-utils.c @@ -63,6 +63,7 @@ read_authorize_response (const char *what) debug ("EOF reading %s authorize message", what); exit (0); } + debug ("XXX read_authorize_response: '%s'", message); return (char *)message; } @@ -77,7 +78,7 @@ char *get_authorize_key (const char *json, const char *key, bool required) * whitespace, everything is a string, and no escaped ". */ if (json == NULL || json[0] != '\n' || json[1] != '{') - errx (EX, "authorize message doesn't start with \\n{"); + errx (EX, "authorize message doesn't start with \\n{: '%s'", json); char *key_match; int key_match_len = asprintfx (&key_match, "\"%s\":\"", key); @@ -88,7 +89,7 @@ char *get_authorize_key (const char *json, const char *key, bool required) { if (required) errx (EX, "authorize message missing required key %s", key); - debug ("authorize message missing optional key %s", key); + debug ("authorize message '%s' missing optional key %s", json, key); return NULL; } @@ -98,7 +99,9 @@ char *get_authorize_key (const char *json, const char *key, bool required) size_t value_len = strcspn (match, "\""); if (match[value_len] != '"') errx (EX, "syntax error, expected closing quote"); - return strndup (match, value_len); + char *res = strndup (match, value_len); + debug ("XXX get_authorize_key: %s found in '%s': '%s'", key, json, res); + return res; } void diff --git a/src/session/session-utils.h b/src/session/session-utils.h index cb27edd14a4..ce8a30126a7 100644 --- a/src/session/session-utils.h +++ b/src/session/session-utils.h @@ -41,7 +41,7 @@ #include "common/cockpitauthorize.h" #include "common/cockpitmemory.h" -#define DEBUG_SESSION 0 +#define DEBUG_SESSION 1 #if DEBUG_SESSION #define debug(fmt, ...) (fprintf (stderr, "%s: " fmt "\n", program_name, ##__VA_ARGS__)) diff --git a/test/run b/test/run index 8ea73e2db06..279b1862a6d 100755 --- a/test/run +++ b/test/run @@ -25,7 +25,7 @@ PREPARE_OPTS="" RUN_OPTS="" ALL_TESTS="$(test/common/run-tests --test-dir test/verify -l)" -RE_NETWORKING='Networking|Bonding|Connection|TestBridge|WireGuard|Firewall|Team|IPA|AD|Kerberos' +RE_NETWORKING='IPA|AD' RE_STORAGE='Storage' RE_EXPENSIVE='HostSwitching|MultiMachine|Updates|Superuser|Kdump|Pages' @@ -78,5 +78,7 @@ if [ -n "$TEST_SCENARIO" ] && [ -z "$RUN_OPTS" ]; then exit 1 fi +export TEST_ALLOW_JOURNAL_MESSAGES="cockpit-session:.*" + test/image-prepare --verbose ${PREPARE_OPTS} "$TEST_OS" -test/common/run-tests --jobs ${TEST_JOBS:-1} --test-dir test/verify --track-naughties ${RUN_OPTS} +test/common/run-tests --jobs ${TEST_JOBS:-1} --test-dir test/verify --track-naughties --amplify TestAD.testQualifiedUsers ${RUN_OPTS}