gnome-photos: 3.32.0 → 3.32.1 #67318

jtojnar · 2019-08-23T01:17:59Z

Moves some GNOME packages to top-level namespace
Upgrades gnome-photos
Adds installed tests

https://gitlab.gnome.org/GNOME/gnome-photos/blob/3.32.1/NEWS#L1-10

worldofpeace · 2019-08-23T01:58:36Z

@jtojnar I think gnome-photos tests probably need dconf.

jtojnar · 2019-08-23T02:00:22Z

Yeah, but it is not enough. Currently debugging that.

jtojnar · 2019-08-23T02:17:42Z

With the following debug patch

diff --git a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
index cca98c43dc7..6b3b3f7d0ad 100644
--- a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
+++ b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
@@ -4,7 +4,17 @@
 
 with lib;
 
-{
+let
+  package = pkgs.at-spi2-core.overrideAttrs (attrs: {
+    nativeBuildInputs = attrs.nativeBuildInputs ++ [ pkgs.makeWrapper ];
+
+    postFixup = ''
+      wrapProgram $out/libexec/at-spi-bus-launcher \
+        --prefix XDG_DATA_DIRS : ${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}
+    '';
+  });
+
+in {
 
   ###### interface
 
@@ -30,9 +40,9 @@
 
   config = mkMerge [
     (mkIf config.services.gnome3.at-spi2-core.enable {
-      environment.systemPackages = [ pkgs.at-spi2-core ];
-      services.dbus.packages = [ pkgs.at-spi2-core ];
-      systemd.packages = [ pkgs.at-spi2-core ];
+      environment.systemPackages = [ package ];
+      services.dbus.packages = [ package ];
+      systemd.packages = [ package ];
     })
 
     (mkIf (!config.services.gnome3.at-spi2-core.enable) {
diff --git a/nixos/tests/gnome-photos.nix b/nixos/tests/gnome-photos.nix
index 74c1aea4db2..aa5c4d8def0 100644
--- a/nixos/tests/gnome-photos.nix
+++ b/nixos/tests/gnome-photos.nix
@@ -16,6 +16,7 @@
 
   testScript = ''
     $machine->waitForX;
-    $machine->succeed("gnome-desktop-testing-runner -d '${pkgs.gnome-photos.installedTests}/share'");
+    $machine->execute("env G_MESSAGES_DEBUG=all gnome-desktop-testing-runner -d '${pkgs.gnome-photos.installedTests}/share' gnome-photos/basic.py.test");
+    $machine->execute("cat /tmp/dogtail-root/logs/.basic-wrapped_*_debug");
   '';
 })

all warnings disappear but the test is still failing:

machine: running command: env G_MESSAGES_DEBUG=all gnome-desktop-testing-runner -d '/nix/store/0vw0sgclpn171hnnivvwgwpsgsdms6y5-gnome-photos-3.32.1-installedTests/share' gnome-photos/basic.py.test
machine# [   26.102431] dbus-daemon[803]: [session uid=0 pid=801] Activating service name='org.a11y.Bus' requested by ':1.0' (uid=0 pid=839 comm="/nix/store/2zqdjd1xrg4nljkkxi9mw6bgy132rz1x-python")
machine# [   26.194530] dbus-daemon[803]: [session uid=0 pid=801] Successfully activated service 'org.a11y.Bus'
machine# [   26.238909] org.a11y.Bus[803]: dbus-daemon[855]: Activating service name='org.a11y.atspi.Registry' requested by ':1.0' (uid=0 pid=839 comm="/nix/store/2zqdjd1xrg4nljkkxi9mw6bgy132rz1x-python")
machine# [   26.423570] org.a11y.Bus[803]: dbus-daemon[855]: Successfully activated service 'org.a11y.atspi.Registry'
machine# [   26.438842] org.a11y.Bus[803]: SpiRegistry daemon is running with well-known name - org.a11y.atspi.Registry
machine# [   26.591853] dbus-daemon[803]: [session uid=0 pid=801] Activating service name='ca.desrt.dconf' requested by ':1.3' (uid=0 pid=839 comm="/nix/store/2zqdjd1xrg4nljkkxi9mw6bgy132rz1x-python")
machine# [   26.695121] dbus-daemon[803]: [session uid=0 pid=801] Successfully activated service 'ca.desrt.dconf'
machine# [   27.006613] gnome-desktop-testing-runner[837]: Executing: gnome-photos/basic.py.test
machine# [   27.590633] gnome-desktop-testing-runner[837]: FAIL: gnome-photos/basic.py.test (Child process exited with code 1)
machine# [   27.613062] gnome-desktop-testing-runner[837]: SUMMARY: total=1; passed=0; skipped=0; failed=1; user=0.7s; system=0.5s; maxrss=67848

It succeeds in my user session:

nix run -f . gnome-desktop-testing ostree -c env G_MESSAGES_DEBUG=all gnome-desktop-testing-runner -d $(nix-build -A gnome-photos.installedTests --no-out-link)/share gnome-photos/basic.py.test

jtojnar · 2019-08-23T04:05:28Z

The missing part was adding gnome-photos to services.dbus.packages and enabling the accessibility for dogtail to work. Wow, that is hideous – perhaps we should create a package providing gsettings wrapped with desktop schemas.

worldofpeace · 2019-08-23T04:09:01Z

I came upon that as well maybe 15 minutes ago. It caused an involuntary cringe, I had to look away 🤣

worldofpeace · 2019-08-23T04:13:30Z

Wow, that is hideous – perhaps we should create a package providing gsettings wrapped with desktop schemas.

Is there a metric on how many other tests use dogtail? I'd dislike having to copy the same hack.

jtojnar · 2019-08-23T04:19:43Z

I think it is quite rare (< 10 projects relying on it). Some packages were even removing it as it has not been maintained until recently.

worldofpeace · 2019-08-23T04:35:33Z

nixos/tests/gnome-photos.nix

+  testScript = ''
+    $machine->waitForX;
+    # dogtail needs accessibility enabled
+    $machine->succeed("env GIO_EXTRA_MODULES='${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules' XDG_DATA_DIRS='${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}' ${pkgs.glib.bin}/bin/gsettings set org.gnome.desktop.interface toolkit-accessibility true 2>&1");


Can you make let the environment variables string into the testScript so it's clearer to read?

worldofpeace

LGTM with above comment.

worldofpeace · 2019-08-23T17:38:24Z

Oh, I see warnings in the test for tracker dbus interfaces

machine# [   20.071667] .gnome-photos-w[903]: Unable to create PhotosTrackerQueue: Failed to load SPARQL backend: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name org.freedesktop.Tracker1 was not provided by any .service files
machine# [   20.131247] .gnome-photos-w[903]: Unable to create PhotosTrackerQueue: Failed to load SPARQL backend: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name org.freedesktop.Tracker1 was not provided by any .service files

Think we should enable them?

jtojnar · 2019-08-23T17:41:16Z

I tried but then it also wants dleyna and since the test just checks if the interface works, I did not want to descend into this rabbit hole.

worldofpeace

LGTM. No 🐇 today 😄

jtojnar added 8 commits August 23, 2019 01:49

gnome3.gnome-photos: 3.32.0 → 3.32.1

bd3d978

https://gitlab.gnome.org/GNOME/gnome-photos/blob/3.32.1/NEWS#L1-10

gnome3.gnome-photos: clean up expression

4a55819

gnome-online-accounts: move from gnome3

fac090c

grilo: move from gnome3

a2ba083

grilo-plugins: move from gnome3

795e37b

tracker: move from gnome3

4919db9

tracker-miners: move from gnome3

b8ba71d

gnome-photos: move from gnome3

c241e97

ofborg bot added 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: nixos 8.has: module (update) labels Aug 23, 2019

jtojnar requested a review from worldofpeace August 23, 2019 01:30

ofborg bot added the 8.has: package (new) label Aug 23, 2019

ofborg bot requested a review from hedning August 23, 2019 01:30

ofborg bot added 11.by: package-maintainer 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 labels Aug 23, 2019

jtojnar added the 2.status: work-in-progress label Aug 23, 2019

jtojnar force-pushed the gnome-photos branch 2 times, most recently from a168d2a to 0044924 Compare August 23, 2019 02:16

jtojnar force-pushed the gnome-photos branch from 0044924 to f4059c2 Compare August 23, 2019 04:01

worldofpeace reviewed Aug 23, 2019

View reviewed changes

worldofpeace approved these changes Aug 23, 2019

View reviewed changes

gnome-photos: add installed tests

c6eb691

jtojnar force-pushed the gnome-photos branch from f4059c2 to c6eb691 Compare August 23, 2019 17:31

worldofpeace approved these changes Aug 23, 2019

View reviewed changes

ofborg bot requested a review from worldofpeace August 23, 2019 17:46

jtojnar merged commit a8d3aeb into NixOS:master Aug 23, 2019

jtojnar deleted the gnome-photos branch August 23, 2019 17:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

gnome-photos: 3.32.0 → 3.32.1 #67318

gnome-photos: 3.32.0 → 3.32.1 #67318

jtojnar commented Aug 23, 2019

worldofpeace commented Aug 23, 2019 •

edited

jtojnar commented Aug 23, 2019

jtojnar commented Aug 23, 2019 •

edited

jtojnar commented Aug 23, 2019

worldofpeace commented Aug 23, 2019

worldofpeace commented Aug 23, 2019

jtojnar commented Aug 23, 2019 •

edited

worldofpeace Aug 23, 2019

worldofpeace left a comment

worldofpeace commented Aug 23, 2019

jtojnar commented Aug 23, 2019

worldofpeace left a comment

gnome-photos: 3.32.0 → 3.32.1 #67318

gnome-photos: 3.32.0 → 3.32.1 #67318

Conversation

jtojnar commented Aug 23, 2019

worldofpeace commented Aug 23, 2019 • edited

jtojnar commented Aug 23, 2019

jtojnar commented Aug 23, 2019 • edited

jtojnar commented Aug 23, 2019

worldofpeace commented Aug 23, 2019

worldofpeace commented Aug 23, 2019

jtojnar commented Aug 23, 2019 • edited

worldofpeace Aug 23, 2019

Choose a reason for hiding this comment

worldofpeace left a comment

Choose a reason for hiding this comment

worldofpeace commented Aug 23, 2019

jtojnar commented Aug 23, 2019

worldofpeace left a comment

Choose a reason for hiding this comment

worldofpeace commented Aug 23, 2019 •

edited

jtojnar commented Aug 23, 2019 •

edited

jtojnar commented Aug 23, 2019 •

edited