Update testcase.

In its old form this shouldn't actually have worked, but for some reason it did.

Author: adrian-prantl

lldb/packages/Python/lldbsuite/test/lang/swift/clangimporter/dynamic_type_resolution_import_conflict/TestSwiftDynamicTypeResolutionImportConflict.py

@@ -60,13 +60,11 @@ def test(self):
         self.expect("bt", substrs=['Dylib.swift'])
         self.expect("fr v -d no-dynamic-values -- input",
                     substrs=['(Dylib.LibraryProtocol) input'])
+
+        # Because we are now in a per-module scratch context, we don't
+        # expect dynamic type resolution to find a type defined inside
+        # the other dylib.
         self.expect("fr v -d run-target -- input",
-                    substrs=['(a.FromMainModule) input'])
+                    substrs=['(Dylib.LibraryProtocol) input'])
         self.expect("expr -d run-target -- input",
-                    substrs=['(a.FromMainModule) $R0'])
-
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lldb.SBDebugger.Terminate)
-    unittest2.main()
+                    substrs=['(Dylib.LibraryProtocol)'])