Try to reduce flakiness of Docker container attach tests

Author: pimterry

test/fixtures/docker/go/app.go

@@ -17,12 +17,11 @@ func main() {
 
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Error: %v\n", err)
-			os.Exit(1)
+		} else {
+			fmt.Printf("Got %v response\n", resp.StatusCode)
 		}
 
-		fmt.Printf("Got %v response\n", resp.StatusCode)
-
-		time.Sleep(500 * time.Millisecond)
+		time.Sleep(250 * time.Millisecond)
 	}
 
 }

test/fixtures/docker/java/Main.java

@@ -9,12 +9,16 @@ public static void main(String[] argv) throws IOException, InterruptedException
 
         System.out.println("Starting Java container");
         while (true) {
-            HttpURLConnection con = (HttpURLConnection) url.openConnection();
-            con.setRequestMethod("GET");
-            int status = con.getResponseCode();
-            System.out.println("Got " + status + " response");
+            try {
+                HttpURLConnection con = (HttpURLConnection) url.openConnection();
+                con.setRequestMethod("GET");
+                int status = con.getResponseCode();
+                System.out.println("Got " + status + " response");
+            } catch (IOException e) {
+                System.err.println("Error: " + e.getMessage());
+            }
 
-            Thread.sleep(500);
+            Thread.sleep(250);
         }
     }
 }

test/fixtures/docker/js/app.js

@@ -8,13 +8,17 @@ const targetUrl = process.argv[2];
     console.log('Starting JS container');
 
     while (true) {
-        const response = await new Promise((resolve, reject) => {
-            const req = https.get(targetUrl);
-            req.on('response', resolve);
-            req.on('error', reject);
-        });
-        console.log(`Got ${response.statusCode} response`);
+        try {
+            const response = await new Promise((resolve, reject) => {
+                const req = https.get(targetUrl);
+                req.on('response', resolve);
+                req.on('error', reject);
+            });
+            console.log(`Got ${response.statusCode} response`);
+        } catch (e) {
+            console.error(`Error: ${e.message}`);
+        }
 
-        await delay(500);
+        await delay(250);
     }
 })();

test/fixtures/docker/python/app.py

@@ -6,6 +6,9 @@
 
 print('Starting Python container')
 while True:
-    resp = requests.get(targetUrl)
-    print('Got {0} response'.format(resp.status_code))
-    time.sleep(0.5)
+    try:
+        resp = requests.get(targetUrl)
+        print('Got {0} response'.format(resp.status_code))
+    except Exception as e:
+        print('Error: {0}'.format(e), file=sys.stderr)
+    time.sleep(0.25)

test/fixtures/docker/ruby/app.rb

@@ -5,7 +5,11 @@
 puts 'Starting Ruby container'
 
 while true do
-    res = Net::HTTP.get_response(target_uri)
-    puts "Got #{res.code} response"
-    sleep(0.5)
+    begin
+        res = Net::HTTP.get_response(target_uri)
+        puts "Got #{res.code} response"
+    rescue => e
+        STDERR.puts "Error: #{e.message}"
+    end
+    sleep(0.25)
 end

test/integration/interceptors/docker-attachment.spec.ts

@@ -9,7 +9,7 @@ import Docker from 'dockerode';
 import fetch from 'node-fetch';
 
 import { FIXTURES_DIR } from '../../test-util';
-import { setupInterceptor, itIsAvailable } from './interceptor-test-utils';
+import { setupInterceptor, itIsAvailable, itCanBeActivated } from './interceptor-test-utils';
 import { waitForDockerStream } from '../../../src/interceptors/docker/docker-utils';
 
 const docker = new Docker();
@@ -109,6 +109,7 @@ describe('Docker single-container interceptor', function () {
     });
 
     itIsAvailable(interceptorSetup);
+    itCanBeActivated(interceptorSetup);
 
     [
         'JS',