Skip to content
Snippets Groups Projects
Commit 3795cbf3 authored by Simon McVittie's avatar Simon McVittie
Browse files

test-ui: Rename "runtime" to "container runtime"


When we start dealing with LD_LIBRARY_PATH runtimes too, the difference
will become significant.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 3468185b
No related branches found
No related tags found
No related merge requests found
...@@ -67,7 +67,7 @@ class Gui: ...@@ -67,7 +67,7 @@ class Gui:
self.home = GLib.get_home_dir() self.home = GLib.get_home_dir()
self.runtimes = {} # type: typing.Dict[str, str] self.container_runtimes = {} # type: typing.Dict[str, str]
for search in ( for search in (
os.getenv('PRESSURE_VESSEL_RUNTIME_BASE'), os.getenv('PRESSURE_VESSEL_RUNTIME_BASE'),
...@@ -93,7 +93,7 @@ class Gui: ...@@ -93,7 +93,7 @@ class Gui:
if os.path.isdir(files): if os.path.isdir(files):
description = self._describe_runtime(path) description = self._describe_runtime(path)
self.runtimes[path] = description self.container_runtimes[path] = description
self.window = Gtk.Window() self.window = Gtk.Window()
self.window.set_default_size(600, 300) self.window.set_default_size(600, 300)
...@@ -124,24 +124,24 @@ class Gui: ...@@ -124,24 +124,24 @@ class Gui:
self.grid.attach(label, 0, row, 2, 1) self.grid.attach(label, 0, row, 2, 1)
row += 1 row += 1
runtime_label = Gtk.Label.new('Runtime') label = Gtk.Label.new('Container runtime')
self.grid.attach(runtime_label, 0, row, 1, 1) self.grid.attach(label, 0, row, 1, 1)
self.runtime_combo = Gtk.ComboBoxText.new() self.container_runtime_combo = Gtk.ComboBoxText.new()
self.runtime_combo.append( self.container_runtime_combo.append(
'/', '/',
'None (use host system and traditional LD_LIBRARY_PATH runtime)' 'None (use host system and traditional LD_LIBRARY_PATH runtime)'
) )
for path, description in sorted(self.runtimes.items()): for path, description in sorted(self.container_runtimes.items()):
self.runtime_combo.append(path, description) self.container_runtime_combo.append(path, description)
if self.runtimes: if self.container_runtimes:
self.runtime_combo.set_active(1) self.container_runtime_combo.set_active(1)
else: else:
self.runtime_combo.set_active(0) self.container_runtime_combo.set_active(0)
self.grid.attach(self.runtime_combo, 1, row, 1, 1) self.grid.attach(self.container_runtime_combo, 1, row, 1, 1)
row += 1 row += 1
...@@ -352,7 +352,7 @@ class Gui: ...@@ -352,7 +352,7 @@ class Gui:
), ),
] ]
id = self.runtime_combo.get_active_id() id = self.container_runtime_combo.get_active_id()
if id is None: if id is None:
argv.append('--runtime=') argv.append('--runtime=')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment