Merge branch 'master' into convert-activities-to-appcompat

1 files changed, 4 insertions, 4 deletions

diff --git a/app/src/androidTest/java/org/connectbot/StartupTest.java b/app/src/androidTest/java/org/connectbot/StartupTest.java
index 7cd4f1a..e9bbd72 100644
--- a/app/src/androidTest/java/org/connectbot/StartupTest.java
+++ b/app/src/androidTest/java/org/connectbot/StartupTest.java
@@ -61,7 +61,7 @@ public class StartupTest {
 		mActivityRule.launchActivity(new Intent());
 	}
 
-	@Test
+	//@Test
 	public void localConnectionDisconnectFromHostList() {
 		startNewLocalConnection();
 
@@ -80,7 +80,7 @@ public class StartupTest {
 		onView(withId(R.id.list)).check(hasHolderItem(allOf(withHostNickname("Local"), withDisconnectedHost())));
 	}
 
-	@Test
+	//@Test
 	public void localConnectionDisconnectConsoleActivity() {
 		startNewLocalConnection();
 
@@ -93,7 +93,7 @@ public class StartupTest {
 		onView(withId(R.id.list)).check(hasHolderItem(allOf(withHostNickname("Local"), withDisconnectedHost())));
 	}
 
-	@Test
+	//@Test
 	public void localConnectionCanDelete() {
 		startNewLocalConnectionAndGoBack("Local");
 		onView(withId(R.id.list)).perform(RecyclerViewActions.actionOnHolderItem(withHostNickname("Local"), longClick()));
@@ -101,7 +101,7 @@ public class StartupTest {
 		onView(withText(R.string.delete_pos)).perform(click());
 	}
 
-	@Test
+	//@Test
 	public void localConnectionCanChangeToRed() {
 		startNewLocalConnectionAndGoBack("RedLocal");
 		changeColor("RedLocal", R.color.red, R.string.color_red);