Skip to content

Commit a80450e

Browse files
zancaszancas
authored
Merge pull request #588 from caphrim007/bugfix.sshd-tests-failing
Fix the sshd tests
2 parents 9ccec54 + 650bc60 commit a80450e

3 files changed

Lines changed: 45 additions & 78 deletions

File tree

‎conftest.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,15 @@
1616
from f5.bigip import BigIP
1717
from f5.bigip import ManagementRoot
1818
from f5.utils.testutils.registrytools import register_device
19+
import logging
1920
import mock
2021
import pytest
2122
import requests
2223

24+
25+
logger = logging.getLogger()
26+
logger.setLevel(logging.WARNING)
27+
2328
requests.packages.urllib3.disable_warnings()
2429

2530
from icontrol.session import iControlRESTSession

‎test/functional/tm/ltm/test_virtual.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
# limitations under the License.
1414
#
1515

16+
from distutils.version import LooseVersion
17+
1618
from f5.bigip.resource import MissingRequiredCreationParameter
1719
from f5.bigip.resource import MissingRequiredReadParameter
1820

@@ -21,6 +23,13 @@
2123

2224
TESTDESCRIPTION = "TESTDESCRIPTION"
2325

26+
pytestmark = pytest.mark.skipif(
27+
LooseVersion(
28+
pytest.config.getoption('--release')
29+
) < LooseVersion('11.6.0'),
30+
reason='An error occurs on 11.5.4 devices regarding sysdb'
31+
)
32+
2433

2534
def delete_resource(resources):
2635
for resource in resources.get_collection():

‎test/functional/tm/sys/test_sshd.py‎

Lines changed: 31 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,10 @@
1313
# limitations under the License.
1414
#
1515

16-
import copy
1716
from pprint import pprint as pp
1817
import pytest
1918

20-
# Revert version back to 11.6.0 from 11.6.2 when PR 588
21-
V11_SUPPORTED = ['11.6.2', '11.6.1']
19+
V11_SUPPORTED = ['11.5.4', '11.6.0', '11.6.1', '11.6.2']
2220
V12_SUPPORTED = ['12.0.0', '12.1.0']
2321

2422

@@ -44,11 +42,8 @@ def teardown():
4442
reason='Needs v11 TMOS to pass')
4543
class TestSshd11(object):
4644
def test_load(self, request, bigip):
47-
bigip1 = copy.deepcopy(bigip)
48-
bigip2 = copy.deepcopy(bigip)
49-
50-
ssh1 = setup_sshd_test(request, bigip1)
51-
ssh2 = setup_sshd_test(request, bigip2)
45+
ssh1 = setup_sshd_test(request, bigip)
46+
ssh2 = setup_sshd_test(request, bigip)
5247

5348
assert ssh1.allow == ssh2.allow
5449
assert ssh1.banner == ssh2.banner
@@ -60,11 +55,8 @@ def test_load(self, request, bigip):
6055
pp(ssh2.raw)
6156

6257
def test_update_allow(self, request, bigip):
63-
bigip1 = copy.deepcopy(bigip)
64-
bigip2 = copy.deepcopy(bigip)
65-
66-
ssh1 = setup_sshd_test(request, bigip1)
67-
ssh2 = setup_sshd_test(request, bigip2)
58+
ssh1 = setup_sshd_test(request, bigip)
59+
ssh2 = setup_sshd_test(request, bigip)
6860

6961
ssh1.allow = ['192.168.1.1']
7062
pp(ssh2.raw)
@@ -77,11 +69,8 @@ def test_update_allow(self, request, bigip):
7769
assert ['192.168.1.1'] == ssh2.allow
7870

7971
def test_update_banner(self, request, bigip):
80-
bigip1 = copy.deepcopy(bigip)
81-
bigip2 = copy.deepcopy(bigip)
82-
83-
ssh1 = setup_sshd_test(request, bigip1)
84-
ssh2 = setup_sshd_test(request, bigip2)
72+
ssh1 = setup_sshd_test(request, bigip)
73+
ssh2 = setup_sshd_test(request, bigip)
8574

8675
banners = ['enabled', 'disabled']
8776

@@ -97,11 +86,8 @@ def test_update_banner(self, request, bigip):
9786
assert banner == ssh2.banner
9887

9988
def test_update_bannerText(self, request, bigip):
100-
bigip1 = copy.deepcopy(bigip)
101-
bigip2 = copy.deepcopy(bigip)
102-
103-
ssh1 = setup_sshd_test(request, bigip1)
104-
ssh2 = setup_sshd_test(request, bigip2)
89+
ssh1 = setup_sshd_test(request, bigip)
90+
ssh2 = setup_sshd_test(request, bigip)
10591

10692
ssh1.bannerText = 'foo banner'
10793
ssh1.update()
@@ -113,11 +99,8 @@ def test_update_bannerText(self, request, bigip):
11399
assert 'foo banner' == ssh2.bannerText
114100

115101
def test_update_inactivityTimeout(self, request, bigip):
116-
bigip1 = copy.deepcopy(bigip)
117-
bigip2 = copy.deepcopy(bigip)
118-
119-
ssh1 = setup_sshd_test(request, bigip1)
120-
ssh2 = setup_sshd_test(request, bigip2)
102+
ssh1 = setup_sshd_test(request, bigip)
103+
ssh2 = setup_sshd_test(request, bigip)
121104

122105
ssh1.inactivityTimeout = 10
123106
ssh1.update()
@@ -129,11 +112,8 @@ def test_update_inactivityTimeout(self, request, bigip):
129112
assert 10 == ssh2.inactivityTimeout
130113

131114
def test_update_logLevel(self, request, bigip):
132-
bigip1 = copy.deepcopy(bigip)
133-
bigip2 = copy.deepcopy(bigip)
134-
135-
ssh1 = setup_sshd_test(request, bigip1)
136-
ssh2 = setup_sshd_test(request, bigip2)
115+
ssh1 = setup_sshd_test(request, bigip)
116+
ssh2 = setup_sshd_test(request, bigip)
137117

138118
levels = ['debug', 'debug1', 'debug2', 'debug3', 'error', 'fatal',
139119
'info', 'quiet', 'verbose']
@@ -150,11 +130,8 @@ def test_update_logLevel(self, request, bigip):
150130
assert level == ssh2.logLevel
151131

152132
def test_update_login(self, request, bigip):
153-
bigip1 = copy.deepcopy(bigip)
154-
bigip2 = copy.deepcopy(bigip)
155-
156-
ssh1 = setup_sshd_test(request, bigip1)
157-
ssh2 = setup_sshd_test(request, bigip2)
133+
ssh1 = setup_sshd_test(request, bigip)
134+
ssh2 = setup_sshd_test(request, bigip)
158135

159136
logins = ['disabled', 'enabled']
160137

@@ -174,11 +151,8 @@ def test_update_login(self, request, bigip):
174151
reason='Needs v12 TMOS to pass')
175152
class TestSshd12(object):
176153
def test_load(self, request, bigip):
177-
bigip1 = copy.deepcopy(bigip)
178-
bigip2 = copy.deepcopy(bigip)
179-
180-
ssh1 = setup_sshd_test(request, bigip1)
181-
ssh2 = setup_sshd_test(request, bigip2)
154+
ssh1 = setup_sshd_test(request, bigip)
155+
ssh2 = setup_sshd_test(request, bigip)
182156

183157
assert ssh1.allow == ssh2.allow
184158
assert ssh1.banner == ssh2.banner
@@ -191,11 +165,8 @@ def test_load(self, request, bigip):
191165
pp(ssh2.raw)
192166

193167
def test_update_allow(self, request, bigip):
194-
bigip1 = copy.deepcopy(bigip)
195-
bigip2 = copy.deepcopy(bigip)
196-
197-
ssh1 = setup_sshd_test(request, bigip1)
198-
ssh2 = setup_sshd_test(request, bigip2)
168+
ssh1 = setup_sshd_test(request, bigip)
169+
ssh2 = setup_sshd_test(request, bigip)
199170

200171
ssh1.allow = ['192.168.1.1']
201172
ssh1.update()
@@ -207,11 +178,8 @@ def test_update_allow(self, request, bigip):
207178
assert ['192.168.1.1'] == ssh2.allow
208179

209180
def test_update_banner(self, request, bigip):
210-
bigip1 = copy.deepcopy(bigip)
211-
bigip2 = copy.deepcopy(bigip)
212-
213-
ssh1 = setup_sshd_test(request, bigip1)
214-
ssh2 = setup_sshd_test(request, bigip2)
181+
ssh1 = setup_sshd_test(request, bigip)
182+
ssh2 = setup_sshd_test(request, bigip)
215183

216184
banners = ['enabled', 'disabled']
217185

@@ -226,11 +194,8 @@ def test_update_banner(self, request, bigip):
226194
assert banner == ssh2.banner
227195

228196
def test_update_bannerText(self, request, bigip):
229-
bigip1 = copy.deepcopy(bigip)
230-
bigip2 = copy.deepcopy(bigip)
231-
232-
ssh1 = setup_sshd_test(request, bigip1)
233-
ssh2 = setup_sshd_test(request, bigip2)
197+
ssh1 = setup_sshd_test(request, bigip)
198+
ssh2 = setup_sshd_test(request, bigip)
234199

235200
ssh1.bannerText = 'foo banner'
236201
ssh1.update()
@@ -242,11 +207,8 @@ def test_update_bannerText(self, request, bigip):
242207
assert 'foo banner' == ssh2.bannerText
243208

244209
def test_update_inactivityTimeout(self, request, bigip):
245-
bigip1 = copy.deepcopy(bigip)
246-
bigip2 = copy.deepcopy(bigip)
247-
248-
ssh1 = setup_sshd_test(request, bigip1)
249-
ssh2 = setup_sshd_test(request, bigip2)
210+
ssh1 = setup_sshd_test(request, bigip)
211+
ssh2 = setup_sshd_test(request, bigip)
250212

251213
ssh1.inactivityTimeout = 10
252214
ssh1.update()
@@ -258,11 +220,8 @@ def test_update_inactivityTimeout(self, request, bigip):
258220
assert 10 == ssh2.inactivityTimeout
259221

260222
def test_update_logLevel(self, request, bigip):
261-
bigip1 = copy.deepcopy(bigip)
262-
bigip2 = copy.deepcopy(bigip)
263-
264-
ssh1 = setup_sshd_test(request, bigip1)
265-
ssh2 = setup_sshd_test(request, bigip2)
223+
ssh1 = setup_sshd_test(request, bigip)
224+
ssh2 = setup_sshd_test(request, bigip)
266225

267226
levels = ['debug', 'debug1', 'debug2', 'debug3', 'error', 'fatal',
268227
'info', 'quiet', 'verbose']
@@ -278,11 +237,8 @@ def test_update_logLevel(self, request, bigip):
278237
assert level == ssh2.logLevel
279238

280239
def test_update_login(self, request, bigip):
281-
bigip1 = copy.deepcopy(bigip)
282-
bigip2 = copy.deepcopy(bigip)
283-
284-
ssh1 = setup_sshd_test(request, bigip1)
285-
ssh2 = setup_sshd_test(request, bigip2)
240+
ssh1 = setup_sshd_test(request, bigip)
241+
ssh2 = setup_sshd_test(request, bigip)
286242

287243
logins = ['disabled', 'enabled']
288244

@@ -297,11 +253,8 @@ def test_update_login(self, request, bigip):
297253
assert login == ssh2.login
298254

299255
def test_update_port(self, request, bigip):
300-
bigip1 = copy.deepcopy(bigip)
301-
bigip2 = copy.deepcopy(bigip)
302-
303-
ssh1 = setup_sshd_test(request, bigip1)
304-
ssh2 = setup_sshd_test(request, bigip2)
256+
ssh1 = setup_sshd_test(request, bigip)
257+
ssh2 = setup_sshd_test(request, bigip)
305258

306259
ssh1.port = 1234
307260
ssh1.update()

0 commit comments

Comments
 (0)