revert dep and test

KostyaSha · KostyaSha · commit 52ff6d82952a · 2016-07-08T00:31:26.000+03:00
diff --git a/pom.xml b/pom.xml
@@ -57,7 +57,7 @@
 		<slf4j-api.version>1.7.21</slf4j-api.version>
 
 		<bouncycastle.version>1.54</bouncycastle.version>
-		<unix-socket-factory.version>2016-04-06T22-21-19</unix-socket-factory.version>
+		<unix-socket-factory.version>2015-01-27T15-02-14</unix-socket-factory.version>
 		<guava.version>19.0</guava.version>
 
 		<!-- test dependencies -->
@@ -104,20 +104,10 @@
 			<artifactId>jersey-client</artifactId>
 			<version>${jersey.version}</version>
 		</dependency>
-		<!--<dependency>-->
-			<!--<groupId>de.gesellix</groupId>-->
-			<!--<artifactId>unix-socket-factory</artifactId>-->
-			<!--<version>${unix-socket-factory.version}</version>-->
-		<!--</dependency>-->
 		<dependency>
-			<groupId>com.kohlschutter.junixsocket</groupId>
-			<artifactId>junixsocket-common</artifactId>
-			<version>2.0.4</version>
-		</dependency>
-		<dependency>
-			<groupId>com.kohlschutter.junixsocket</groupId>
-			<artifactId>junixsocket-native-common</artifactId>
-			<version>2.0.4</version>
+			<groupId>de.gesellix</groupId>
+			<artifactId>unix-socket-factory</artifactId>
+			<version>${unix-socket-factory.version}</version>
 		</dependency>
 
 		<dependency>
diff --git a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
@@ -77,7 +77,7 @@ public void onNext(Frame frame) {
         assertThat(callback.toString(), containsString(snippet));
     }
 
-    @Test(groups = "badTests", enabled = false)
+    @Test
     public void attachContainerWithTTY() throws Exception {
 
         File baseDir = new File(Thread.currentThread().getContextClassLoader()
@@ -105,19 +105,12 @@ public void onNext(Frame frame) {
                 .withStdOut(true)
                 .withFollowStream(true)
                 .exec(callback)
-                .awaitCompletion();
-//                .awaitCompletion(15, TimeUnit.SECONDS);
+                .awaitCompletion(15, TimeUnit.SECONDS);
         callback.close();
 
-        dockerClient.close();
-
         System.out.println("log: " + callback.toString());
 
         // HexDump.dump(collectFramesCallback.toString().getBytes(), 0, System.out, 0);
-        RuntimeException firstError = callback.getFirstError();
-        if (isEmpty(callback.toString())) {
-            throw new SkipException("com.github.dockerjava.api.exception.InternalServerErrorException: http: Hijack is incompatible with use of CloseNotifier");
-        }
         assertThat(callback.toString(), containsString("stdout\r\nstderr"));
     }
 
