Skip to content

Commit b603499

Browse files
committed
tests: Update tests for inherit-wayland-socket
1 parent d2d107e commit b603499

File tree

6 files changed

+12
-7
lines changed

6 files changed

+12
-7
lines changed

tests/content/system/flatpak/app/com.test.Basic/current/active/metadata

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Context]
22
shared=network;ipc;
3-
sockets=x11;fallback-x11;wayland;pulseaudio;system-bus;session-bus;ssh-auth;pcsc;cups;gpg-agent;
3+
sockets=x11;fallback-x11;wayland;pulseaudio;system-bus;session-bus;ssh-auth;pcsc;cups;gpg-agent;inherit-wayland-socket;
44
devices=dri;input;kvm;shm;all;
55
features=bluetooth;devel;multiarch;canbus;per-app-dev-shm;
66
filesystems=host;host-os;host-etc;home;~/test;

tests/content/system/flatpak/app/com.test.BasicNegated/current/active/metadata

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Context]
22
shared=!network;!ipc;
3-
sockets=!x11;!fallback-x11;!wayland;!pulseaudio;!system-bus;!session-bus;!ssh-auth;!pcsc;!cups;!gpg-agent;
3+
sockets=!x11;!fallback-x11;!wayland;!pulseaudio;!system-bus;!session-bus;!ssh-auth;!pcsc;!cups;!gpg-agent;!inherit-wayland-socket;
44
devices=!dri;!input;!kvm;!shm;!all;
55
features=!bluetooth;!devel;!multiarch;!canbus;!per-app-dev-shm;
66
filesystems=!host;!host-os;!host-etc;!home;!~/test;
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Context]
22
shared=network;ipc;
3-
sockets=x11;fallback-x11;wayland;pulseaudio;system-bus;session-bus;ssh-auth;cups;gpg-agent;
3+
sockets=x11;fallback-x11;wayland;pulseaudio;system-bus;session-bus;ssh-auth;cups;gpg-agent;inherit-wayland-socket;
44
devices=dri;all;
55
features=bluetooth;devel;multiarch;
66
filesystems=host;home;~/test;

tests/content/user/flatpak/overrides/com.test.Basic

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Context]
22
shared=!network;!ipc;
3-
sockets=!x11;!fallback-x11;!wayland;!pulseaudio;!system-bus;!session-bus;!ssh-auth;!pcsc;!cups;!gpg-agent;
3+
sockets=!x11;!fallback-x11;!wayland;!pulseaudio;!system-bus;!session-bus;!ssh-auth;!pcsc;!cups;!gpg-agent;!inherit-wayland-socket;
44
devices=!dri;!input;!kvm;!shm;!all;
55
features=!bluetooth;!devel;!multiarch;!canbus;!per-app-dev-shm;
66
filesystems=!host;!host-os;!host-etc;!home;!~/test;

tests/content/user/flatpak/overrides/com.test.BasicNegated

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Context]
22
shared=network;ipc;
3-
sockets=x11;fallback-x11;wayland;pulseaudio;system-bus;session-bus;ssh-auth;pcsc;cups;gpg-agent;
3+
sockets=x11;fallback-x11;wayland;pulseaudio;system-bus;session-bus;ssh-auth;pcsc;cups;gpg-agent;inherit-wayland-socket;
44
devices=dri;input;kvm;shm;all;
55
features=bluetooth;devel;multiarch;canbus;per-app-dev-shm;
66
filesystems=host;host-os;host-etc;home;~/test;

tests/src/testModels.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const {
3333

3434
setup();
3535

36-
const _totalPermissions = 39;
36+
const _totalPermissions = 40;
3737

3838
const _basicAppId = 'com.test.Basic';
3939
const _basicNegatedAppId = 'com.test.BasicNegated';
@@ -179,6 +179,7 @@ describe('Model', function() {
179179
expect(permissionsDefault.sockets_pcsc).toBe(true);
180180
expect(permissionsDefault.sockets_cups).toBe(true);
181181
expect(permissionsDefault.sockets_gpg_agent).toBe(true);
182+
expect(permissionsDefault.sockets_inherit_wayland_socket).toBe(true);
182183
expect(permissionsDefault.devices_dri).toBe(true);
183184
expect(permissionsDefault.devices_input).toBe(true);
184185
expect(permissionsDefault.devices_kvm).toBe(true);
@@ -218,6 +219,7 @@ describe('Model', function() {
218219
expect(permissionsDefault.sockets_pcsc).toBe(false);
219220
expect(permissionsDefault.sockets_cups).toBe(false);
220221
expect(permissionsDefault.sockets_gpg_agent).toBe(false);
222+
expect(permissionsDefault.sockets_inherit_wayland_socket).toBe(false);
221223
expect(permissionsDefault.devices_dri).toBe(false);
222224
expect(permissionsDefault.devices_input).toBe(false);
223225
expect(permissionsDefault.devices_kvm).toBe(false);
@@ -255,6 +257,7 @@ describe('Model', function() {
255257
expect(permissionsDefault.sockets_pcsc).toBe(false);
256258
expect(permissionsDefault.sockets_cups).toBe(false);
257259
expect(permissionsDefault.sockets_gpg_agent).toBe(false);
260+
expect(permissionsDefault.sockets_inherit_wayland_socket).toBe(false);
258261
expect(permissionsDefault.devices_dri).toBe(false);
259262
expect(permissionsDefault.devices_input).toBe(false);
260263
expect(permissionsDefault.devices_kvm).toBe(false);
@@ -294,6 +297,7 @@ describe('Model', function() {
294297
expect(permissionsDefault.sockets_pcsc).toBe(true);
295298
expect(permissionsDefault.sockets_cups).toBe(true);
296299
expect(permissionsDefault.sockets_gpg_agent).toBe(true);
300+
expect(permissionsDefault.sockets_inherit_wayland_socket).toBe(true);
297301
expect(permissionsDefault.devices_dri).toBe(true);
298302
expect(permissionsDefault.devices_input).toBe(true);
299303
expect(permissionsDefault.devices_kvm).toBe(true);
@@ -360,6 +364,7 @@ describe('Model', function() {
360364
expect(permissionsDefault.sockets_ssh_auth).toBe(true);
361365
expect(permissionsDefault.sockets_cups).toBe(true);
362366
expect(permissionsDefault.sockets_gpg_agent).toBe(true);
367+
expect(permissionsDefault.sockets_inherit_wayland_socket).toBe(true);
363368
expect(permissionsDefault.devices_dri).toBe(false);
364369
expect(permissionsDefault.devices_all).toBe(true);
365370
expect(permissionsDefault.features_bluetooth).toBe(false);
@@ -706,7 +711,7 @@ describe('Model', function() {
706711

707712
const total = permissionsDefault.getAll().filter(p => p.supported).length;
708713

709-
expect(total).toEqual(_totalPermissions - 9);
714+
expect(total).toEqual(_totalPermissions - 10);
710715
});
711716

712717
it('handles missing .flatpak-info', function() {

0 commit comments

Comments
 (0)