Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update cockpit test lib to 323 #79

Merged
merged 1 commit into from
Aug 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -219,10 +219,10 @@ bots:

# checkout Cockpit's test API; this has no API stability guarantee, so check out a stable tag
# when you start a new project, use the latest release, and update it from time to time
# 292 + sizzle workaround for Chromium 113
# 323
test/common:
flock Makefile sh -ec '\
git fetch --depth=1 https://github.com/cockpit-project/cockpit.git d9426e07a261c182d61163900740fd74d02fe99b; \
git fetch --depth=1 https://github.com/cockpit-project/cockpit.git 79623a0a425600da302f66a2752afe35c96f6cf3; \
git checkout --force FETCH_HEAD -- test/common; \
git reset test/common'

Expand Down
9 changes: 2 additions & 7 deletions test/check-subscriptions
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python3
#!/usr/bin/python3 -cimport os, sys; os.execv(os.path.dirname(sys.argv[1]) + "/../test/common/pywrap", sys.argv)
# This file is part of Cockpit.
#
# Copyright (C) 2016 Red Hat, Inc.
Expand All @@ -17,17 +17,12 @@
# along with Cockpit; If not, see <http://www.gnu.org/licenses/>.

import os
import sys
import unittest
import uuid

# import Cockpit's machinery for test VMs and its browser test API
TEST_DIR = os.path.dirname(__file__)
sys.path.append(os.path.join(TEST_DIR, "common"))
sys.path.append(os.path.join(os.path.dirname(TEST_DIR), "bots/machine"))
from packagelib import *
from testlib import *
import testvm
from machine import testvm

# candlepin on the services image has a lot of demo data preloaded
# useful info/commands:
Expand Down
Loading