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

Merge branch 'wip/mypy' into 'master'

tests: Reassure mypy that an Optional[str] cannot be None

See merge request !63
parents 75fa3365 f9346dc1
No related branches found
No related tags found
1 merge request!63tests: Reassure mypy that an Optional[str] cannot be None
Pipeline #15138 passed
...@@ -123,7 +123,7 @@ class TestPressureVessel(unittest.TestCase): ...@@ -123,7 +123,7 @@ class TestPressureVessel(unittest.TestCase):
if os.access(ldlp, os.W_OK): if os.access(ldlp, os.W_OK):
self.ld_library_path_runtime = ldlp = os.path.abspath(ldlp) self.ld_library_path_runtime = ldlp = os.path.abspath(ldlp)
else: else:
old = self.ld_library_path_runtime old = ldlp
ldlp = os.path.join(self.tmpdir.name, 'ldlp') ldlp = os.path.join(self.tmpdir.name, 'ldlp')
shutil.copytree(old, ldlp, symlinks=True) shutil.copytree(old, ldlp, symlinks=True)
self.ld_library_path_runtime = ldlp self.ld_library_path_runtime = ldlp
...@@ -136,10 +136,7 @@ class TestPressureVessel(unittest.TestCase): ...@@ -136,10 +136,7 @@ class TestPressureVessel(unittest.TestCase):
old = self.scout_layered old = self.scout_layered
new = os.path.join(self.tmpdir.name, 'scout-on-soldier') new = os.path.join(self.tmpdir.name, 'scout-on-soldier')
shutil.copytree(old, new, symlinks=True) shutil.copytree(old, new, symlinks=True)
os.symlink( os.symlink(ldlp, os.path.join(new, 'steam-runtime'))
self.ld_library_path_runtime,
os.path.join(new, 'steam-runtime'),
)
self.scout_layered = new self.scout_layered = new
else: else:
self.scout_layered = '' self.scout_layered = ''
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment