server_pack_e2e: start the game and the servers through lab.game_env
The new home-leak test rejects scripts that set HORIZON_NO_AUDIO by hand; this one, added on main since, did. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -206,9 +206,8 @@ class Game:
|
||||
self.home = work / 'home'
|
||||
for d in ('home', 'launcher', 'data', 'config'):
|
||||
(work / d).mkdir(parents=True)
|
||||
self.env = dict(os.environ, HORIZON_HOME=str(self.home), HORIZON_LAUNCHER_HOME=str(work / 'launcher'),
|
||||
XDG_DATA_HOME=str(work / 'data'), XDG_CONFIG_HOME=str(work / 'config'),
|
||||
HORIZON_LAUNCHER_NO_SELF_UPDATE='1', HORIZON_NO_AUDIO='1', HORIZON_TELEMETRY_URL='off')
|
||||
self.env = lab.game_env(HORIZON_HOME=self.home, HORIZON_LAUNCHER_HOME=work / 'launcher',
|
||||
XDG_DATA_HOME=work / 'data', XDG_CONFIG_HOME=work / 'config', HORIZON_TELEMETRY_URL='off')
|
||||
self.base = [str(bins / 'horizon-ctl'), '--socket', str(work / 'c.sock')]
|
||||
self.log = work / 'c.log'
|
||||
reply = self('launch', '--game', bins / 'horizon-client', '--offscreen', '--resources', resources)
|
||||
@@ -343,7 +342,7 @@ class Run:
|
||||
('XDG_CONFIG_HOME', 'config')):
|
||||
(work / 'servers' / sub).mkdir(parents=True)
|
||||
os.environ[var] = str(work / 'servers' / sub)
|
||||
os.environ.update(HORIZON_LAUNCHER_NO_SELF_UPDATE='1', HORIZON_NO_AUDIO='1', HORIZON_TELEMETRY_URL='off')
|
||||
os.environ.update(lab.game_env(HORIZON_TELEMETRY_URL='off'))
|
||||
game = self.game = Game(Path(self.args.bin), self.resources, work / 'game')
|
||||
servers_dat = game.home / 'servers.dat'
|
||||
downloads = game.home / 'downloads'
|
||||
|
||||
Reference in New Issue
Block a user