Fix tests when using Python 3

Author: nmariz

tests/test_mysqlx_connection.py

@@ -477,27 +477,27 @@ def test_ssl_connection(self):
  # Error if ssl-mode=disabled and ssl_* set
  extra = [("ssl_mode", "disabled"),
  ("ssl_ca", "({0})".format(tests.SSL_CA))]
- uri = build_uri(**dict(self.connect_kwargs.items() + extra))
+ uri = build_uri(**dict(list(self.connect_kwargs.items()) + extra))
  self.assertRaises(InterfaceError, mysqlx.get_session, uri)
 
  # Error if invalid ssl-mode
  extra = [("ssl_mode", "invalid")]
- uri = build_uri(**dict(self.connect_kwargs.items() + extra))
+ uri = build_uri(**dict(list(self.connect_kwargs.items()) + extra))
  self.assertRaises(InterfaceError, mysqlx.get_session, uri)
 
  # Parsing SSL Certificates
  extra = [("ssl_mode", "verify_ca"),
  ("ssl_ca", file_uri(tests.SSL_CA, False)),
  ("ssl_key", file_uri(tests.SSL_KEY, False)),
  ("ssl_cert", file_uri(tests.SSL_CERT, False))]
- uri = build_uri(**dict(self.connect_kwargs.items() + extra))
+ uri = build_uri(**dict(list(self.connect_kwargs.items()) + extra))
  session = mysqlx.get_session(uri)
 
  extra = [("ssl_mode", "verify_ca"),
  ("ssl_ca", file_uri(tests.SSL_CA)),
  ("ssl_key", file_uri(tests.SSL_KEY)),
  ("ssl_cert", file_uri(tests.SSL_CERT))]
- uri = build_uri(**dict(self.connect_kwargs.items() + extra))
+ uri = build_uri(**dict(list(self.connect_kwargs.items()) + extra))
  session = mysqlx.get_session(uri)
 
  def test_disabled_x_protocol(self):

tests/test_mysqlx_crud.py

@@ -466,7 +466,10 @@ def test_add(self):
  persons = [{"name": "Wilma", "age": 33}, {"name": "Barney", "age": 42}]
  result = collection.add(persons).execute()
  for person in persons:
- self.assertTrue(person.has_key("_id"))
+ if tests.PY2:
+ self.assertTrue(person.has_key("_id"))
+ else:
+ self.assertTrue("_id" in person)
  self.assertEqual(len(person["_id"]), 32)
 
  self.schema.drop_collection(collection_name)