26
26
all_images = pytest .mark .testinfra_hosts (* [
27
27
"docker://{}" .format (image )
28
28
for image in (
29
- "alpine" , "archlinux" , "centos_6" , " centos_7" ,
29
+ "alpine" , "archlinux" , "centos_7" ,
30
30
"debian_buster" , "ubuntu_xenial"
31
31
)
32
32
])
33
33
34
- centos_images = pytest .mark .testinfra_hosts (* [
35
- "docker://{}" .format (image )
36
- for image in (
37
- "centos_6" , "centos_7" ,
38
- )
39
- ])
40
-
41
34
42
35
@all_images
43
36
def test_package (host , docker_image ):
@@ -51,7 +44,6 @@ def test_package(host, docker_image):
51
44
version = {
52
45
"alpine" : "8." ,
53
46
"archlinux" : "8." ,
54
- "centos_6" : "5." ,
55
47
"centos_7" : "7." ,
56
48
"debian_buster" : "1:7.9" ,
57
49
"ubuntu_xenial" : "1:7.2"
@@ -61,7 +53,6 @@ def test_package(host, docker_image):
61
53
release = {
62
54
"alpine" : "r0" ,
63
55
"archlinux" : None ,
64
- "centos_6" : ".el6" ,
65
56
"centos_7" : ".el7" ,
66
57
"debian_buster" : None ,
67
58
"ubuntu_xenial" : None
@@ -79,8 +70,7 @@ def test_held_package(host):
79
70
assert python .version .startswith ("2.7." )
80
71
81
72
82
- @pytest .mark .destructive
83
- @centos_images
73
+ @pytest .mark .testinfra_hosts ("docker://centos_7" )
84
74
def test_non_default_package_tool (host ):
85
75
# Make non default pkg tool binary present
86
76
host .run ("install -m a+rx /bin/true /usr/bin/dpkg-query" )
@@ -108,7 +98,6 @@ def test_systeminfo(host, docker_image):
108
98
release , distribution , codename , arch = {
109
99
"alpine" : (r"^3\.11\." , "alpine" , None , 'x86_64' ),
110
100
"archlinux" : ("rolling" , "arch" , None , 'x86_64' ),
111
- "centos_6" : (r"^6" , "CentOS" , None , 'x86_64' ),
112
101
"centos_7" : (r"^7$" , "centos" , None , 'x86_64' ),
113
102
"debian_buster" : (r"^10" , "debian" , "buster" , 'x86_64' ),
114
103
"ubuntu_xenial" : (r"^16\.04$" , "ubuntu" , "xenial" , 'x86_64' )
@@ -121,7 +110,7 @@ def test_systeminfo(host, docker_image):
121
110
122
111
@all_images
123
112
def test_ssh_service (host , docker_image ):
124
- if docker_image in ("centos_6" , " centos_7" ,
113
+ if docker_image in ("centos_7" ,
125
114
"alpine" , "archlinux" ):
126
115
name = "sshd"
127
116
else :
@@ -239,7 +228,6 @@ def test_process(host, docker_image):
239
228
args , comm = {
240
229
"alpine" : ("/sbin/init" , "init" ),
241
230
"archlinux" : ("/usr/sbin/init" , "systemd" ),
242
- "centos_6" : ("/usr/sbin/sshd -D" , "sshd" ),
243
231
"centos_7" : ("/usr/sbin/init" , "systemd" ),
244
232
"debian_buster" : ("/sbin/init" , "systemd" ),
245
233
"ubuntu_xenial" : ("/sbin/init" , "systemd" )
@@ -546,12 +534,6 @@ def test_iptables(host):
546
534
assert host .iptables ._has_w_argument is True
547
535
548
536
549
- @pytest .mark .testinfra_hosts ('docker://centos_6' )
550
- def test_iptables_centos6 (host ):
551
- host .iptables .rules ()
552
- assert host .iptables ._has_w_argument is False
553
-
554
-
555
537
def test_ip6tables (host ):
556
538
# test ip6tables call works; ipv6 setup is a whole huge thing, but
557
539
# ensure we at least see the headings
0 commit comments