Improve the driver import in the testkit-backend

Author: bigmontz

package.json

@@ -13,6 +13,7 @@
     "test": "lerna run test --stream",
     "start-neo4j": "lerna run start-neo4j --scope neo4j-driver",
     "stop-neo4j": "lerna run stop-neo4j --scope neo4j-driver",
+    "start-testkit-backend": "lerna run start --scope testkit-backend --stream",
     "lerna": "lerna"
   }
 }

packages/testkit-backend/package.json

@@ -24,7 +24,8 @@
   },
   "homepage": "https://github.com/neo4j/neo4j-javascript-driver#readme",
   "dependencies": {
-    "neo4j": "file:../neo4j-driver"
+    "neo4j-driver-lite": "4.4.0-dev",
+    "neo4j-driver": "4.4.0-dev"
   },
   "devDependencies": {
     "esm": "^3.2.25"

packages/testkit-backend/src/cypher-native-binders.js

@@ -1,4 +1,4 @@
-import neo4j, { int } from 'neo4j'
+import neo4j from './neo4j'
 
 export function valueResponse (name, value) {
   return { name: name, data: { value: value } }

packages/testkit-backend/src/neo4j.js

@@ -0,0 +1,7 @@
+import neo4jDriver from 'neo4j-driver'
+import neo4jDriverLite from 'neo4j-driver-lite'
+
+const isLite = (process.env.TEST_DRIVER_LITE || 'False').toUpperCase() in ['TRUE', '1']
+const neo4j = isLite ? neo4jDriverLite : neo4jDriver
+
+export default neo4j

packages/testkit-backend/src/request-handlers.js

@@ -1,4 +1,4 @@
-import neo4j from 'neo4j'
+import neo4j from './neo4j'
 import ResultObserver from './result-observer.js'
 import { cypherToNative, nativeToCypher } from './cypher-native-binders.js'
 import { shouldRunTest } from './skipped-tests'

packages/testkit-backend/src/result-observer.js

@@ -1,4 +1,4 @@
-import neo4j from 'neo4j'
+import neo4j from './neo4j'
 
 export default class ResultObserver {
   constructor ({ sessionId, result }) {

testkit/backend.py

@@ -3,8 +3,8 @@
 Assumes driver and backend has been built.
 Responsible for starting the test backend.
 """
-from common import DRIVER_REPO, run
-
+from common import run_in_driver_repo
+import os
 
 if __name__ == "__main__":
-    run(["npm", "start"], cwd=DRIVER_REPO + "packages/testkit-backend")
+    run_in_driver_repo(["npm", "run", "start-testkit-backend"], env=os.environ)

testkit/build.py

@@ -2,8 +2,8 @@
 Executed in Javascript driver container.
 Responsible for building driver and test backend.
 """
+from common import run, run_in_driver_repo, DRIVER_REPO
 import os
-from common import run, run_in, run_in_driver_repo, is_lite, DRIVER_REPO
 
 
 def copy_files_to_workdir():
@@ -13,27 +13,16 @@ def copy_files_to_workdir():
 
 
 def init_monorepo():
-    run_in_driver_repo(["rm", "-fr", "node_modules"])
-    run_in_driver_repo(["npm", "ci"])
+    run_in_driver_repo(["rm", "-fr", "node_modules"], env=os.environ)
+    run_in_driver_repo(["npm", "ci"], env=os.environ)
 
 
 def clean_and_build():
-    run_in_driver_repo(["npm", "run", "clean"])
-    run_in_driver_repo(["npm", "run", "build"])
-
-
-def build_testkit_backend():
-    run_in_testkit_backend = run_in(
-        cwd=DRIVER_REPO + "packages/testkit-backend/")
-    run_in_testkit_backend(["rm", "-fr", "node_modules"])
-    neo4jdriverPath = "neo4j@../neo4j-driver" if not is_lite()\
-        else "neo4j@../neo4j-driver-lite"
-    run_in_testkit_backend(["npm", "install", neo4jdriverPath])
-    run_in_testkit_backend(["npm", "install"])
+    run_in_driver_repo(["npm", "run", "clean"], env=os.environ)
+    run_in_driver_repo(["npm", "run", "build"], env=os.environ)
 
 
 if __name__ == "__main__":
     copy_files_to_workdir()
     init_monorepo()
     clean_and_build()
-    build_testkit_backend()