test: add vscode and rpi-connect services to test_all_services test

ubopod · Sep 3, 2024 · f94cfc7 · f94cfc7
1 parent 1aa5c44
commit f94cfc7
Show file tree

Hide file tree

Showing 7 changed files with 102 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - feat(lightdm): show a notification when rpi-connect is started to inform user desktop should be installed for the screen sharing to work
 - fix(lightdm): install raspberrypi-ui-mods instead of lightdm to activate wayland and enable rpi-connect screen sharing
 - test: fix an issue in tests which caused minor random store state changes, ruining snapshot assertions
+- test: add vscode and rpi-connect services to `test_all_services` test
 
 ## Version 0.15.11
 

diff --git a/scripts/test_on_device.sh b/scripts/test_on_device.sh
@@ -9,6 +9,7 @@ function cleanup() {
   run_on_pod "killall -9 pytest"
 }
 trap cleanup ERR
+trap cleanup SIGINT
 
 copy=${copy:-"False"}
 deps=${deps:-"False"}

diff --git a/tests/integration/results/test_services/all_services_register/store-desktop-000.jsonc b/tests/integration/results/test_services/all_services_register/store-desktop-000.jsonc
@@ -341,6 +341,38 @@
                             "label": "SSH",
                             "opacity": null,
                             "progress": null
+                          },
+                          {
+                            "action": "<function:generate_rpi_connect_menu>",
+                            "background_color": "#68B7FF",
+                            "color": [
+                              1,
+                              1,
+                              1,
+                              1
+                            ],
+                            "icon": "",
+                            "is_short": false,
+                            "key": "rpi_connect",
+                            "label": "RPi Connect",
+                            "opacity": null,
+                            "progress": null
+                          },
+                          {
+                            "action": "<function:generate_vscode_menu>",
+                            "background_color": "#68B7FF",
+                            "color": [
+                              1,
+                              1,
+                              1,
+                              1
+                            ],
+                            "icon": "󰨞",
+                            "is_short": false,
+                            "key": "vscode",
+                            "label": "VSCode",
+                            "opacity": null,
+                            "progress": null
                           }
                         ],
                         "placeholder": "No settings in this category",
@@ -699,7 +731,9 @@
       "Docker": null,
       "IP Addresses": 0,
       "LightDM": 0,
+      "RPi Connect": null,
       "SSH": 1,
+      "VSCode": null,
       "Voice": 0,
       "WiFi": 2
     }
@@ -713,6 +747,13 @@
     "is_busy": false,
     "is_connected": true
   },
+  "rpi_connect": {
+    "is_active": true,
+    "is_downloading": false,
+    "is_installed": null,
+    "is_signed_in": null,
+    "status": null
+  },
   "sensors": {
     "light": {
       "value": 0.0
@@ -765,6 +806,13 @@
     "is_access_key_set": false,
     "selected_engine": "piper"
   },
+  "vscode": {
+    "is_binary_installed": false,
+    "is_downloading": false,
+    "is_logged_in": null,
+    "is_pending": true,
+    "status": null
+  },
   "wifi": {
     "connections": [
       {

diff --git a/tests/integration/results/test_services/all_services_register/store-rpi-000.jsonc b/tests/integration/results/test_services/all_services_register/store-rpi-000.jsonc
@@ -341,6 +341,38 @@
                             "label": "SSH",
                             "opacity": null,
                             "progress": null
+                          },
+                          {
+                            "action": "<function:generate_rpi_connect_menu>",
+                            "background_color": "#68B7FF",
+                            "color": [
+                              1,
+                              1,
+                              1,
+                              1
+                            ],
+                            "icon": "",
+                            "is_short": false,
+                            "key": "rpi_connect",
+                            "label": "RPi Connect",
+                            "opacity": null,
+                            "progress": null
+                          },
+                          {
+                            "action": "<function:generate_vscode_menu>",
+                            "background_color": "#68B7FF",
+                            "color": [
+                              1,
+                              1,
+                              1,
+                              1
+                            ],
+                            "icon": "󰨞",
+                            "is_short": false,
+                            "key": "vscode",
+                            "label": "VSCode",
+                            "opacity": null,
+                            "progress": null
                           }
                         ],
                         "placeholder": "No settings in this category",
@@ -699,7 +731,9 @@
       "Docker": null,
       "IP Addresses": 0,
       "LightDM": 0,
+      "RPi Connect": null,
       "SSH": 1,
+      "VSCode": null,
       "Voice": 0,
       "WiFi": 2
     }
@@ -713,6 +747,13 @@
     "is_busy": false,
     "is_connected": true
   },
+  "rpi_connect": {
+    "is_active": true,
+    "is_downloading": false,
+    "is_installed": null,
+    "is_signed_in": null,
+    "status": null
+  },
   "sensors": {
     "light": {
       "value": 0.0
@@ -765,6 +806,13 @@
     "is_access_key_set": false,
     "selected_engine": "piper"
   },
+  "vscode": {
+    "is_binary_installed": false,
+    "is_downloading": false,
+    "is_logged_in": null,
+    "is_pending": true,
+    "status": null
+  },
   "wifi": {
     "connections": [],
     "current_connection": null,

diff --git a/tests/integration/test_services.py b/tests/integration/test_services.py
@@ -24,6 +24,8 @@
     'sensors',
     'docker',
     'ssh',
+    'vscode',
+    'rpi_connect',
     'voice',
 ]
 

diff --git a/ubo_app/services/050-rpi-connect/rpi_connect_qrcode_page.kv b/ubo_app/services/050-rpi-connect/rpi_connect_qrcode_page.kv
@@ -19,7 +19,7 @@
         pos_hint: {'left': 0.5, 'top': 1}
 
       Label:
-        text: '\n'.join([i.strip() for i in re.split('(.{15}(?:.{0,10}\s|.{10}))', root.url) if i])
+        text: '\n'.join([i.strip() for i in re.split(r'(.{15}(?:.{0,10}\s|.{10}))', root.url) if i])
         size_hint: 1, None
         height: self.texture_size[1]
         font_size: dp(18)

diff --git a/ubo_app/services/050-vscode/vscode_qrcode_page.kv b/ubo_app/services/050-vscode/vscode_qrcode_page.kv
@@ -19,7 +19,7 @@
         pos_hint: {'left': 0.5, 'top': 1}
 
       Label:
-        text: '\n'.join([i.strip() for i in re.split('(.{15}(?:.{0,10}\s|.{10}))', root.url) if i])
+        text: '\n'.join([i.strip() for i in re.split(r'(.{15}(?:.{0,10}\s|.{10}))', root.url) if i])
         size_hint: 1, None
         height: self.texture_size[1]
         font_size: dp(18)