merging android studio 1.5: test fixes

This commit is contained in:
Dmitry Avdeev
2015-12-18 12:41:22 +03:00
parent 3d9c285e70
commit d4b796d1f2
@@ -53,7 +53,8 @@ com.android.tools.idea.wizard.TemplateWizardStateTest
com.android.tools.idea.wizard.TemplateWizardModuleBuilderTest
com.android.tools.idea.wizard.NewTemplateObjectWizardTest
org.jetbrains.android.run.AndroidRunConfigurationTest
org.jetbrains.android.run.GradleApkProviderTest
com.android.tools.idea.run.GradleApkProviderTest
com.android.tools.idea.run.LaunchUtilsTest
org.jetbrains.android.facet.IdeaSourceProviderTest
com.android.tools.idea.gradle.service.resolve.AndroidResolveTest
com.android.tools.idea.gradle.service.resolve.AndroidDslContributorTest
@@ -91,6 +92,7 @@ com.android.tools.idea.sdk.IdeSdksTest
com.android.tools.idea.welcome.wizard.FirstRunWizardTest
com.android.tools.idea.wizard.template.TemplateWizardStateTest
com.android.tools.swing.layoutlib.GraphicsLayoutRendererTest
org.jetbrains.android.databinding.GeneratedCodeMatchTest
[ANDROID_BOMBED]
com.android.tools.idea.gradle.project.GradleModuleImportTest