From 981c567d14cb0d0cab72d967a84facb4c01837f9 Mon Sep 17 00:00:00 2001
From: Andrey Vlasovskikh <andrey.vlasovskikh@gmail.com>
Date: Wed, 23 May 2012 22:45:51 +0400
Subject: [PATCH] Test for PY-6575

---
 .../multiFile/relativeFromSubmodule/RelativeFromSubmodule.py | 4 ++++
 .../resolve/multiFile/relativeFromSubmodule/p1/__init__.py   | 1 +
 .../resolve/multiFile/relativeFromSubmodule/p1/m1.py         | 1 +
 .../multiFile/relativeFromSubmodule/p1/p2/__init__.py        | 0
 .../resolve/multiFile/relativeFromSubmodule/p1/p2/m2.py      | 0
 .../testSrc/com/jetbrains/python/PyMultiFileResolveTest.java | 5 +++++
 6 files changed, 11 insertions(+)
 create mode 100644 python/testData/resolve/multiFile/relativeFromSubmodule/RelativeFromSubmodule.py
 create mode 100644 python/testData/resolve/multiFile/relativeFromSubmodule/p1/__init__.py
 create mode 100644 python/testData/resolve/multiFile/relativeFromSubmodule/p1/m1.py
 create mode 100644 python/testData/resolve/multiFile/relativeFromSubmodule/p1/p2/__init__.py
 create mode 100644 python/testData/resolve/multiFile/relativeFromSubmodule/p1/p2/m2.py

diff --git a/python/testData/resolve/multiFile/relativeFromSubmodule/RelativeFromSubmodule.py b/python/testData/resolve/multiFile/relativeFromSubmodule/RelativeFromSubmodule.py
new file mode 100644
index 000000000000..482dc046d1bf
--- /dev/null
+++ b/python/testData/resolve/multiFile/relativeFromSubmodule/RelativeFromSubmodule.py
@@ -0,0 +1,4 @@
+from p1 import m1
+
+foo = m1.p2.m2
+#           <ref>
\ No newline at end of file
diff --git a/python/testData/resolve/multiFile/relativeFromSubmodule/p1/__init__.py b/python/testData/resolve/multiFile/relativeFromSubmodule/p1/__init__.py
new file mode 100644
index 000000000000..e6b28fd8607e
--- /dev/null
+++ b/python/testData/resolve/multiFile/relativeFromSubmodule/p1/__init__.py
@@ -0,0 +1 @@
+__author__ = 'user'
diff --git a/python/testData/resolve/multiFile/relativeFromSubmodule/p1/m1.py b/python/testData/resolve/multiFile/relativeFromSubmodule/p1/m1.py
new file mode 100644
index 000000000000..def931bd4d78
--- /dev/null
+++ b/python/testData/resolve/multiFile/relativeFromSubmodule/p1/m1.py
@@ -0,0 +1 @@
+import p2.m2
\ No newline at end of file
diff --git a/python/testData/resolve/multiFile/relativeFromSubmodule/p1/p2/__init__.py b/python/testData/resolve/multiFile/relativeFromSubmodule/p1/p2/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/testData/resolve/multiFile/relativeFromSubmodule/p1/p2/m2.py b/python/testData/resolve/multiFile/relativeFromSubmodule/p1/p2/m2.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/testSrc/com/jetbrains/python/PyMultiFileResolveTest.java b/python/testSrc/com/jetbrains/python/PyMultiFileResolveTest.java
index 3335a5e4c02b..f31dbd7223a8 100644
--- a/python/testSrc/com/jetbrains/python/PyMultiFileResolveTest.java
+++ b/python/testSrc/com/jetbrains/python/PyMultiFileResolveTest.java
@@ -372,6 +372,11 @@ public class PyMultiFileResolveTest extends PyResolveTestCase {
     assertResolvesTo(PyFile.class, "m1.py");
   }
 
+  // PY-6575
+  public void testRelativeFromSubmodule() {
+    assertResolvesTo(PyFile.class, "m2.py");
+  }
+
   private void prepareTestDirectory() {
     final String testName = getTestName(true);
     myFixture.copyDirectoryToProject(testName, "");