Skip to content

Commit 2434b09

Browse files
Consolidate integration tests.
1 parent 031de56 commit 2434b09

File tree

2 files changed

+16
-38
lines changed

2 files changed

+16
-38
lines changed
Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
from . import integ_test_base
22
import os
3-
import requests
43

5-
6-
class TestMinimumTLSVersionInvalid(integ_test_base.IntegTestBase):
4+
class TestMinimumTLSVersion(integ_test_base.IntegTestBase):
75
def _get_log_contents(self):
86
with open(self.log_file_path, 'r') as f:
97
return f.read()
108

11-
def _get_config_file_name(self) -> str:
9+
def _get_config_file_name(self, tls_version: str) -> str:
1210
config_file = open(os.path.join(self.tmp_dir, "test.conf"), "w+")
1311
config_file.write(
1412
"[TabPy]\n"
1513
"TABPY_PORT = 9005\n"
1614
"TABPY_TRANSFER_PROTOCOL = https\n"
1715
"TABPY_CERTIFICATE_FILE = ./tests/integration/resources/2019_04_24_to_3018_08_25.crt\n"
1816
"TABPY_KEY_FILE = ./tests/integration/resources/2019_04_24_to_3018_08_25.key\n"
19-
"TABPY_MINIMUM_TLS_VERSION = TLSv-1.3"
17+
f"TABPY_MINIMUM_TLS_VERSION = {tls_version}"
2018
)
2119
pwd_file = self._get_pwd_file()
2220
if pwd_file is not None:
@@ -27,7 +25,19 @@ def _get_config_file_name(self) -> str:
2725
self.delete_config_file = True
2826
return config_file.name
2927

30-
def test_minimum_tls_version_invalid(self):
28+
class TestMinimumTLSVersionValid(TestMinimumTLSVersion):
29+
def _get_config_file_name(self) -> str:
30+
return super()._get_config_file_name("TLSv1_3")
31+
32+
def test_minimum_tls_version(self):
33+
log_contents = self._get_log_contents()
34+
self.assertIn("Setting minimum TLS version to TLSv1_3", log_contents)
35+
36+
class TestMinimumTLSVersionInvalid(TestMinimumTLSVersion):
37+
def _get_config_file_name(self) -> str:
38+
return super()._get_config_file_name("TLSv-1.3")
39+
40+
def test_minimum_tls_version(self):
3141
log_contents = self._get_log_contents()
3242
self.assertIn("Unrecognized value for TABPY_MINIMUM_TLS_VERSION", log_contents)
3343
self.assertIn("Setting minimum TLS version to TLSv1_2", log_contents)

tests/integration/test_minimum_tls_version_valid.py

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)