Make undeslivered parcel test reliable

relaycorp · Jun 22, 2020 · 91329d4 · 91329d4
1 parent e9d65f1
commit 91329d4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 24 deletions.
diff --git a/src/functional_tests/pdc_client.test.ts b/src/functional_tests/pdc_client.test.ts
@@ -9,7 +9,7 @@ import {
 import { Stan } from 'node-nats-streaming';
 import { promisify } from 'util';
 
-import { configureServices, PONG_ENDPOINT_ADDRESS, startService, stopService } from './services';
+import { configureServices, PONG_ENDPOINT_ADDRESS } from './services';
 import {
   connectToNatsStreaming,
   OBJECT_STORAGE_BUCKET,
@@ -49,17 +49,12 @@ describe('PDC client', () => {
   });
 
   test('Undelivered parcels should remain in the queue', async () => {
-    await stopService('pong');
-    try {
-      const parcel = new Parcel(PONG_ENDPOINT_ADDRESS, senderCertificate, Buffer.from([]));
+    const parcel = new Parcel('https://relaynet.local', senderCertificate, Buffer.from([]));
 
-      await queueParcel(parcel);
+    await queueParcel(parcel);
 
-      await sleep(2);
-      await expect(isParcelInStore(parcel)).resolves.toBeTrue();
-    } finally {
-      await startService('pong');
-    }
+    await sleep(2);
+    await expect(isParcelInStore(parcel)).resolves.toBeTrue();
   });
 });
 

diff --git a/src/functional_tests/services.ts b/src/functional_tests/services.ts
@@ -95,20 +95,6 @@ async function tearDownServices(): Promise<void> {
   });
 }
 
-export async function stopService(service: string): Promise<void> {
-  await dockerCompose.stopOne(service, {
-    composeOptions: COMPOSE_OPTIONS,
-    log: true,
-  });
-}
-
-export async function startService(service: string): Promise<void> {
-  await dockerCompose.restartOne(service, {
-    composeOptions: COMPOSE_OPTIONS,
-    log: true,
-  });
-}
-
 export async function vaultEnableSecret(kvPrefix: string): Promise<void> {
   await VAULT_CLIENT.post(`/sys/mounts/${kvPrefix}`, {
     options: { version: '2' },