X-Git-Url: https://v.licheni.net/stack/cam.git/blobdiff_plain/112c04e3926d62291efd902a1dcb0b2d24feeb59..6c8307537698dfaeba9b23ec1d7e198832b6fbd4:/cam/tests/test_openssl_wrap.py diff --git a/cam/tests/test_openssl_wrap.py b/cam/tests/test_openssl_wrap.py index 6392e1b..8ac2dad 100644 --- a/cam/tests/test_openssl_wrap.py +++ b/cam/tests/test_openssl_wrap.py @@ -27,7 +27,7 @@ class OpensslWrapTest(unittest.TestCase): def test_run(self): self.mox.StubOutWithMock(subprocess, 'Popen', use_mock_anything=True) pipe_stub = PopenStub(stdout='output') - subprocess.Popen(['openssl', 'test'], stdout=subprocess.PIPE + subprocess.Popen(['openssl', 'test'], stdout=subprocess.PIPE, env=mox.IsA(dict) ).AndReturn(pipe_stub) self.mox.ReplayAll() result = openssl_wrap.run('test') @@ -36,7 +36,7 @@ class OpensslWrapTest(unittest.TestCase): def test_run_fails(self): self.mox.StubOutWithMock(subprocess, 'Popen', use_mock_anything=True) pipe_stub = PopenStub(returncode=1) - subprocess.Popen(['openssl', 'test'], stdout=subprocess.PIPE + subprocess.Popen(['openssl', 'test'], stdout=subprocess.PIPE, env=mox.IsA(dict) ).AndReturn(pipe_stub) self.mox.ReplayAll() def r(): @@ -47,9 +47,9 @@ class OpensslWrapTest(unittest.TestCase): self.mox.StubOutWithMock(subprocess, 'Popen', use_mock_anything=True) pipe_stub = PopenStub(stdout='output') subprocess.Popen(['openssl', 'test', '-config', 'conf', '-batch', 'arg'], - stdout=subprocess.PIPE).AndReturn(pipe_stub) + stdout=subprocess.PIPE, env=mox.IsA(dict)).AndReturn(pipe_stub) self.mox.ReplayAll() - result = openssl_wrap.run_with_config('conf', 'test', 'arg') + result = openssl_wrap.run_with_config('.', 'conf', 'test', 'arg') if __name__ == '__main__':