removed unit-b tests changed unit-a to unit tests, 6 shards for unit …

…tests
terascope · Nov 29, 2022 · 04ae6d7 · 04ae6d7
1 parent 860afc0
commit 04ae6d7
Show file tree

Hide file tree

Showing 20 changed files with 30 additions and 44 deletions.
diff --git a/package.json b/package.json
@@ -86,8 +86,7 @@
                 "kafka": [
                     "kafka"
                 ],
-                "unit-a": [],
-                "unit-b": []
+                "unit": []
             }
         },
         "docker": {

diff --git a/packages/data-mate/package.json b/packages/data-mate/package.json
@@ -66,6 +66,6 @@
     "srcMain": "src/index.ts",
     "terascope": {
         "enableTypedoc": true,
-        "testSuite": "unit-b"
+        "testSuite": "unit"
     }
 }
diff --git a/packages/data-types/package.json b/packages/data-types/package.json
@@ -47,6 +47,6 @@
     "srcMain": "src/index.ts",
     "terascope": {
         "enableTypedoc": true,
-        "testSuite": "unit-b"
+        "testSuite": "unit"
     }
 }
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -40,6 +40,6 @@
     },
     "terascope": {
         "enableTypedoc": false,
-        "testSuite": "unit-b"
+        "testSuite": "unit"
     }
 }
diff --git a/packages/generator-teraslice/package.json b/packages/generator-teraslice/package.json
@@ -42,6 +42,6 @@
         "registry": "https://registry.npmjs.org/"
     },
     "terascope": {
-        "testSuite": "unit-b"
+        "testSuite": "unit"
     }
 }
diff --git a/packages/job-components/package.json b/packages/job-components/package.json
@@ -54,6 +54,6 @@
     "srcMain": "src/index.ts",
     "terascope": {
         "enableTypedoc": true,
-        "testSuite": "unit-a"
+        "testSuite": "unit"
     }
 }
diff --git a/packages/scripts/package.json b/packages/scripts/package.json
@@ -81,6 +81,6 @@
     "srcMain": "src/index.ts",
     "terascope": {
         "enableTypedoc": false,
-        "testSuite": "unit-a"
+        "testSuite": "unit"
     }
 }
diff --git a/packages/scripts/test/test-runner-spec.ts b/packages/scripts/test/test-runner-spec.ts
@@ -35,7 +35,7 @@ describe('Test Runner Helpers', () => {
         it('should be able to filter by a suite', () => {
             const options = makeTestOptions({
                 all: false,
-                suite: ['unit-a'],
+                suite: ['unit'],
             });
             const filtered = filterBySuite(packages, options);
             const suites = filtered.map((pkgInfo) => pkgInfo.terascope.testSuite);
@@ -82,65 +82,52 @@ describe('Test Runner Helpers', () => {
                     suite: ['restrained'],
                 }));
 
-                const unitATests = filterBySuite(packages, makeTestOptions({
+                const unitTests = filterBySuite(packages, makeTestOptions({
                     all: true,
-                    suite: ['unit-a'],
-                }));
-
-                const unitBTests = filterBySuite(packages, makeTestOptions({
-                    all: true,
-                    suite: ['unit-b'],
+                    suite: ['unit']
                 }));
 
                 const unitAndESPackages = [
-                    ...unitBTests,
-                    ...unitATests,
+                    ...unitTests,
                     ...restrainedTests,
                     ...opensearchTests,
-                    ...elasticsearchTests,
+                    ...elasticsearchTests
                 ];
 
                 const grouped = groupBySuite(packages, availableSuites, makeTestOptions({
                     all: true,
                     watch: true
                 }));
 
-                expect(mapInfo(grouped['unit-a'])).toBeArrayOfSize(0);
-                expect(mapInfo(grouped['unit-b'])).toBeArrayOfSize(0);
+                expect(mapInfo(grouped.unit)).toBeArrayOfSize(0);
                 expect(mapInfo(grouped.elasticsearch).length).toEqual(
                     mapInfo(unitAndESPackages).length
                 );
             });
         });
 
-        describe('when a unit-a test and none-unit-a test, it should group them together', () => {
-            it('should be able group elasticsearch and unit-a together', () => {
+        describe('when a unit test and none-unit test, it should group them together', () => {
+            it('should be able group elasticsearch and unit together', () => {
                 const elasticsearchTests = filterBySuite(packages, makeTestOptions({
                     all: false,
                     suite: ['elasticsearch'],
                 })).slice(0, 2);
 
                 const unitATests = filterBySuite(packages, makeTestOptions({
                     all: false,
-                    suite: ['unit-a'],
-                })).slice(0, 2);
-
-                const unitBTests = filterBySuite(packages, makeTestOptions({
-                    all: false,
-                    suite: ['unit-b'],
+                    suite: ['unit'],
                 })).slice(0, 2);
 
                 const unitAndESPackages = [
                     ...unitATests,
-                    ...unitBTests,
-                    ...elasticsearchTests,
+                    ...elasticsearchTests
                 ];
 
                 const grouped = groupBySuite(unitAndESPackages, availableSuites, makeTestOptions({
                     all: false,
                 }));
 
-                expect(mapInfo(grouped['unit-a'])).toBeArrayOfSize(0);
+                expect(mapInfo(grouped.unit)).toBeArrayOfSize(0);
                 expect(mapInfo(grouped.elasticsearch)).toEqual(
                     mapInfo(unitAndESPackages)
                 );

diff --git a/packages/terafoundation/package.json b/packages/terafoundation/package.json
@@ -61,6 +61,6 @@
     },
     "terascope": {
         "enableTypedoc": true,
-        "testSuite": "unit-b"
+        "testSuite": "unit"
     }
 }
diff --git a/packages/teraslice-cli/package.json b/packages/teraslice-cli/package.json
@@ -93,7 +93,7 @@
     },
     "srcMain": "src/index.ts",
     "terascope": {
-        "testSuite": "unit-a",
+        "testSuite": "unit",
         "enableTypedoc": true
     }
 }
diff --git a/packages/teraslice-client-js/package.json b/packages/teraslice-client-js/package.json
@@ -49,6 +49,6 @@
     "srcMain": "src/index.ts",
     "terascope": {
         "enableTypedoc": true,
-        "testSuite": "unit-a"
+        "testSuite": "unit"
     }
 }
diff --git a/packages/teraslice-messaging/package.json b/packages/teraslice-messaging/package.json
@@ -58,6 +58,6 @@
     "srcMain": "src/index.ts",
     "terascope": {
         "enableTypedoc": true,
-        "testSuite": "unit-a"
+        "testSuite": "unit"
     }
 }
diff --git a/packages/teraslice-op-test-harness/package.json b/packages/teraslice-op-test-harness/package.json
@@ -35,6 +35,6 @@
         "registry": "https://registry.npmjs.org/"
     },
     "terascope": {
-        "testSuite": "unit-a"
+        "testSuite": "unit"
     }
 }
diff --git a/packages/teraslice-state-storage/package.json b/packages/teraslice-state-storage/package.json
@@ -37,6 +37,6 @@
     "srcMain": "src/index.ts",
     "terascope": {
         "enableTypedoc": true,
-        "testSuite": "unit-a"
+        "testSuite": "unit"
     }
 }
diff --git a/packages/teraslice-test-harness/package.json b/packages/teraslice-test-harness/package.json
@@ -52,6 +52,6 @@
     "srcMain": "src/index.ts",
     "terascope": {
         "enableTypedoc": true,
-        "testSuite": "unit-a"
+        "testSuite": "unit"
     }
 }
diff --git a/packages/ts-transforms/package.json b/packages/ts-transforms/package.json
@@ -66,6 +66,6 @@
     "srcMain": "src/index.ts",
     "terascope": {
         "enableTypedoc": true,
-        "testSuite": "unit-b"
+        "testSuite": "unit"
     }
 }
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -80,6 +80,6 @@
     "srcMain": "src/index.ts",
     "terascope": {
         "enableTypedoc": true,
-        "testSuite": "unit-b"
+        "testSuite": "unit"
     }
 }
diff --git a/packages/xlucene-parser/package.json b/packages/xlucene-parser/package.json
@@ -52,6 +52,6 @@
     "srcMain": "src/index.ts",
     "terascope": {
         "enableTypedoc": true,
-        "testSuite": "unit-b"
+        "testSuite": "unit"
     }
 }
diff --git a/packages/xlucene-translator/package.json b/packages/xlucene-translator/package.json
@@ -47,6 +47,6 @@
     "srcMain": "src/index.ts",
     "terascope": {
         "enableTypedoc": true,
-        "testSuite": "unit-b"
+        "testSuite": "unit"
     }
 }
diff --git a/packages/xpressions/package.json b/packages/xpressions/package.json
@@ -38,7 +38,7 @@
     },
     "srcMain": "src/index.ts",
     "terascope": {
-        "testSuite": "unit-b",
+        "testSuite": "unit",
         "enableTypedoc": true
     }
 }