зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1267454 - Allow passing kwargs to the mocked check_output in configure tests. r=glandium
MozReview-Commit-ID: BH3nUUI9nwn
This commit is contained in:
Родитель
a91638058c
Коммит
f99b0b2bf5
|
@ -106,6 +106,7 @@ class ConfigureTestSandbox(ConfigureSandbox):
|
||||||
CalledProcessError=subprocess.CalledProcessError,
|
CalledProcessError=subprocess.CalledProcessError,
|
||||||
check_output=self.check_output,
|
check_output=self.check_output,
|
||||||
PIPE=subprocess.PIPE,
|
PIPE=subprocess.PIPE,
|
||||||
|
STDOUT=subprocess.STDOUT,
|
||||||
Popen=self.Popen,
|
Popen=self.Popen,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -139,8 +140,8 @@ class ConfigureTestSandbox(ConfigureSandbox):
|
||||||
|
|
||||||
return Process()
|
return Process()
|
||||||
|
|
||||||
def check_output(self, args):
|
def check_output(self, args, **kwargs):
|
||||||
proc = self.Popen(args)
|
proc = self.Popen(args, **kwargs)
|
||||||
stdout, stderr = proc.communicate()
|
stdout, stderr = proc.communicate()
|
||||||
retcode = proc.wait()
|
retcode = proc.wait()
|
||||||
if retcode:
|
if retcode:
|
||||||
|
|
Загрузка…
Ссылка в новой задаче