software/*/test: stop using httplib for easier python3 transition

software/backupserver/test/test.py

@@ -26,7 +26,6 @@
 ##############################################################################
 
 
-import httplib
 import json
 import os
 import requests
@@ -54,7 +53,7 @@ class TestBackupServer(InstanceTestCase):
 
     # XXX crontab not triggered yet
     self.assertEqual(
-      [httplib.NOT_FOUND, False],
+      [requests.codes.not_found, False],
       [result.status_code, result.is_redirect]
     )
 
@@ -65,6 +64,6 @@ class TestBackupServer(InstanceTestCase):
     result = requests.get(
       parameter_dict['monitor-base-url'], verify=False, allow_redirects=False)
     self.assertEqual(
-      [httplib.UNAUTHORIZED, False],
+      [requests.codes.unauthorized, False],
       [result.status_code, result.is_redirect]
     )

software/caucase/test/test.py

@@ -29,7 +29,7 @@ from __future__ import unicode_literals
 import json
 import os
 import requests
-import httplib
+
 
 from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
 
@@ -51,7 +51,7 @@ class TestCaucase(SlapOSInstanceTestCase):
     )
     result = requests.get(connection_parameter_dict['url'])
 
-    self.assertEqual(result.status_code, httplib.OK)
+    self.assertEqual(result.status_code, requests.codes.ok)
     self.assertEqual(
       result.json(),
       {

software/htmlvalidatorserver/test/test.py

@@ -26,7 +26,6 @@
 ##############################################################################
 
 
-import httplib
 import json
 import os
 import requests
@@ -53,7 +52,7 @@ class TestHtmlValidatorServer(InstanceTestCase):
       parameter_dict['vnu-url'], verify=False, allow_redirects=False)
 
     self.assertEqual(
-      [httplib.OK, False, 'Apache-Coyote/1.1'],
+      [requests.codes.ok, False, 'Apache-Coyote/1.1'],
       [result.status_code, result.is_redirect, result.headers['Server']]
     )
 
@@ -64,7 +63,7 @@ class TestHtmlValidatorServer(InstanceTestCase):
     result = requests.get(
       parameter_dict['monitor-base-url'], verify=False, allow_redirects=False)
     self.assertEqual(
-      [httplib.UNAUTHORIZED, False],
+      [requests.codes.unauthorized, False],
       [result.status_code, result.is_redirect]
     )
 

software/jstestnode/test/test.py

@@ -26,7 +26,6 @@
 ##############################################################################
 
 
-import httplib
 import json
 import os
 import requests
@@ -59,7 +58,7 @@ class TestJSTestNode(InstanceTestCase):
     result = requests.get(
       '%sjio/test/tests.html' % (connection_dict['nginx'], ), allow_redirects=False)
     self.assertEqual(
-      [httplib.OK, False],
+      [requests.codes.ok, False],
       [result.status_code, result.is_redirect]
     )
 
@@ -67,7 +66,7 @@ class TestJSTestNode(InstanceTestCase):
     result = requests.get(
       '%srenderjs/test/' % (connection_dict['nginx'], ), allow_redirects=False)
     self.assertEqual(
-      [httplib.OK, False],
+      [requests.codes.ok, False],
       [result.status_code, result.is_redirect]
     )
 
@@ -75,7 +74,7 @@ class TestJSTestNode(InstanceTestCase):
     result = requests.get(
       '%srsvp/test/index.html' % (connection_dict['nginx'], ), allow_redirects=False)
     self.assertEqual(
-      [httplib.OK, False],
+      [requests.codes.ok, False],
       [result.status_code, result.is_redirect]
     )
 
@@ -83,6 +82,6 @@ class TestJSTestNode(InstanceTestCase):
     result = requests.get(
       'http://[%s]:9443' % (self._ipv6_address, ), allow_redirects=False)
     self.assertEqual(
-      [httplib.FORBIDDEN, False],
+      [requests.codes.forbidden, False],
       [result.status_code, result.is_redirect]
     )