Python and E2E test changes during release

Azure · Sep 26, 2016 · 4e99826 · 4e99826
1 parent 6af80c6
commit 4e99826
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 24 deletions.
diff --git a/c/iothub_client/tests/iothubclient_amqp_e2e/CMakeLists.txt b/c/iothub_client/tests/iothubclient_amqp_e2e/CMakeLists.txt
@@ -19,6 +19,7 @@ set(${theseTestsName}_cpp_files
 set(${theseTestsName}_nuget_cpp_files
        ${theseTestsName}.cpp
         ../common_e2e/iothubclient_common_e2e.cpp
+		../../../certs/certs.c
 )
 
 set(${theseTestsName}_c_files

diff --git a/c/iothub_client/tests/iothubclient_mqtt_e2e/CMakeLists.txt b/c/iothub_client/tests/iothubclient_mqtt_e2e/CMakeLists.txt
@@ -18,6 +18,7 @@ set(${theseTestsName}_cpp_files
 set(${theseTestsName}_nuget_cpp_files
     ${theseTestsName}.cpp
     ../common_e2e/iothubclient_common_e2e.cpp
+	../../../certs/certs.c
 )
 
 set(${theseTestsName}_c_files

diff --git a/python/device/iothub_client_python/windows/client/iothub_client.vcxproj b/python/device/iothub_client_python/windows/client/iothub_client.vcxproj
@@ -203,12 +203,12 @@
     <Import Project="..\packages\boost.1.60.0.0\build\native\boost.targets" Condition="Exists('..\packages\boost.1.60.0.0\build\native\boost.targets')" />
     <Import Project="..\packages\boost_python.1.60.0.0\build\native\boost_python.targets" Condition="Exists('..\packages\boost_python.1.60.0.0\build\native\boost_python.targets')" />
     <Import Project="..\packages\Microsoft.Azure.C.SharedUtility.1.0.18\build\native\Microsoft.Azure.C.SharedUtility.targets" Condition="Exists('..\packages\Microsoft.Azure.C.SharedUtility.1.0.18\build\native\Microsoft.Azure.C.SharedUtility.targets')" />
-    <Import Project="..\packages\Microsoft.Azure.IoTHub.IoTHubClient.1.0.17\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets" Condition="Exists('..\packages\Microsoft.Azure.IoTHub.IoTHubClient.1.0.17\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets')" />
-    <Import Project="..\packages\Microsoft.Azure.IoTHub.HttpTransport.1.0.17\build\native\Microsoft.Azure.IoTHub.HttpTransport.targets" Condition="Exists('..\packages\Microsoft.Azure.IoTHub.HttpTransport.1.0.17\build\native\Microsoft.Azure.IoTHub.HttpTransport.targets')" />
     <Import Project="..\packages\Microsoft.Azure.uamqp.1.0.19\build\native\Microsoft.Azure.uamqp.targets" Condition="Exists('..\packages\Microsoft.Azure.uamqp.1.0.19\build\native\Microsoft.Azure.uamqp.targets')" />
-    <Import Project="..\packages\Microsoft.Azure.IoTHub.AmqpTransport.1.0.17\build\native\Microsoft.Azure.IoTHub.AmqpTransport.targets" Condition="Exists('..\packages\Microsoft.Azure.IoTHub.AmqpTransport.1.0.17\build\native\Microsoft.Azure.IoTHub.AmqpTransport.targets')" />
     <Import Project="..\packages\Microsoft.Azure.umqtt.1.0.18\build\native\Microsoft.Azure.umqtt.targets" Condition="Exists('..\packages\Microsoft.Azure.umqtt.1.0.18\build\native\Microsoft.Azure.umqtt.targets')" />
-    <Import Project="..\packages\Microsoft.Azure.IoTHub.MqttTransport.1.0.17\build\native\Microsoft.Azure.IoTHub.MqttTransport.targets" Condition="Exists('..\packages\Microsoft.Azure.IoTHub.MqttTransport.1.0.17\build\native\Microsoft.Azure.IoTHub.MqttTransport.targets')" />
+    <Import Project="..\packages\Microsoft.Azure.IoTHub.IoTHubClient.1.0.18\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets" Condition="Exists('..\packages\Microsoft.Azure.IoTHub.IoTHubClient.1.0.18\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets')" />
+    <Import Project="..\packages\Microsoft.Azure.IoTHub.HttpTransport.1.0.18\build\native\Microsoft.Azure.IoTHub.HttpTransport.targets" Condition="Exists('..\packages\Microsoft.Azure.IoTHub.HttpTransport.1.0.18\build\native\Microsoft.Azure.IoTHub.HttpTransport.targets')" />
+    <Import Project="..\packages\Microsoft.Azure.IoTHub.AmqpTransport.1.0.18\build\native\Microsoft.Azure.IoTHub.AmqpTransport.targets" Condition="Exists('..\packages\Microsoft.Azure.IoTHub.AmqpTransport.1.0.18\build\native\Microsoft.Azure.IoTHub.AmqpTransport.targets')" />
+    <Import Project="..\packages\Microsoft.Azure.IoTHub.MqttTransport.1.0.18\build\native\Microsoft.Azure.IoTHub.MqttTransport.targets" Condition="Exists('..\packages\Microsoft.Azure.IoTHub.MqttTransport.1.0.18\build\native\Microsoft.Azure.IoTHub.MqttTransport.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -217,11 +217,11 @@
     <Error Condition="!Exists('..\packages\boost.1.60.0.0\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost.1.60.0.0\build\native\boost.targets'))" />
     <Error Condition="!Exists('..\packages\boost_python.1.60.0.0\build\native\boost_python.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost_python.1.60.0.0\build\native\boost_python.targets'))" />
     <Error Condition="!Exists('..\packages\Microsoft.Azure.C.SharedUtility.1.0.18\build\native\Microsoft.Azure.C.SharedUtility.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.C.SharedUtility.1.0.18\build\native\Microsoft.Azure.C.SharedUtility.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Azure.IoTHub.IoTHubClient.1.0.17\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.IoTHub.IoTHubClient.1.0.17\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Azure.IoTHub.HttpTransport.1.0.17\build\native\Microsoft.Azure.IoTHub.HttpTransport.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.IoTHub.HttpTransport.1.0.17\build\native\Microsoft.Azure.IoTHub.HttpTransport.targets'))" />
     <Error Condition="!Exists('..\packages\Microsoft.Azure.uamqp.1.0.19\build\native\Microsoft.Azure.uamqp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.uamqp.1.0.19\build\native\Microsoft.Azure.uamqp.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Azure.IoTHub.AmqpTransport.1.0.17\build\native\Microsoft.Azure.IoTHub.AmqpTransport.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.IoTHub.AmqpTransport.1.0.17\build\native\Microsoft.Azure.IoTHub.AmqpTransport.targets'))" />
     <Error Condition="!Exists('..\packages\Microsoft.Azure.umqtt.1.0.18\build\native\Microsoft.Azure.umqtt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.umqtt.1.0.18\build\native\Microsoft.Azure.umqtt.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Azure.IoTHub.MqttTransport.1.0.17\build\native\Microsoft.Azure.IoTHub.MqttTransport.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.IoTHub.MqttTransport.1.0.17\build\native\Microsoft.Azure.IoTHub.MqttTransport.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Azure.IoTHub.IoTHubClient.1.0.18\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.IoTHub.IoTHubClient.1.0.18\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Azure.IoTHub.HttpTransport.1.0.18\build\native\Microsoft.Azure.IoTHub.HttpTransport.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.IoTHub.HttpTransport.1.0.18\build\native\Microsoft.Azure.IoTHub.HttpTransport.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Azure.IoTHub.AmqpTransport.1.0.18\build\native\Microsoft.Azure.IoTHub.AmqpTransport.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.IoTHub.AmqpTransport.1.0.18\build\native\Microsoft.Azure.IoTHub.AmqpTransport.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Azure.IoTHub.MqttTransport.1.0.18\build\native\Microsoft.Azure.IoTHub.MqttTransport.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.IoTHub.MqttTransport.1.0.18\build\native\Microsoft.Azure.IoTHub.MqttTransport.targets'))" />
   </Target>
 </Project>
diff --git a/python/device/iothub_client_python/windows/client/packages.config b/python/device/iothub_client_python/windows/client/packages.config
@@ -3,10 +3,10 @@
   <package id="boost" version="1.60.0.0" targetFramework="native" />
   <package id="boost_python" version="1.60.0.0" targetFramework="native" />
   <package id="Microsoft.Azure.C.SharedUtility" version="1.0.18" targetFramework="native" />
-  <package id="Microsoft.Azure.IoTHub.AmqpTransport" version="1.0.17" targetFramework="native" />
-  <package id="Microsoft.Azure.IoTHub.HttpTransport" version="1.0.17" targetFramework="native" />
-  <package id="Microsoft.Azure.IoTHub.IoTHubClient" version="1.0.17" targetFramework="native" />
-  <package id="Microsoft.Azure.IoTHub.MqttTransport" version="1.0.17" targetFramework="native" />
+  <package id="Microsoft.Azure.IoTHub.AmqpTransport" version="1.0.18" targetFramework="native" />
+  <package id="Microsoft.Azure.IoTHub.HttpTransport" version="1.0.18" targetFramework="native" />
+  <package id="Microsoft.Azure.IoTHub.IoTHubClient" version="1.0.18" targetFramework="native" />
+  <package id="Microsoft.Azure.IoTHub.MqttTransport" version="1.0.18" targetFramework="native" />
   <package id="Microsoft.Azure.uamqp" version="1.0.19" targetFramework="native" />
   <package id="Microsoft.Azure.umqtt" version="1.0.18" targetFramework="native" />
 </packages>
diff --git a/python/device/iothub_client_python/windows/mock/iothub_client_mock.vcxproj b/python/device/iothub_client_python/windows/mock/iothub_client_mock.vcxproj
@@ -204,12 +204,12 @@
     <Import Project="..\packages\boost.1.60.0.0\build\native\boost.targets" Condition="Exists('..\packages\boost.1.60.0.0\build\native\boost.targets')" />
     <Import Project="..\packages\boost_python.1.60.0.0\build\native\boost_python.targets" Condition="Exists('..\packages\boost_python.1.60.0.0\build\native\boost_python.targets')" />
     <Import Project="..\packages\Microsoft.Azure.C.SharedUtility.1.0.18\build\native\Microsoft.Azure.C.SharedUtility.targets" Condition="Exists('..\packages\Microsoft.Azure.C.SharedUtility.1.0.18\build\native\Microsoft.Azure.C.SharedUtility.targets')" />
-    <Import Project="..\packages\Microsoft.Azure.IoTHub.IoTHubClient.1.0.17\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets" Condition="Exists('..\packages\Microsoft.Azure.IoTHub.IoTHubClient.1.0.17\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets')" />
-    <Import Project="..\packages\Microsoft.Azure.IoTHub.HttpTransport.1.0.17\build\native\Microsoft.Azure.IoTHub.HttpTransport.targets" Condition="Exists('..\packages\Microsoft.Azure.IoTHub.HttpTransport.1.0.17\build\native\Microsoft.Azure.IoTHub.HttpTransport.targets')" />
     <Import Project="..\packages\Microsoft.Azure.uamqp.1.0.19\build\native\Microsoft.Azure.uamqp.targets" Condition="Exists('..\packages\Microsoft.Azure.uamqp.1.0.19\build\native\Microsoft.Azure.uamqp.targets')" />
-    <Import Project="..\packages\Microsoft.Azure.IoTHub.AmqpTransport.1.0.17\build\native\Microsoft.Azure.IoTHub.AmqpTransport.targets" Condition="Exists('..\packages\Microsoft.Azure.IoTHub.AmqpTransport.1.0.17\build\native\Microsoft.Azure.IoTHub.AmqpTransport.targets')" />
     <Import Project="..\packages\Microsoft.Azure.umqtt.1.0.18\build\native\Microsoft.Azure.umqtt.targets" Condition="Exists('..\packages\Microsoft.Azure.umqtt.1.0.18\build\native\Microsoft.Azure.umqtt.targets')" />
-    <Import Project="..\packages\Microsoft.Azure.IoTHub.MqttTransport.1.0.17\build\native\Microsoft.Azure.IoTHub.MqttTransport.targets" Condition="Exists('..\packages\Microsoft.Azure.IoTHub.MqttTransport.1.0.17\build\native\Microsoft.Azure.IoTHub.MqttTransport.targets')" />
+    <Import Project="..\packages\Microsoft.Azure.IoTHub.IoTHubClient.1.0.18\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets" Condition="Exists('..\packages\Microsoft.Azure.IoTHub.IoTHubClient.1.0.18\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets')" />
+    <Import Project="..\packages\Microsoft.Azure.IoTHub.HttpTransport.1.0.18\build\native\Microsoft.Azure.IoTHub.HttpTransport.targets" Condition="Exists('..\packages\Microsoft.Azure.IoTHub.HttpTransport.1.0.18\build\native\Microsoft.Azure.IoTHub.HttpTransport.targets')" />
+    <Import Project="..\packages\Microsoft.Azure.IoTHub.AmqpTransport.1.0.18\build\native\Microsoft.Azure.IoTHub.AmqpTransport.targets" Condition="Exists('..\packages\Microsoft.Azure.IoTHub.AmqpTransport.1.0.18\build\native\Microsoft.Azure.IoTHub.AmqpTransport.targets')" />
+    <Import Project="..\packages\Microsoft.Azure.IoTHub.MqttTransport.1.0.18\build\native\Microsoft.Azure.IoTHub.MqttTransport.targets" Condition="Exists('..\packages\Microsoft.Azure.IoTHub.MqttTransport.1.0.18\build\native\Microsoft.Azure.IoTHub.MqttTransport.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -218,11 +218,11 @@
     <Error Condition="!Exists('..\packages\boost.1.60.0.0\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost.1.60.0.0\build\native\boost.targets'))" />
     <Error Condition="!Exists('..\packages\boost_python.1.60.0.0\build\native\boost_python.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost_python.1.60.0.0\build\native\boost_python.targets'))" />
     <Error Condition="!Exists('..\packages\Microsoft.Azure.C.SharedUtility.1.0.18\build\native\Microsoft.Azure.C.SharedUtility.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.C.SharedUtility.1.0.18\build\native\Microsoft.Azure.C.SharedUtility.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Azure.IoTHub.IoTHubClient.1.0.17\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.IoTHub.IoTHubClient.1.0.17\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Azure.IoTHub.HttpTransport.1.0.17\build\native\Microsoft.Azure.IoTHub.HttpTransport.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.IoTHub.HttpTransport.1.0.17\build\native\Microsoft.Azure.IoTHub.HttpTransport.targets'))" />
     <Error Condition="!Exists('..\packages\Microsoft.Azure.uamqp.1.0.19\build\native\Microsoft.Azure.uamqp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.uamqp.1.0.19\build\native\Microsoft.Azure.uamqp.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Azure.IoTHub.AmqpTransport.1.0.17\build\native\Microsoft.Azure.IoTHub.AmqpTransport.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.IoTHub.AmqpTransport.1.0.17\build\native\Microsoft.Azure.IoTHub.AmqpTransport.targets'))" />
     <Error Condition="!Exists('..\packages\Microsoft.Azure.umqtt.1.0.18\build\native\Microsoft.Azure.umqtt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.umqtt.1.0.18\build\native\Microsoft.Azure.umqtt.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Azure.IoTHub.MqttTransport.1.0.17\build\native\Microsoft.Azure.IoTHub.MqttTransport.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.IoTHub.MqttTransport.1.0.17\build\native\Microsoft.Azure.IoTHub.MqttTransport.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Azure.IoTHub.IoTHubClient.1.0.18\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.IoTHub.IoTHubClient.1.0.18\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Azure.IoTHub.HttpTransport.1.0.18\build\native\Microsoft.Azure.IoTHub.HttpTransport.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.IoTHub.HttpTransport.1.0.18\build\native\Microsoft.Azure.IoTHub.HttpTransport.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Azure.IoTHub.AmqpTransport.1.0.18\build\native\Microsoft.Azure.IoTHub.AmqpTransport.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.IoTHub.AmqpTransport.1.0.18\build\native\Microsoft.Azure.IoTHub.AmqpTransport.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Azure.IoTHub.MqttTransport.1.0.18\build\native\Microsoft.Azure.IoTHub.MqttTransport.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.IoTHub.MqttTransport.1.0.18\build\native\Microsoft.Azure.IoTHub.MqttTransport.targets'))" />
   </Target>
 </Project>
diff --git a/python/device/iothub_client_python/windows/mock/packages.config b/python/device/iothub_client_python/windows/mock/packages.config
@@ -3,10 +3,10 @@
   <package id="boost" version="1.60.0.0" targetFramework="native" />
   <package id="boost_python" version="1.60.0.0" targetFramework="native" />
   <package id="Microsoft.Azure.C.SharedUtility" version="1.0.18" targetFramework="native" />
-  <package id="Microsoft.Azure.IoTHub.AmqpTransport" version="1.0.17" targetFramework="native" />
-  <package id="Microsoft.Azure.IoTHub.HttpTransport" version="1.0.17" targetFramework="native" />
-  <package id="Microsoft.Azure.IoTHub.IoTHubClient" version="1.0.17" targetFramework="native" />
-  <package id="Microsoft.Azure.IoTHub.MqttTransport" version="1.0.17" targetFramework="native" />
+  <package id="Microsoft.Azure.IoTHub.AmqpTransport" version="1.0.18" targetFramework="native" />
+  <package id="Microsoft.Azure.IoTHub.HttpTransport" version="1.0.18" targetFramework="native" />
+  <package id="Microsoft.Azure.IoTHub.IoTHubClient" version="1.0.18" targetFramework="native" />
+  <package id="Microsoft.Azure.IoTHub.MqttTransport" version="1.0.18" targetFramework="native" />
   <package id="Microsoft.Azure.uamqp" version="1.0.19" targetFramework="native" />
   <package id="Microsoft.Azure.umqtt" version="1.0.18" targetFramework="native" />
 </packages>