fix tests

cisco_aci/tests/test_cisco.py

@@ -81,7 +81,11 @@ def test_recover_from_expired_token(aggregator, api_kwargs):
 @pytest.mark.parametrize(
     'extra_config, expected_http_kwargs',
     [
-        pytest.param({'pwd': 'foobar'}, {'auth': (common.USERNAME, 'foobar'), 'verify': True}, id='new auth config'),
+        pytest.param(
+            {'pwd': 'foobar'},
+            {'auth': (common.USERNAME.encode('utf-8'), b'foobar'), 'verify': True},
+            id='new auth config',
+        ),
         pytest.param({'ssl_verify': True}, {'verify': True}, id='legacy ssl verify config True'),
         pytest.param({'ssl_verify': False}, {'verify': False}, id='legacy ssl verify config False'),
     ],

couch/tests/test_unit.py

@@ -17,9 +17,9 @@
         (
             "legacy auth config",
             {'user': 'legacy_foo', 'password': 'legacy_bar'},
-            {'auth': ('legacy_foo', 'legacy_bar')},
+            {'auth': (b'legacy_foo', b'legacy_bar')},
         ),
-        ("new auth config", {'username': 'new_foo', 'password': 'new_bar'}, {'auth': ('new_foo', 'new_bar')}),
+        ("new auth config", {'username': 'new_foo', 'password': 'new_bar'}, {'auth': (b'new_foo', b'new_bar')}),
         ("timeout", {'timeout': 17}, {'timeout': (17, 17)}),
     ],
 )

couchbase/tests/test_unit.py

@@ -67,9 +67,13 @@ def test__get_query_monitoring_data():
         (
             "new auth config",
             {'username': 'new_foo', 'password': 'bar', 'tls_verify': False},
-            {'auth': ('new_foo', 'bar'), 'verify': False},
+            {'auth': (b'new_foo', b'bar'), 'verify': False},
+        ),
+        (
+            "legacy config",
+            {'user': 'new_foo', 'ssl_verify': False},
+            {'auth': (b'new_foo', b'password'), 'verify': False},
         ),
-        ("legacy config", {'user': 'new_foo', 'ssl_verify': False}, {'auth': ('new_foo', 'password'), 'verify': False}),
     ],
 )
 def test_config(test_case, extra_config, expected_http_kwargs):

envoy/tests/test_envoy.py

@@ -120,7 +120,7 @@ def test_unknown():
 @pytest.mark.parametrize(
     'test_case, extra_config, expected_http_kwargs',
     [
-        ("new auth config", {'username': 'new_foo', 'password': 'new_bar'}, {'auth': ('new_foo', 'new_bar')}),
+        ("new auth config", {'username': 'new_foo', 'password': 'new_bar'}, {'auth': (b'new_foo', b'new_bar')}),
         ("legacy ssl config True", {'verify_ssl': True}, {'verify': True}),
         ("legacy ssl config False", {'verify_ssl': False}, {'verify': False}),
         ("legacy ssl config unset", {}, {'verify': True}),

etcd/tests/test_integration.py

@@ -137,7 +137,7 @@ def test_followers(aggregator):
 @pytest.mark.parametrize(
     'test_case, extra_config, expected_http_kwargs',
     [
-        ("new auth config", {'username': 'new_foo', 'password': 'new_bar'}, {'auth': ('new_foo', 'new_bar')}),
+        ("new auth config", {'username': 'new_foo', 'password': 'new_bar'}, {'auth': (b'new_foo', b'new_bar')}),
         ("legacy ssl config True", {'ssl_cert_validation': True}, {'verify': True}),
         ("legacy ssl config False", {'ssl_cert_validation': False}, {'verify': False}),
         ("legacy ssl config unset", {}, {'verify': False}),
@@ -163,7 +163,7 @@ def test_config_legacy(legacy_instance, test_case, extra_config, expected_http_k
 @pytest.mark.parametrize(
     'test_case, extra_config, expected_http_kwargs',
     [
-        ("new auth config", {'username': 'new_foo', 'password': 'new_bar'}, {'auth': ('new_foo', 'new_bar')}),
+        ("new auth config", {'username': 'new_foo', 'password': 'new_bar'}, {'auth': (b'new_foo', b'new_bar')}),
         ("legacy ssl config True", {'ssl_verify': True}, {'verify': True}),
         ("legacy ssl config False", {'ssl_verify': False}, {'verify': False}),
         ("legacy ssl config unset", {}, {'verify': False}),

hdfs_datanode/tests/conftest.py

@@ -84,7 +84,10 @@ def requests_auth_mock(*args, **kwargs):
     assert 'auth' in kwargs, "Error, missing authentication"
 
     # Make sure we've got the correct username and password
-    assert kwargs['auth'] == (TEST_USERNAME, TEST_PASSWORD), "Incorrect username or password"
+    assert kwargs['auth'] == (
+        TEST_USERNAME.encode('utf-8'),
+        TEST_PASSWORD.encode('utf-8'),
+    ), "Incorrect username or password"
 
     # Return mocked request.get(...)
     return requests_get_mock(*args, **kwargs)

hdfs_namenode/tests/conftest.py

@@ -88,7 +88,10 @@ def requests_auth_mock(*args, **kwargs):
     assert 'auth' in kwargs, "Error, missing authentication"
 
     # Make sure we've got the correct username and password
-    assert kwargs['auth'] == (TEST_USERNAME, TEST_PASSWORD), "Incorrect username or password"
+    assert kwargs['auth'] == (
+        TEST_USERNAME.encode('utf-8'),
+        TEST_PASSWORD.encode('utf-8'),
+    ), "Incorrect username or password"
 
     # Return mocked request.get(...)
     return requests_get_mock(*args, **kwargs)

mapreduce/tests/conftest.py

@@ -129,7 +129,10 @@ def requests_auth_mock(*args, **kwargs):
     assert 'auth' in kwargs, "Error, missing authentication"
 
     # Make sure we've got the correct username and password
-    assert kwargs['auth'] == (TEST_USERNAME, TEST_PASSWORD), "Incorrect username or password"
+    assert kwargs['auth'] == (
+        TEST_USERNAME.encode('utf-8'),
+        TEST_PASSWORD.encode('utf-8'),
+    ), "Incorrect username or password"
 
     # Return mocked request.get(...)
     return requests_get_mock(*args, **kwargs)

marathon/tests/test_unit.py

@@ -89,15 +89,15 @@ def test_get_instance_config(check):
             "new config",
             {},
             {'timeout': 5, 'username': 'foo', 'password': 'bar', 'tls_verify': False},
-            {'timeout': 5, 'auth': ('foo', 'bar'), 'verify': False},
+            {'timeout': 5, 'auth': (b'foo', b'bar'), 'verify': False},
         ),
         ("connect_timeout", {'default_timeout': 5}, {'connect_timeout': 2}, {'timeout': (5.0, 2.0)}),
         ("read_timeout", {}, {'timeout': 7, 'read_timeout': 3}, {'timeout': (3.0, 7.0)}),
         (
             "legacy config",
             {'default_timeout': 3},
             {'user': 'foo', 'password': 'bar', 'disable_ssl_validation': True},
-            {'timeout': 3, 'auth': ('foo', 'bar'), 'verify': False},
+            {'timeout': 3, 'auth': (b'foo', b'bar'), 'verify': False},
         ),
         ("default config", {}, {}, {'verify': True}),
     ],

nginx/tests/test_unit.py

@@ -81,9 +81,9 @@ def test_nest_payload(check):
         (
             "legacy auth config",
             {'user': 'legacy_foo', 'password': 'legacy_bar'},
-            {'auth': ('legacy_foo', 'legacy_bar')},
+            {'auth': (b'legacy_foo', b'legacy_bar')},
         ),
-        ("new auth config", {'username': 'new_foo', 'password': 'new_bar'}, {'auth': ('new_foo', 'new_bar')}),
+        ("new auth config", {'username': 'new_foo', 'password': 'new_bar'}, {'auth': (b'new_foo', b'new_bar')}),
         ("legacy ssl config True", {'ssl_validation': True}, {'verify': True}),
         ("legacy ssl config False", {'ssl_validation': False}, {'verify': False}),
     ],

php_fpm/tests/test_unit.py

@@ -79,8 +79,8 @@ def test_backoff_success(check, instance, aggregator, payload):
 @pytest.mark.parametrize(
     'test_case, extra_config, expected_http_kwargs',
     [
-        ("old auth config", {'user': 'old_foo', 'password': 'new_bar'}, {'auth': ('old_foo', 'new_bar')}),
-        ("new auth config", {'username': 'new_foo', 'password': 'new_bar'}, {'auth': ('new_foo', 'new_bar')}),
+        ("old auth config", {'user': 'old_foo', 'password': 'new_bar'}, {'auth': (b'old_foo', b'new_bar')}),
+        ("new auth config", {'username': 'new_foo', 'password': 'new_bar'}, {'auth': (b'new_foo', b'new_bar')}),
         ("legacy ssl config True", {'disable_ssl_validation': False}, {'verify': True}),
         ("legacy ssl config False", {'disable_ssl_validation': True}, {'verify': False}),
         ("legacy ssl config unset", {}, {'verify': True}),

rabbitmq/tests/test_unit.py

@@ -124,9 +124,9 @@ def test_get_stats_empty_exchanges(mock__get_object_data, instance, check, aggre
         (
             "legacy auth config",
             {'rabbitmq_user': 'legacy_foo', 'rabbitmq_pass': 'legacy_bar'},
-            {'auth': ('legacy_foo', 'legacy_bar')},
+            {'auth': (b'legacy_foo', b'legacy_bar')},
         ),
-        ("new auth config", {'username': 'new_foo', 'password': 'new_bar'}, {'auth': ('new_foo', 'new_bar')}),
+        ("new auth config", {'username': 'new_foo', 'password': 'new_bar'}, {'auth': (b'new_foo', b'new_bar')}),
         ("legacy ssl config True", {'ssl_verify': True}, {'verify': True}),
         ("legacy ssl config False", {'ssl_verify': False}, {'verify': False}),
     ],

spark/tests/test_spark.py

@@ -214,7 +214,10 @@ def yarn_requests_auth_mock(*args, **kwargs):
     assert 'auth' in kwargs, "Error, missing authentication"
 
     # Make sure we've got the correct username and password
-    assert kwargs['auth'] == (TEST_USERNAME, TEST_PASSWORD), "Incorrect username or password"
+    assert kwargs['auth'] == (
+        TEST_USERNAME.encode('utf-8'),
+        TEST_PASSWORD.encode('utf-8'),
+    ), "Incorrect username or password"
 
     # Return mocked request.get(...)
     return yarn_requests_get_mock(*args, **kwargs)

squid/tests/test_unit.py

@@ -90,7 +90,7 @@ def test_legacy_username_password(instance, auth_config):
 
             g.assert_called_with(
                 'http://host:port/squid-internal-mgr/counters',
-                auth=('datadog_user', 'datadog_pass'),
+                auth=(b'datadog_user', b'datadog_pass'),
                 cert=mock.ANY,
                 headers=mock.ANY,
                 proxies=mock.ANY,

yarn/tests/conftest.py

@@ -59,7 +59,10 @@ def requests_auth_get(*args, **kwargs):
         assert 'auth' in kwargs, 'Missing "auth" argument in requests.get(...) call'
 
         # Make sure we've got the correct username and password
-        assert kwargs['auth'] == (TEST_USERNAME, TEST_PASSWORD), "Incorrect username or password in requests.get"
+        assert kwargs['auth'] == (
+            TEST_USERNAME.encode('utf-8'),
+            TEST_PASSWORD.encode('utf-8'),
+        ), "Incorrect username or password in requests.get"
 
         # Return mocked request.get(...)
         return requests_get_mock(*args, **kwargs)