PR#40: org.selinux dbus interface is shipped by policycoreutils-dbus - tests/selinux

tests / selinux

#40 org.selinux dbus interface is shipped by policycoreutils-dbus

Merged 4 years ago by plautrba. Opened 4 years ago by plautrba.

tests/ plautrba/selinux org-selinux-dbus-interfaces-requires-dbus into master

org.selinux dbus interface is shipped by policycoreutils-dbus

Petr Lautrbach • 4 years ago

933ad30

policycoreutils/org-selinux-dbus-interfaces/Makefile

file modified

+1 -1

		`@@ -53,7 +53,7 @@`
		`@echo "Type: Sanity" >> $(METADATA)`
		`@echo "TestTime: 10m" >> $(METADATA)`
		`@echo "RunFor: policycoreutils" >> $(METADATA)`
		`- @echo "Requires: policycoreutils-gui selinux-policy-minimum selinux-policy-mls selinux-policy-targeted" >> $(METADATA)`
		`+ @echo "Requires: policycoreutils-dbus selinux-policy-minimum selinux-policy-mls selinux-policy-targeted" >> $(METADATA)`
		`@echo "Priority: Normal" >> $(METADATA)`
		`@echo "License: GPLv2" >> $(METADATA)`
		`@echo "Confidential: no" >> $(METADATA)`

policycoreutils/org-selinux-dbus-interfaces/runtest.sh

file modified

+2 -1

		`@@ -35,7 +35,8 @@`
		`rlJournalStart`
		`rlPhaseStartSetup`
		`rlAssertRpm ${PACKAGE}`
		`- rlAssertRpm ${PACKAGE}-gui`
		`+ # In past, org.selinux dbus interface was shipped in policycoreutils-gui`
		`+ rlRun "rpm -q policycoreutils-dbus \|\| rpm -q policycoreutils-gui" 0`
omos commented 4 years ago Wouldn't it make more sense to check for some shipped file that indicates that the dbus interface is present instead of blindly trying different RPMs? Or is that not possible?
		`rlFileBackup /etc/selinux/config`
		`rlRun "gdbus introspect --system -d org.selinux -o /"`
		`rlRun "gdbus introspect --system -d org.selinux -o /org"`

plautrba commented 4 years ago

In past it was policycoreutils-gui so check whether at least one of them is
installed.

Resolves: https://src.fedoraproject.org/tests/selinux/issue/39

mmalik commented 4 years ago

Looks good to me. ack+

omos commented on line 7 of policycoreutils/org-selinux-dbus-interfaces/runtest.sh 4 years ago

Wouldn't it make more sense to check for some shipped file that indicates that the dbus interface is present instead of blindly trying different RPMs? Or is that not possible?

mmalik commented 4 years ago

Of course, it is possible. Some TCs (which require semanage) already do that.

plautrba commented 4 years ago

Wouldn't it make more sense to check for some shipped file that indicates that the dbus interface is present instead of blindly trying different RPMs? Or is that not possible?

I believe there was a request in past to see a version of installed packages directly in the test log.
If there's no such requirement, you don't have to have to check rpm or file, you just start with the test which would fail if the buds interface doesn't work

Pull-Request has been merged by plautrba

4 years ago

mmalik commented 4 years ago

The requirement to see a version of installed packages is still true. rlAssertRpm "" can be replaced by rlRun "rpm -qf /path/to/file"

omos commented 4 years ago