diff options
| author | Andrei Belov <defan@nginx.com> | 2018-10-25 19:00:07 +0300 |
|---|---|---|
| committer | Andrei Belov <defan@nginx.com> | 2018-10-25 19:00:07 +0300 |
| commit | dc3e83f26ce9f92a157d4332c723d531ca411b80 (patch) | |
| tree | a723f2ce7d8c91527fdfb94eeae708292a705417 /test | |
| parent | 8b37c0c70a183f19f7f4245ce0825954d8dbcaf7 (diff) | |
| parent | fd99a738e586326ee5b40a6bc3d09c64b18f394a (diff) | |
| download | unit-dc3e83f26ce9f92a157d4332c723d531ca411b80.tar.gz unit-dc3e83f26ce9f92a157d4332c723d531ca411b80.tar.bz2 | |
Merged with the default branch.1.5-1
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_python_application.py | 1 | ||||
| -rw-r--r-- | test/test_tls.py | 3 | ||||
| -rw-r--r-- | test/unit.py | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/test/test_python_application.py b/test/test_python_application.py index f1e2cbf7..e71b6432 100644 --- a/test/test_python_application.py +++ b/test/test_python_application.py @@ -60,7 +60,6 @@ class TestUnitPythonApplication(unit.TestUnitApplicationPython): self.assertEqual(self.get()['headers']['Server-Port'], '7080', 'Server-Port header') - @unittest.expectedFailure def test_python_application_204_transfer_encoding(self): self.load('204_no_content') diff --git a/test/test_tls.py b/test/test_tls.py index 26bedcb7..aaf939ec 100644 --- a/test/test_tls.py +++ b/test/test_tls.py @@ -137,11 +137,14 @@ class TestUnitTLS(unit.TestUnitApplicationTLS): 'RSA (1024 bits)', 'certificate key rsa') def test_tls_certificate_key_ec(self): + self.load('empty') + subprocess.call(['openssl', 'ecparam', '-noout', '-genkey', '-out', self.testdir + '/ec.key', '-name', 'prime256v1']) subprocess.call(['openssl', 'req', '-x509', '-new', + '-config', self.testdir + '/openssl.conf', '-key', self.testdir + '/ec.key', '-subj', '/CN=ec/', '-out', self.testdir + '/ec.crt']) diff --git a/test/unit.py b/test/unit.py index cec62489..98a0a4db 100644 --- a/test/unit.py +++ b/test/unit.py @@ -477,7 +477,7 @@ class TestUnitApplicationGo(TestUnitApplicationProto): }, "applications": { script: { - "type": "go", + "type": "external", "processes": { "spare": 0 }, "working_directory": self.current_dir + '/go/' + script, "executable": self.testdir + '/go/' + name |