Fix PythonDataObjectsTests for python 2

[labath]

Summary

the python2 branch seems erroneous as it expected the object to be both a "String" and "Bytes".
Fix the expectation.

[zturner]

unittests/ScriptInterpreter/Python/PythonDataObjectsTests.cpp

212 ↗

(On Diff #48820)

Seems like this check is still valid?

[labath]

unittests/ScriptInterpreter/Python/PythonDataObjectsTests.cpp

212 ↗

(On Diff #48820)

Not on python 2, I get "string" there. We can't have checks on line 212 and 216 both be true, so I assumed "string" is intended. Note that I have simply moved this check into the python-3 branch.

[labath]

Any thoughts on this?

This is currently the only failing unit test on linux.

[zturner]

Sorry, was out for a few days and i missed this. Seems ok then

lldb/trunk/unittests/ScriptInterpreter/Python/PythonDataObjectsTests.cpp

 }
 
 TEST_F(PythonDataObjectsTest, TestPythonBytes)
 {
     static const char *test_bytes = "PythonDataObjectsTest::TestPythonBytes";
     PyObject *py_bytes = PyBytes_FromString(test_bytes);
     EXPECT_TRUE(PythonBytes::Check(py_bytes));
     PythonBytes python_bytes(PyRefType::Owned, py_bytes);
-    EXPECT_EQ(PyObjectType::Bytes, python_bytes.GetObjectType());
 
 #if PY_MAJOR_VERSION < 3
     EXPECT_TRUE(PythonString::Check(py_bytes));
     EXPECT_EQ(PyObjectType::String, python_bytes.GetObjectType());
 #else
     EXPECT_FALSE(PythonString::Check(py_bytes));
-    EXPECT_NE(PyObjectType::String, python_bytes.GetObjectType());
+    EXPECT_EQ(PyObjectType::Bytes, python_bytes.GetObjectType());
 #endif
 
     llvm::ArrayRef<uint8_t> bytes = python_bytes.GetBytes();
     EXPECT_EQ(bytes.size(), strlen(test_bytes));
     EXPECT_EQ(0, ::memcmp(bytes.data(), test_bytes, bytes.size()));
 }
 
 TEST_F(PythonDataObjectsTest, TestPythonByteArray)