Deleted
Added
test_tls.py (2004:ca4c5855f139) | test_tls.py (2066:242192963d93) |
---|---|
1import io 2import re 3import ssl 4import subprocess 5import time 6 7import pytest 8from unit.applications.tls import TestApplicationTLS --- 161 unchanged lines hidden (view full) --- 170 @pytest.mark.skip('not yet') 171 def test_tls_certificate_update(self): 172 self.load('empty') 173 174 self.certificate() 175 176 self.add_tls() 177 | 1import io 2import re 3import ssl 4import subprocess 5import time 6 7import pytest 8from unit.applications.tls import TestApplicationTLS --- 161 unchanged lines hidden (view full) --- 170 @pytest.mark.skip('not yet') 171 def test_tls_certificate_update(self): 172 self.load('empty') 173 174 self.certificate() 175 176 self.add_tls() 177 |
178 cert_old = self.get_server_certificate() | 178 cert_old = ssl.get_server_certificate(('127.0.0.1', 7080)) |
179 180 self.certificate() 181 | 179 180 self.certificate() 181 |
182 assert cert_old != self.get_server_certificate(), 'update certificate' | 182 assert cert_old != ssl.get_server_certificate( 183 ('127.0.0.1', 7080) 184 ), 'update certificate' |
183 184 @pytest.mark.skip('not yet') 185 def test_tls_certificate_key_incorrect(self): 186 self.load('empty') 187 188 self.certificate('first', False) 189 self.certificate('second', False) 190 --- 4 unchanged lines hidden (view full) --- 195 def test_tls_certificate_change(self): 196 self.load('empty') 197 198 self.certificate() 199 self.certificate('new') 200 201 self.add_tls() 202 | 185 186 @pytest.mark.skip('not yet') 187 def test_tls_certificate_key_incorrect(self): 188 self.load('empty') 189 190 self.certificate('first', False) 191 self.certificate('second', False) 192 --- 4 unchanged lines hidden (view full) --- 197 def test_tls_certificate_change(self): 198 self.load('empty') 199 200 self.certificate() 201 self.certificate('new') 202 203 self.add_tls() 204 |
203 cert_old = self.get_server_certificate() | 205 cert_old = ssl.get_server_certificate(('127.0.0.1', 7080)) |
204 205 self.add_tls(cert='new') 206 | 206 207 self.add_tls(cert='new') 208 |
207 assert cert_old != self.get_server_certificate(), 'change certificate' | 209 assert cert_old != ssl.get_server_certificate( 210 ('127.0.0.1', 7080) 211 ), 'change certificate' |
208 209 def test_tls_certificate_key_rsa(self): 210 self.load('empty') 211 212 self.certificate() 213 214 assert ( 215 self.conf_get('/certificates/default/key') == 'RSA (2048 bits)' --- 463 unchanged lines hidden --- | 212 213 def test_tls_certificate_key_rsa(self): 214 self.load('empty') 215 216 self.certificate() 217 218 assert ( 219 self.conf_get('/certificates/default/key') == 'RSA (2048 bits)' --- 463 unchanged lines hidden --- |