From efa3e3a6b2aded859427698fbebd1c71ea724930 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Fri, 29 Jan 2016 09:32:39 +0000
Subject: [PATCH 01/20] Begin factoring out base test helper

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b89ae7f3..c1287680 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#dc02e5c4c2",
+        "c9.ide.language": "#6e2fd331ff",
         "c9.ide.language.css": "#be07d72209",
         "c9.ide.language.generic": "#a4023db7f6",
         "c9.ide.language.html": "#9be847c0ce",

From 251c41f799e4801079038f8a681f01168b92c5a4 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Fri, 29 Jan 2016 09:33:35 +0000
Subject: [PATCH 02/20] Fix +11931 $source of undefined

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c1287680..4da88aa8 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
         "c9.ide.language.javascript.eslint": "#3127e1eba1",
         "c9.ide.language.javascript.tern": "#bf1072b11a",
         "c9.ide.language.javascript.infer": "#0561c69d67",
-        "c9.ide.language.jsonalyzer": "#243e11bd42",
+        "c9.ide.language.jsonalyzer": "#94fda22d37",
         "c9.ide.collab": "#4b93a497cd",
         "c9.ide.local": "#a6e689e33b",
         "c9.ide.find": "#e33fbaed2f",

From f84c9a2e59bfa062c9ec6ec0edecb449b2f6cf6b Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Fri, 29 Jan 2016 09:35:21 +0000
Subject: [PATCH 03/20] Add mock files for python tests

---
 plugins/c9.fs/mock/python/app/__init__.py      | 0
 plugins/c9.fs/mock/python/app/tests/__init.py  | 1 +
 plugins/c9.fs/mock/python/app/tests/tests.py   | 4 ++++
 plugins/c9.fs/mock/python/app/user/__init__.py | 1 +
 plugins/c9.fs/mock/python/app/user/models.py   | 3 +++
 plugins/c9.fs/mock/python/test_user.py         | 3 +++
 6 files changed, 12 insertions(+)
 create mode 100644 plugins/c9.fs/mock/python/app/__init__.py
 create mode 100644 plugins/c9.fs/mock/python/app/tests/__init.py
 create mode 100644 plugins/c9.fs/mock/python/app/tests/tests.py
 create mode 100644 plugins/c9.fs/mock/python/app/user/__init__.py
 create mode 100644 plugins/c9.fs/mock/python/app/user/models.py
 create mode 100644 plugins/c9.fs/mock/python/test_user.py

diff --git a/plugins/c9.fs/mock/python/app/__init__.py b/plugins/c9.fs/mock/python/app/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/plugins/c9.fs/mock/python/app/tests/__init.py b/plugins/c9.fs/mock/python/app/tests/__init.py
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/plugins/c9.fs/mock/python/app/tests/__init.py
@@ -0,0 +1 @@
+
diff --git a/plugins/c9.fs/mock/python/app/tests/tests.py b/plugins/c9.fs/mock/python/app/tests/tests.py
new file mode 100644
index 00000000..51e01f29
--- /dev/null
+++ b/plugins/c9.fs/mock/python/app/tests/tests.py
@@ -0,0 +1,4 @@
+from ..user.models import User
+
+def test_user():
+    return User()
diff --git a/plugins/c9.fs/mock/python/app/user/__init__.py b/plugins/c9.fs/mock/python/app/user/__init__.py
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/plugins/c9.fs/mock/python/app/user/__init__.py
@@ -0,0 +1 @@
+
diff --git a/plugins/c9.fs/mock/python/app/user/models.py b/plugins/c9.fs/mock/python/app/user/models.py
new file mode 100644
index 00000000..b7ae594e
--- /dev/null
+++ b/plugins/c9.fs/mock/python/app/user/models.py
@@ -0,0 +1,3 @@
+class User():
+    def __repr__(self):
+        return '<User test>'
diff --git a/plugins/c9.fs/mock/python/test_user.py b/plugins/c9.fs/mock/python/test_user.py
new file mode 100644
index 00000000..58d28c0d
--- /dev/null
+++ b/plugins/c9.fs/mock/python/test_user.py
@@ -0,0 +1,3 @@
+#!/usr/bin/env python3
+from app.tests.tests import test_user
+print(test_user())

From 03a05a56bcc58901a48c435fd8cbd4a51f986f29 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Fri, 29 Jan 2016 09:37:44 +0000
Subject: [PATCH 04/20] Extend test_base

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4da88aa8..872acd96 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#6e2fd331ff",
+        "c9.ide.language": "#97de0480e6",
         "c9.ide.language.css": "#be07d72209",
         "c9.ide.language.generic": "#a4023db7f6",
         "c9.ide.language.html": "#9be847c0ce",

From b6e8f4eaf2c833d9868198b9869fd280de4c8f9e Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Fri, 29 Jan 2016 10:50:31 +0100
Subject: [PATCH 05/20] Fix test_base setup flow

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 872acd96..cec67468 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#97de0480e6",
+        "c9.ide.language": "#30c7b35230",
         "c9.ide.language.css": "#be07d72209",
         "c9.ide.language.generic": "#a4023db7f6",
         "c9.ide.language.html": "#9be847c0ce",

From 1ceb18cd30df77fd265629e432fbca0deb86687b Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Fri, 29 Jan 2016 11:08:36 +0100
Subject: [PATCH 06/20] Fix language_test

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cec67468..3453b34b 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#30c7b35230",
+        "c9.ide.language": "#34497cfb03",
         "c9.ide.language.css": "#be07d72209",
         "c9.ide.language.generic": "#a4023db7f6",
         "c9.ide.language.html": "#9be847c0ce",

From ba0db2aafc4049210ac45c3da830b9f69d25a2d3 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Fri, 29 Jan 2016 11:12:32 +0100
Subject: [PATCH 07/20] Split linting and completion tests

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3453b34b..62ba17b9 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#34497cfb03",
+        "c9.ide.language": "#9d05e2fa1c",
         "c9.ide.language.css": "#be07d72209",
         "c9.ide.language.generic": "#a4023db7f6",
         "c9.ide.language.html": "#9be847c0ce",

From 60aba3adcdb6ca37b64cfafbc6511ef2a07fca43 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Fri, 29 Jan 2016 11:16:33 +0100
Subject: [PATCH 08/20] Cleanup

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 62ba17b9..0beff9a0 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#9d05e2fa1c",
+        "c9.ide.language": "#dd08a9e9e6",
         "c9.ide.language.css": "#be07d72209",
         "c9.ide.language.generic": "#a4023db7f6",
         "c9.ide.language.html": "#9be847c0ce",

From 1286993eaa83f9a5a254184930fa02321c850654 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Fri, 29 Jan 2016 12:02:33 +0100
Subject: [PATCH 09/20] Fix workspaceDir during tests

---
 node_modules/vfs-local/localfs.js | 2 ++
 package.json                      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/node_modules/vfs-local/localfs.js b/node_modules/vfs-local/localfs.js
index 3ce6bd52..0eba62a4 100644
--- a/node_modules/vfs-local/localfs.js
+++ b/node_modules/vfs-local/localfs.js
@@ -157,6 +157,8 @@ module.exports = function setup(fsOptions) {
 
     // Export the API
     var vfs = wrapDomain({
+        fsOptions: fsOptions,
+        
         // File management
         resolve: resolve,
         stat: stat,
diff --git a/package.json b/package.json
index 0beff9a0..8c1b8b60 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
         "c9.ide.language.javascript.eslint": "#3127e1eba1",
         "c9.ide.language.javascript.tern": "#bf1072b11a",
         "c9.ide.language.javascript.infer": "#0561c69d67",
-        "c9.ide.language.jsonalyzer": "#94fda22d37",
+        "c9.ide.language.jsonalyzer": "#3de934af95",
         "c9.ide.collab": "#4b93a497cd",
         "c9.ide.local": "#a6e689e33b",
         "c9.ide.find": "#e33fbaed2f",

From 66706a5fd90d171fce3368a0d4598e66c756eb50 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Fri, 29 Jan 2016 12:02:55 +0100
Subject: [PATCH 10/20] Improve error handling

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 8c1b8b60..dd0f5992 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
         "c9.ide.language.javascript.eslint": "#3127e1eba1",
         "c9.ide.language.javascript.tern": "#bf1072b11a",
         "c9.ide.language.javascript.infer": "#0561c69d67",
-        "c9.ide.language.jsonalyzer": "#3de934af95",
+        "c9.ide.language.jsonalyzer": "#515aad691b",
         "c9.ide.collab": "#4b93a497cd",
         "c9.ide.local": "#a6e689e33b",
         "c9.ide.find": "#e33fbaed2f",
@@ -91,7 +91,7 @@
         "c9.ide.imgeditor": "#612e75ef4f",
         "c9.ide.immediate": "#a962119bec",
         "c9.ide.installer": "#0fde9f0067",
-        "c9.ide.language.python": "#4fad6f5a80",
+        "c9.ide.language.python": "#b564a19d7e",
         "c9.ide.language.go": "#8f6d0beae7",
         "c9.ide.mount": "#86c8985f34",
         "c9.ide.navigate": "#1fbb7cd53b",

From 7c577712412f28e0433be12120b4d61a814bd3e4 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Fri, 29 Jan 2016 12:17:05 +0100
Subject: [PATCH 11/20] Fix filename

---
 plugins/c9.fs/mock/python/app/tests/{__init.py => __init__.py} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename plugins/c9.fs/mock/python/app/tests/{__init.py => __init__.py} (100%)

diff --git a/plugins/c9.fs/mock/python/app/tests/__init.py b/plugins/c9.fs/mock/python/app/tests/__init__.py
similarity index 100%
rename from plugins/c9.fs/mock/python/app/tests/__init.py
rename to plugins/c9.fs/mock/python/app/tests/__init__.py

From d7525d08a3b646af4e8dfe5477fab25723b782c0 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Fri, 29 Jan 2016 12:17:34 +0100
Subject: [PATCH 12/20] Fix environment variables like HOME missing

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dd0f5992..98469930 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
         "c9.ide.language.javascript.eslint": "#3127e1eba1",
         "c9.ide.language.javascript.tern": "#bf1072b11a",
         "c9.ide.language.javascript.infer": "#0561c69d67",
-        "c9.ide.language.jsonalyzer": "#515aad691b",
+        "c9.ide.language.jsonalyzer": "#982a078159",
         "c9.ide.collab": "#4b93a497cd",
         "c9.ide.local": "#a6e689e33b",
         "c9.ide.find": "#e33fbaed2f",

From 9456a2dd7e3253cd177e3bb8696cf38d36a7d8a2 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Fri, 29 Jan 2016 12:18:12 +0100
Subject: [PATCH 13/20] Support standalone in python_linter

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 98469930..b2e49474 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
         "c9.ide.imgeditor": "#612e75ef4f",
         "c9.ide.immediate": "#a962119bec",
         "c9.ide.installer": "#0fde9f0067",
-        "c9.ide.language.python": "#b564a19d7e",
+        "c9.ide.language.python": "#ee7b02ba3a",
         "c9.ide.language.go": "#8f6d0beae7",
         "c9.ide.mount": "#86c8985f34",
         "c9.ide.navigate": "#1fbb7cd53b",

From b622f8bb70f220d55ced40e9e42a6d09825be9a9 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Fri, 29 Jan 2016 12:18:39 +0100
Subject: [PATCH 14/20] Improve virtualenv handling for ssh/standalone

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b2e49474..6df24f11 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
         "c9.ide.imgeditor": "#612e75ef4f",
         "c9.ide.immediate": "#a962119bec",
         "c9.ide.installer": "#0fde9f0067",
-        "c9.ide.language.python": "#ee7b02ba3a",
+        "c9.ide.language.python": "#43be830ee0",
         "c9.ide.language.go": "#8f6d0beae7",
         "c9.ide.mount": "#86c8985f34",
         "c9.ide.navigate": "#1fbb7cd53b",

From 58118113973fb9145563ae02bb6ae28c6a48d488 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Fri, 29 Jan 2016 12:33:46 +0100
Subject: [PATCH 15/20] Ignore import errors

Fixes +11919
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6df24f11..d6a572d2 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
         "c9.ide.imgeditor": "#612e75ef4f",
         "c9.ide.immediate": "#a962119bec",
         "c9.ide.installer": "#0fde9f0067",
-        "c9.ide.language.python": "#43be830ee0",
+        "c9.ide.language.python": "#57fe54fb4d",
         "c9.ide.language.go": "#8f6d0beae7",
         "c9.ide.mount": "#86c8985f34",
         "c9.ide.navigate": "#1fbb7cd53b",

From 2b6934cee168d80263be7d22e9daa38e8d5df41b Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Fri, 29 Jan 2016 12:34:13 +0100
Subject: [PATCH 16/20] Add a python test

---
 package.json                           | 2 +-
 plugins/c9.fs/mock/python/test_user.py | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d6a572d2..95ba9783 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#dd08a9e9e6",
+        "c9.ide.language": "#37929c99bf",
         "c9.ide.language.css": "#be07d72209",
         "c9.ide.language.generic": "#a4023db7f6",
         "c9.ide.language.html": "#9be847c0ce",
diff --git a/plugins/c9.fs/mock/python/test_user.py b/plugins/c9.fs/mock/python/test_user.py
index 58d28c0d..c46095eb 100644
--- a/plugins/c9.fs/mock/python/test_user.py
+++ b/plugins/c9.fs/mock/python/test_user.py
@@ -1,3 +1,7 @@
 #!/usr/bin/env python3
 from app.tests.tests import test_user
+import badimport
+
 print(test_user())
+
+bad_call()

From 94a3f14f0b1f76dc32f3b42304076da993ad058d Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Fri, 29 Jan 2016 12:39:41 +0100
Subject: [PATCH 17/20] Fix python linting for now

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 95ba9783..552e1370 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#37929c99bf",
+        "c9.ide.language": "#16be9b2aad",
         "c9.ide.language.css": "#be07d72209",
         "c9.ide.language.generic": "#a4023db7f6",
         "c9.ide.language.html": "#9be847c0ce",

From 701609bd6cdb04bb71c3d61a7693818a3b200c63 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Fri, 29 Jan 2016 13:46:04 +0100
Subject: [PATCH 18/20] Add python completer test

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 552e1370..1445aee7 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#16be9b2aad",
+        "c9.ide.language": "#0821f87d1b",
         "c9.ide.language.css": "#be07d72209",
         "c9.ide.language.generic": "#a4023db7f6",
         "c9.ide.language.html": "#9be847c0ce",
@@ -91,7 +91,7 @@
         "c9.ide.imgeditor": "#612e75ef4f",
         "c9.ide.immediate": "#a962119bec",
         "c9.ide.installer": "#0fde9f0067",
-        "c9.ide.language.python": "#57fe54fb4d",
+        "c9.ide.language.python": "#675ddb4c8f",
         "c9.ide.language.go": "#8f6d0beae7",
         "c9.ide.mount": "#86c8985f34",
         "c9.ide.navigate": "#1fbb7cd53b",

From 742326f3d3676384eb02033a4cd72fa2020c64ee Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Fri, 29 Jan 2016 13:46:15 +0100
Subject: [PATCH 19/20] Skip python completer test, for now

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1445aee7..03d25f42 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#0821f87d1b",
+        "c9.ide.language": "#9ec48a2b65",
         "c9.ide.language.css": "#be07d72209",
         "c9.ide.language.generic": "#a4023db7f6",
         "c9.ide.language.html": "#9be847c0ce",

From af4f3b67133166cc281021feed5a2d5a1bbd696c Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Fri, 29 Jan 2016 13:50:34 +0100
Subject: [PATCH 20/20] Improve bad import!

---
 plugins/c9.fs/mock/python/test_user.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/c9.fs/mock/python/test_user.py b/plugins/c9.fs/mock/python/test_user.py
index c46095eb..3867f0f3 100644
--- a/plugins/c9.fs/mock/python/test_user.py
+++ b/plugins/c9.fs/mock/python/test_user.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python3
 from app.tests.tests import test_user
-import badimport
+from doesntexist import badimport
 
 print(test_user())
 
 bad_call()
+
+badimport.foo()
\ No newline at end of file