Update tests

tests/test_registerutils.py

@@ -503,8 +503,8 @@ def test_clean_host_file_raised_exception():
     assert m().write.mock_calls == []
 
 
-@patch('cloudregister.registerutils.has_ipv6_access')
-def test_add_hosts_entry(mock_has_ipv6_access):
+@patch('cloudregister.registerutils.has_rmt_ipv6_access')
+def test_add_hosts_entry(mock_has_rmt_ipv6_access):
     """Test hosts entry has a new entry added by us."""
     smt_data_ipv46 = dedent('''\
         <smtInfo fingerprint="00:11:22:33"
@@ -514,25 +514,25 @@ def test_add_hosts_entry(mock_has_ipv6_access):
          region="antarctica-1"/>''')
 
     smt_server = SMT(etree.fromstring(smt_data_ipv46))
-    mock_has_ipv6_access.return_value = True
+    mock_has_rmt_ipv6_access.return_value = True
     with patch('builtins.open', create=True) as mock_open:
         mock_open.return_value = MagicMock(spec=io.IOBase)
         file_handle = mock_open.return_value.__enter__.return_value
         utils.add_hosts_entry(smt_server)
-        mock_open.assert_called_once_with('/etc/hosts', 'a')
-        file_content_comment = (
-            '\n# Added by SMT registration do not remove, '
-            'retain comment as well\n'
-        )
-        file_content_entry = '{ip}\t{fqdn}\t{name}\n'.format(
-            ip=smt_server.get_ipv6(),
-            fqdn=smt_server.get_FQDN(),
-            name=smt_server.get_name()
-        )
-        assert file_handle.write.mock_calls == [
-             call(file_content_comment),
-             call(file_content_entry)
-        ]
+    mock_open.assert_called_once_with('/etc/hosts', 'a')
+    file_content_comment = (
+        '\n# Added by SMT registration do not remove, '
+        'retain comment as well\n'
+    )
+    file_content_entry = '{ip}\t{fqdn}\t{name}\n'.format(
+        ip=smt_server.get_ipv6(),
+        fqdn=smt_server.get_FQDN(),
+        name=smt_server.get_name()
+    )
+    assert file_handle.write.mock_calls == [
+        call(file_content_comment),
+        call(file_content_entry)
+    ]
 
 
 @patch('cloudregister.amazonec2.generateRegionSrvArgs')
@@ -708,17 +708,20 @@ def test_fetch_smt_data_metadata_server(
         etree.tostring(smt_server, encoding='utf-8')
 
 
+@patch('cloudregister.registerutils.has_network_access_by_ipversion')
 @patch('cloudregister.registerutils.time.sleep')
 @patch('cloudregister.registerutils.logging')
 def test_fetch_smt_data_api_no_answer(
     mock_logging,
-    mock_time_sleep
+    mock_time_sleep,
+    mock_has_network_access
 ):
     cfg = get_test_config()
     del cfg['server']['metadata_server']
     cfg.set('server', 'regionsrv', '1.1.1.1')
     with raises(SystemExit):
         utils.fetch_smt_data(cfg, None)
+    mock_has_network_access.return_value = False
     assert mock_logging.info.call_args_list == [
         call('Using API: regionInfo'),
         call('Getting update server information, attempt 1'),
@@ -749,7 +752,7 @@ def test_fetch_smt_data_api_no_answer(
     ]
 
 
-@patch('cloudregister.registerutils.socket.has_ipv6', False)
+@patch('cloudregister.registerutils.has_network_access_by_ipversion')
 @patch('cloudregister.registerutils.requests.get')
 @patch('cloudregister.registerutils.os.path.isfile')
 @patch('cloudregister.registerutils.time.sleep')
@@ -759,6 +762,7 @@ def test_fetch_smt_data_api_answered(
     mock_time_sleep,
     mock_os_path_isfile,
     mock_request_get,
+    mock_has_network_access
 ):
     cfg = get_test_config()
     del cfg['server']['metadata_server']
@@ -776,6 +780,7 @@ def test_fetch_smt_data_api_answered(
     </regionSMTdata>''')
     response.text = smt_xml
     mock_request_get.return_value = response
+    mock_has_network_access.return_value = False
     utils.fetch_smt_data(cfg, None)
     assert mock_logging.info.call_args_list == [
         call('Using API: regionInfo'),
@@ -819,6 +824,7 @@ def test_fetch_smt_data_api_no_valid_ip(
     assert etree.tostring(smt_data, encoding='utf-8') == smt_xml.encode()
 
 
+@patch('cloudregister.registerutils.has_network_access_by_ipversion')
 @patch('cloudregister.registerutils.requests.get')
 @patch('cloudregister.registerutils.os.path.isfile')
 @patch('cloudregister.registerutils.time.sleep')
@@ -828,6 +834,7 @@ def test_fetch_smt_data_api_error_response(
     mock_time_sleep,
     mock_os_path_isfile,
     mock_request_get,
+    mock_has_network_access
 ):
     cfg = get_test_config()
     del cfg['server']['metadata_server']
@@ -837,8 +844,10 @@ def test_fetch_smt_data_api_error_response(
     response.status_code = 422
     response.reason = 'well, you shall not pass'
     mock_request_get.return_value = response
+    mock_has_network_access.return_value = False
     with raises(SystemExit):
         utils.fetch_smt_data(cfg, None)
+    print(mock_logging.info.call_args_list)
     assert mock_logging.info.call_args_list == [
         call('Using API: regionInfo'),
         call('Getting update server information, attempt 1'),
@@ -871,6 +880,7 @@ def test_fetch_smt_data_api_error_response(
     ]
 
 
+@patch('cloudregister.registerutils.has_network_access_by_ipversion')
 @patch('cloudregister.registerutils.requests.get')
 @patch('cloudregister.registerutils.os.path.isfile')
 @patch('cloudregister.registerutils.time.sleep')
@@ -879,7 +889,8 @@ def test_fetch_smt_data_api_exception(
     mock_logging,
     mock_time_sleep,
     mock_os_path_isfile,
-    mock_request_get
+    mock_request_get,
+    mock_has_network_access
 ):
     cfg = get_test_config()
     del cfg['server']['metadata_server']
@@ -889,6 +900,7 @@ def test_fetch_smt_data_api_exception(
     response.status_code = 422
     response.reason = 'well, you shall not pass'
     mock_request_get.side_effect = requests.exceptions.RequestException('foo')
+    mock_has_network_access.return_value = True
     with raises(SystemExit):
         utils.fetch_smt_data(cfg, None)
     assert mock_logging.info.call_args_list == [
@@ -917,6 +929,7 @@ def test_fetch_smt_data_api_exception(
     ]
 
 
+@patch('cloudregister.registerutils.has_network_access_by_ipversion')
 @patch('cloudregister.registerutils.requests.get')
 @patch('cloudregister.registerutils.os.path.isfile')
 @patch('cloudregister.registerutils.time.sleep')
@@ -925,7 +938,8 @@ def test_fetch_smt_data_api_exception_quiet(
     mock_logging,
     mock_time_sleep,
     mock_os_path_isfile,
-    mock_request_get
+    mock_request_get,
+    mock_has_network_access
 ):
     cfg = get_test_config()
     del cfg['server']['metadata_server']
@@ -935,6 +949,7 @@ def test_fetch_smt_data_api_exception_quiet(
     response.status_code = 422
     response.reason = 'well, you shall not pass'
     mock_request_get.side_effect = requests.exceptions.RequestException('foo')
+    mock_has_network_access.return_value = True
     with raises(SystemExit):
         utils.fetch_smt_data(cfg, 'foo', quiet=True)
     assert mock_logging.info.call_args_list == [
@@ -1178,16 +1193,21 @@ def test_get_current_smt_no_match(mock_get_smt_from_store, mock_os_unlink):
     utils.get_current_smt()
 
 
+@patch('cloudregister.registerutils.glob.glob')
 @patch('cloudregister.registerutils.get_smt_from_store')
-def test_get_current_smt_no_registered(mock_get_smt_from_store):
+def test_get_current_smt_no_registered(
+    mock_get_smt_from_store, mock_glob_glob
+):
     smt_data_ipv46 = dedent('''\
         <smtInfo fingerprint="00:11:22:33"
          SMTserverIP="192.168.1.1"
          SMTserverIPv6="fc00::1"
          SMTserverName="smt-foo.susecloud.net"
          region="antarctica-1"/>''')
-    smt_server = SMT(etree.fromstring(smt_data_ipv46))
-    mock_get_smt_from_store.return_value = smt_server
+    mock_get_smt_from_store.return_value = SMT(
+        etree.fromstring(smt_data_ipv46)
+    )
+    mock_glob_glob.return_value = []
     hosts_content = """
     # simulates hosts file containing the ipv4 we are looking for in the test
 
@@ -1783,20 +1803,26 @@ def test_get_zypper_pid(mock_popen):
     assert utils.get_zypper_pid() == 'pid'
 
 
-def test_has_ipv6_access_no_ipv6_defined():
+@patch('cloudregister.registerutils.has_ipv6_access')
+def test_has_rmt_ipv6_access_no_ipv6_defined(mock_ipv6_access):
     smt_data_ipv4 = dedent('''\
         <smtInfo fingerprint="00:11:22:33"
          SMTserverIP="192.168.1.1"
          SMTserverName="smt-foo.susecloud.net"
          region="antarctica-1"/>''')
     smt_server = SMT(etree.fromstring(smt_data_ipv4))
-    assert utils.has_ipv6_access(smt_server) is False
+    mock_ipv6_access.return_value = True
+    assert utils.has_rmt_ipv6_access(smt_server) is False
 
 
+@patch('cloudregister.registerutils.has_ipv6_access')
 @patch('cloudregister.registerutils.get_config')
 @patch('cloudregister.registerutils.requests.get')
 @patch('cloudregister.registerutils.https_only')
-def test_has_ipv6_access_https(mock_https_only, mock_request, mock_get_config):
+def test_has_rmt_ipv6_access_https(
+    mock_https_only, mock_request,
+    mock_get_config, mock_ipv6_access
+):
     smt_data_ipv46 = dedent('''\
         <smtInfo fingerprint="00:11:22:33"
          SMTserverIP="192.168.1.1"
@@ -1809,21 +1835,24 @@ def test_has_ipv6_access_https(mock_https_only, mock_request, mock_get_config):
     response.text = 'such a request !'
     mock_request.return_value = response
     mock_https_only.return_value = True
-    assert utils.has_ipv6_access(smt_server)
+    mock_ipv6_access.return_value = True
+    assert utils.has_rmt_ipv6_access(smt_server)
     mock_request.assert_called_once_with(
         'https://[fc00::1]/smt.crt',
         timeout=3,
         verify=False
     )
 
 
+@patch('cloudregister.registerutils.has_ipv6_access')
 @patch('cloudregister.registerutils.get_config')
 @patch('cloudregister.registerutils.requests.get')
 @patch('cloudregister.registerutils.https_only')
-def test_has_ipv6_access_exception(
+def test_has_rmt_ipv6_access_exception(
     mock_https_only,
     mock_request,
-    mock_get_config
+    mock_get_config,
+    mock_ipv6_access
 ):
     smt_data_ipv46 = dedent('''\
         <smtInfo fingerprint="00:11:22:33"
@@ -1834,7 +1863,8 @@ def test_has_ipv6_access_exception(
     smt_server = SMT(etree.fromstring(smt_data_ipv46))
     mock_request.side_effect = Exception("Server's too far, cant be reached")
     mock_https_only.return_value = True
-    assert utils.has_ipv6_access(smt_server) is False
+    mock_ipv6_access.return_value = True
+    assert utils.has_rmt_ipv6_access(smt_server) is False
     mock_request.assert_called_once_with(
         'https://[fc00::1]/smt.crt',
         timeout=3,
@@ -1971,7 +2001,7 @@ def test_import_smt_cert_fail(mock_import_smtcert_12, mockin_logging):
 
 
 @patch('cloudregister.registerutils.glob.glob')
-@patch('cloudregister.registerutils.site.getsitepackages')
+@patch('cloudregister.registerutils.site')
 @patch('cloudregister.registerutils.logging')
 @patch('cloudregister.registerutils.import_smtcert_12')
 def test_import_smt_cert_cert_middling(
@@ -1981,7 +2011,7 @@ def test_import_smt_cert_cert_middling(
     mockin_glob
 ):
     mock_import_smtcert_12.return_value = True
-    mockin_getsitepackages.return_value = ['foo']
+    mockin_getsitepackages.getsitepackages.return_value = ['foo']
     mockin_glob.return_value = ['foo/certifi/foo.pem']
     assert utils.import_smt_cert('foo') == 1
     mockin_logging.warning.assert_called_once_with(
@@ -2977,6 +3007,23 @@ def test_remove_service(
     mock_logging.info.not_called()
 
 
+@patch('cloudregister.registerutils.has_network_access_by_ipversion')
+def test_has_ipv4_access(mock_has_network_access):
+    mock_has_network_access.return_value = True
+    assert utils.has_ipv4_access()
+
+
+@patch('cloudregister.registerutils.has_network_access_by_ipversion')
+def test_has_ipv6_access(mock_has_network_access):
+    mock_has_network_access.return_value = True
+    assert utils.has_ipv6_access()
+
+
+@patch('cloudregister.registerutils.socket.create_connection')
+def test_has_network_access_by_ipversion(mock_socket_create_connection):
+    assert utils.has_network_access_by_ipversion('1.1.1.1')
+
+
 # ---------------------------------------------------------------------------
 # Helper functions
 class Response():