Skip to content

[tests] add 1 second sleep after adb wait-for-device command #650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 16, 2017
Merged

[tests] add 1 second sleep after adb wait-for-device command #650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions build-tools/scripts/UnitTestApks.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<UsingTask AssemblyFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\Xamarin.Android.Tools.BootstrapTasks.dll" TaskName="Xamarin.Android.Tools.BootstrapTasks.RunInstrumentationTests" />
<UsingTask AssemblyFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\Xamarin.Android.Tools.BootstrapTasks.dll" TaskName="Xamarin.Android.Tools.BootstrapTasks.StartAndroidEmulator" />
<UsingTask AssemblyFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\Xamarin.Android.Tools.BootstrapTasks.dll" TaskName="Xamarin.Android.Tools.BootstrapTasks.KillProcess" />
<UsingTask AssemblyFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\xa-prep-tasks.dll" TaskName="Xamarin.Android.BuildTools.PrepTasks.Sleep" />

<PropertyGroup>
<_TestImageName>XamarinAndroidUnitTestRunner</_TestImageName>
Expand Down Expand Up @@ -41,17 +42,23 @@
<Output TaskParameter="AdbTarget" PropertyName="_EmuTarget" />
<Output TaskParameter="EmulatorProcessId" PropertyName="_EmuPid" />
</StartAndroidEmulator>
<Exec
<Sleep
Condition=" '$(_ValidAdbTarget)' != 'True' "
Command="sleep 10"
Milliseconds="10000"
/>
<Xamarin.Android.Tools.BootstrapTasks.Adb
EnvironmentVariables="ADB_TRACE=all"
Condition=" '$(_ValidAdbTarget)' != 'True' "
Arguments="$(_AdbTarget) wait-for-device"
ToolExe="$(AdbToolExe)"
ToolPath="$(AdbToolPath)"
/>
<Sleep
Condition=" '$(_ValidAdbTarget)' != 'True' "
Milliseconds="1000"
/>
<Xamarin.Android.Tools.BootstrapTasks.Adb
EnvironmentVariables="ADB_TRACE=all"
Condition=" '$(_ValidAdbTarget)' != 'True' "
Arguments="$(_EmuTarget) shell 'counter=0; while [ $counter -lt 60 ] &amp;&amp; [ &quot;`getprop sys.boot_completed`&quot; != &quot;1&quot; ]; do echo Waiting for device to fully boot; sleep 1; let &quot;counter++&quot;; done'"
ToolExe="$(AdbToolExe)"
Expand Down
21 changes: 21 additions & 0 deletions build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/Sleep.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
using System;
using System.Threading;

using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;

namespace Xamarin.Android.BuildTools.PrepTasks
{
public class Sleep : Task
{
public int Milliseconds { get; set; }

public override bool Execute ()
{
Log.LogMessage (MessageImportance.Normal, $"Going to sleep for {Milliseconds}ms");
Thread.Sleep (Milliseconds);

return true;
}
}
}
1 change: 1 addition & 0 deletions build-tools/xa-prep-tasks/xa-prep-tasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
<Compile Include="Xamarin.Android.BuildTools.PrepTasks\ReplaceFileContents.cs" />
<Compile Include="Xamarin.Android.BuildTools.PrepTasks\PrepareInstall.cs" />
<Compile Include="Xamarin.Android.BuildTools.PrepTasks\AcceptAndroidSdkLicenses.cs" />
<Compile Include="Xamarin.Android.BuildTools.PrepTasks\Sleep.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="xa-prep-tasks.targets" />
Expand Down