From dbc57f9980adcd48b1e420f93921c35d608fdf3b Mon Sep 17 00:00:00 2001
From: denfromufa <denfromufa@users.noreply.github.com>
Date: Sun, 19 Feb 2017 18:39:48 -0600
Subject: [PATCH 1/2] Update tests.pyproj

---
 src/tests/tests.pyproj | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/tests/tests.pyproj b/src/tests/tests.pyproj
index 5d042249e..9c52e7431 100644
--- a/src/tests/tests.pyproj
+++ b/src/tests/tests.pyproj
@@ -6,7 +6,7 @@
     <ProjectGuid>{250c535c-c060-4f0c-bd80-41f2bf373565}</ProjectGuid>
     <ProjectHome />
     <StartupFile>runtests.py</StartupFile>
-    <SearchPath />
+    <SearchPath>..\..\</SearchPath>
     <WorkingDirectory>.</WorkingDirectory>
     <OutputPath>.</OutputPath>
     <ProjectTypeGuids>{888888a0-9f3d-457c-b088-3a5042f75d52}</ProjectTypeGuids>
@@ -62,6 +62,8 @@
     <Compile Include="test_suite\_missing_import.py" />
     <Compile Include="test_suite\__init__.py" />
     <Compile Include="test_thread.py" />
+    <Compile Include="utils.py" />
+    <Compile Include="_compat.py" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="PyImportTest" />

From a8bf17a1f304520786fcb9b677ed9190d2bc8ed5 Mon Sep 17 00:00:00 2001
From: Victor Uriarte <victor.m.uriarte@intel.com>
Date: Fri, 24 Feb 2017 00:42:35 -0700
Subject: [PATCH 2/2] Update folder structure

After pytest folders were flatten.
Add code in fixture
Upstream PyImportTest was moved to within Embedded Tests
Add pyproj to editorconfig
---
 .editorconfig          |  2 +-
 src/tests/tests.pyproj | 21 ++++++++-------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index ff0b3c71d..af891e897 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -16,7 +16,7 @@ trim_trailing_whitespace = true
 indent_size = 2
 
 # Xml project files
-[*.{csproj,config,build,config}]
+[*.{csproj,pyproj,config}]
 indent_size = 2
 
 # Solution
diff --git a/src/tests/tests.pyproj b/src/tests/tests.pyproj
index 9c52e7431..cefa0d05e 100644
--- a/src/tests/tests.pyproj
+++ b/src/tests/tests.pyproj
@@ -27,17 +27,17 @@
     <PtvsTargetsFile>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets</PtvsTargetsFile>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="__init__.py" />
+    <Compile Include="_compat.py" />
+    <Compile Include="_missing_import.py" />
     <Compile Include="leaktest.py" />
     <Compile Include="profile.py" />
-    <Compile Include="PyImportTest\sysargv.py" />
-    <Compile Include="PyImportTest\test\one.py" />
-    <Compile Include="PyImportTest\test\__init__.py" />
-    <Compile Include="PyImportTest\__init__.py" />
     <Compile Include="runtests.py" />
     <Compile Include="stress.py" />
     <Compile Include="stresstest.py" />
     <Compile Include="test_sysargv.py" />
     <Compile Include="test_array.py" />
+    <Compile Include="test_callback.py" />
     <Compile Include="test_class.py" />
     <Compile Include="test_compat.py" />
     <Compile Include="test_constructors.py" />
@@ -50,25 +50,20 @@
     <Compile Include="test_exceptions.py" />
     <Compile Include="test_field.py" />
     <Compile Include="test_generic.py" />
+    <Compile Include="test_import.py" />
     <Compile Include="test_indexer.py" />
     <Compile Include="test_interface.py" />
     <Compile Include="test_method.py" />
     <Compile Include="test_module.py" />
     <Compile Include="test_property.py" />
+    <Compile Include="test_recursive_types.py" />
     <Compile Include="test_subclass.py" />
-    <Compile Include="test_suite\test_callback.py" />
-    <Compile Include="test_suite\test_import.py" />
-    <Compile Include="test_suite\test_recursive_types.py" />
-    <Compile Include="test_suite\_missing_import.py" />
-    <Compile Include="test_suite\__init__.py" />
     <Compile Include="test_thread.py" />
     <Compile Include="utils.py" />
-    <Compile Include="_compat.py" />
+    <Compile Include="fixtures\argv-fixture.py" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="PyImportTest" />
-    <Folder Include="PyImportTest\test" />
-    <Folder Include="test_suite" />
+    <Folder Include="fixtures" />
   </ItemGroup>
   <Import Project="$(PtvsTargetsFile)" Condition="Exists($(PtvsTargetsFile))" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" Condition="!Exists($(PtvsTargetsFile))" />